From b48a5d58a3c07e24dd9a3ebb4a9d829fb93edc98 Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Tue, 16 May 2017 11:21:50 +0200
Subject: [PATCH] Revert "preprocessor: add options to var_model"
This reverts commit cbb099f7d9789dc7616f770ed98412309ea6ec4d.
---
DynareBison.yy | 8 --------
DynareFlex.ll | 1 -
2 files changed, 9 deletions(-)
diff --git a/DynareBison.yy b/DynareBison.yy
index b9757d96..e5b9480b 100644
--- a/DynareBison.yy
+++ b/DynareBison.yy
@@ -367,10 +367,6 @@ var_model_options_list : var_model_options_list COMMA var_model_options
var_model_options : o_var_name
| o_var_order
- | o_var_series
- | o_var_first_obs
- | o_var_nobs
- | o_var_method
;
restrictions : RESTRICTIONS '(' symbol ')' ';' { driver.begin_VAR_restrictions(); }
@@ -2996,10 +2992,6 @@ o_qz_zero_threshold : QZ_ZERO_THRESHOLD EQUAL non_negative_number { driver.optio
o_file : FILE EQUAL filename { driver.option_str("file", $3); };
o_var_name : MODEL_NAME EQUAL symbol { driver.option_str("var.model_name", $3); };
o_var_order : ORDER EQUAL INT_NUMBER { driver.option_num("var.order", $3); };
-o_var_series : SERIES EQUAL symbol { driver.option_str("var.series", $3); };
-o_var_first_obs : FIRST_OBS EQUAL date_expr { driver.option_date("var.firstobs", $3); } ;
-o_var_nobs : NOBS EQUAL INT_NUMBER { driver.option_num("var.nobs", $3); };
-o_var_method : METHOD EQUAL symbol { driver.option_num("var.method", $3); };
o_series : SERIES EQUAL symbol { driver.option_str("series", $3); };
o_datafile : DATAFILE EQUAL filename { driver.option_str("datafile", $3); };
o_var_datafile : DATAFILE EQUAL filename { driver.option_str("var_estimation.datafile", $3); };
diff --git a/DynareFlex.ll b/DynareFlex.ll
index 462e6893..b3834a3a 100644
--- a/DynareFlex.ll
+++ b/DynareFlex.ll
@@ -398,7 +398,6 @@ DATE -?[0-9]+([YyAa]|[Mm]([1-9]|1[0-2])|[Qq][1-4]|[Ww]([1-9]{1}|[1-4][0-9]|5[0-2
<DYNARE_STATEMENT>generic {return token::GENERIC;}
<DYNARE_STATEMENT>resampling_threshold {return token::RESAMPLING_THRESHOLD;}
<DYNARE_STATEMENT>resampling_method {return token::RESAMPLING_METHOD;}
-<DYNARE_STATEMENT>method {return token::METHOD;}
<DYNARE_STATEMENT>kitagawa {return token::KITAGAWA;}
<DYNARE_STATEMENT>smooth {return token::SMOOTH;}
<DYNARE_STATEMENT>stratified {return token::STRATIFIED;}
--
GitLab