From 3d8ccd07c494d32501abb7d1bbafebd8a2f470f4 Mon Sep 17 00:00:00 2001 From: Houtan Bastani Date: Thu, 15 Sep 2011 14:22:58 -0400 Subject: [PATCH] MS-SBVAR: add keywords for freq option --- preprocessor/DynareBison.yy | 10 ++++++++-- preprocessor/DynareFlex.ll | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/preprocessor/DynareBison.yy b/preprocessor/DynareBison.yy index f9c6dc972..e424cb6b6 100644 --- a/preprocessor/DynareBison.yy +++ b/preprocessor/DynareBison.yy @@ -154,7 +154,7 @@ class ParsingDriver; %token OUTPUT_FILE_TAG DRAWS_NBR_BURN_IN_1 DRAWS_NBR_BURN_IN_2 HORIZON %token SBVAR TREND_VAR DEFLATOR GROWTH_FACTOR MS_IRF MS_VARIANCE_DECOMPOSITION %token MS_ESTIMATION MS_SIMULATION MS_COMPUTE_MDD MS_COMPUTE_PROBABILITIES MS_FORECAST -%token SVAR_IDENTIFICATION EQUATION EXCLUSION LAG UPPER_CHOLESKY LOWER_CHOLESKY +%token SVAR_IDENTIFICATION EQUATION EXCLUSION LAG UPPER_CHOLESKY LOWER_CHOLESKY MONTHLY QUARTERLY %token MARKOV_SWITCHING CHAIN STATE DURATION NUMBER_OF_STATES %token SVAR COEFFICIENTS VARIANCES CONSTANTS EQUATIONS %token EXTERNAL_FUNCTION EXT_FUNC_NAME EXT_FUNC_NARGS FIRST_DERIV_PROVIDED SECOND_DERIV_PROVIDED @@ -1979,7 +1979,13 @@ o_shocks : SHOCKS EQUAL '(' list_of_symbol_lists ')' { driver.option_symbol_list o_labels : LABELS EQUAL '(' symbol_list ')' { driver.option_symbol_list("labels"); }; o_ms_drop : DROP EQUAL INT_NUMBER { driver.option_num("ms.drop", $3); }; o_ms_mh_replic : MH_REPLIC EQUAL INT_NUMBER { driver.option_num("ms.mh_replic", $3); }; -o_freq : FREQ EQUAL INT_NUMBER {driver.option_num("ms.freq",$3); }; +o_freq : FREQ EQUAL INT_NUMBER + { driver.option_num("ms.freq",$3); } + | FREQ EQUAL MONTHLY + { driver.option_num("ms.freq","12"); } + | FREQ EQUAL QUARTERLY + { driver.option_num("ms.freq","4"); } + ; o_initial_year : INITIAL_YEAR EQUAL INT_NUMBER {driver.option_num("ms.initial_year",$3); }; o_initial_subperiod : INITIAL_SUBPERIOD EQUAL INT_NUMBER {driver.option_num("ms.initial_subperiod",$3); }; o_final_year : FINAL_YEAR EQUAL INT_NUMBER {driver.option_num("ms.final_year",$3); }; diff --git a/preprocessor/DynareFlex.ll b/preprocessor/DynareFlex.ll index e9d462580..cdc025815 100644 --- a/preprocessor/DynareFlex.ll +++ b/preprocessor/DynareFlex.ll @@ -250,6 +250,8 @@ string eofbuff; second_deriv_provided {return token::SECOND_DERIV_PROVIDED;} freq {return token::FREQ;} +monthly {return token::MONTHLY; } +quarterly {return token::QUARTERLY; } initial_year {return token::INITIAL_YEAR;} initial_subperiod {return token::INITIAL_SUBPERIOD;} final_year {return token::FINAL_YEAR;}