From a6747827bf293df111f7c3c9535636355b263176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Thu, 26 Nov 2020 16:34:10 +0100 Subject: [PATCH] Preprocessor update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit — Ensure that all statements produce an output in JSON mode — Remove obsolete “restrictions” block and “var_estimation” statement --- preprocessor | 2 +- scripts/dynare.el | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/preprocessor b/preprocessor index 4b8290faa..638b4c7ac 160000 --- a/preprocessor +++ b/preprocessor @@ -1 +1 @@ -Subproject commit 4b8290faa59b0928e8355d53d15b2188f13f30be +Subproject commit 638b4c7ac58ea73e3fb2a6480ea2de2a6b6efa20 diff --git a/scripts/dynare.el b/scripts/dynare.el index a25179886..536dc8ded 100644 --- a/scripts/dynare.el +++ b/scripts/dynare.el @@ -56,7 +56,7 @@ (defvar dynare-statements '("var" "varexo" "varexo_det" "trend_var" "log_trend_var" "predetermined_variables" "parameters" "model_local_variable" "periods" - "model_info" "estimation" "var_estimation" "set_time" "data" "varobs" + "model_info" "estimation" "set_time" "data" "varobs" "varexobs" "unit_root_vars" "rplot" "osr_params" "osr" "dynatype" "dynasave" "model_comparison" "change_type" "load_params_and_steady_state" "save_params_and_steady_state" "write_latex_dynamic_model" @@ -82,8 +82,7 @@ ;; Keywords that may appear in blocks, and that begin a statement which will be ;; closed by a semicolon (defvar dynare-statements-like - '("stderr" "values" "restriction" "exclusion" "equation" "crossequations" - "covariance" "upper_cholesky" "lower_cholesky") + '("stderr" "values" "restriction" "exclusion" "upper_cholesky" "lower_cholesky") "Dynare statements-like keywords.") ;; Those keywords that makes the lexer enter the DYNARE_BLOCK start condition @@ -97,7 +96,7 @@ "estimated_params_init" "estimated_params_bounds" "osr_params_bounds" "observation_trends" "optim_weights" "homotopy_setup" "conditional_forecast_paths" "svar_identification" "moment_calibration" - "irf_calibration" "ramsey_constraints" "restrictions" "generate_irfs" + "irf_calibration" "ramsey_constraints" "generate_irfs" "matched_moments" "verbatim") "Dynare block keywords."))