diff --git a/DynareBison.yy b/DynareBison.yy index 6aaa2570779e37d75d94fa9fcf60ac4a16c78da7..b118955148c12a28ee6ef171d03f1f6f956afd66 100644 --- a/DynareBison.yy +++ b/DynareBison.yy @@ -104,7 +104,7 @@ class ParsingDriver; %token <string_val> INT_NUMBER %token INV_GAMMA_PDF INV_GAMMA1_PDF INV_GAMMA2_PDF IRF IRF_SHOCKS IRF_PLOT_THRESHOLD IRF_CALIBRATION %token FAST_KALMAN_FILTER KALMAN_ALGO KALMAN_TOL DIFFUSE_KALMAN_TOL SUBSAMPLES OPTIONS TOLF TOLX -%token LAPLACE LIK_ALGO LIK_INIT LINEAR LOAD_IDENT_FILES LOAD_MH_FILE LOAD_PARAMS_AND_STEADY_STATE LOGLINEAR LOGDATA LYAPUNOV LINEAR_APPROXIMATION +%token LAPLACE LIK_ALGO LIK_INIT LINEAR LOAD_IDENT_FILES LOAD_MH_FILE LOAD_RESULTS_AFTER_LOAD_MH LOAD_PARAMS_AND_STEADY_STATE LOGLINEAR LOGDATA LYAPUNOV LINEAR_APPROXIMATION %token LYAPUNOV_FIXED_POINT_TOL LYAPUNOV_DOUBLING_TOL LYAPUNOV_SQUARE_ROOT_SOLVER_TOL LOG_DEFLATOR LOG_TREND_VAR LOG_GROWTH_FACTOR MARKOWITZ MARGINAL_DENSITY MAX MAXIT %token MFS MH_CONF_SIG MH_DROP MH_INIT_SCALE MH_JSCALE MH_MODE MH_NBLOCKS MH_REPLIC MH_RECOVER POSTERIOR_MAX_SUBSAMPLE_DRAWS MIN MINIMAL_SOLVING_PERIODS %token MODE_CHECK MODE_CHECK_NEIGHBOURHOOD_SIZE MODE_CHECK_SYMMETRIC_PLOTS MODE_CHECK_NUMBER_OF_POINTS MODE_COMPUTE MODE_FILE MODEL MODEL_COMPARISON MODEL_INFO MSHOCKS ABS SIGN @@ -1745,6 +1745,7 @@ estimation_options : o_datafile | o_mh_mode | o_mh_nblocks | o_load_mh_file + | o_load_results_after_load_mh | o_loglinear | o_logdata | o_nodecomposition @@ -2864,6 +2865,7 @@ o_prior_trunc : PRIOR_TRUNC EQUAL non_negative_number { driver.option_num("prior o_mh_mode : MH_MODE EQUAL INT_NUMBER { driver.option_num("mh_mode", $3); }; o_mh_nblocks : MH_NBLOCKS EQUAL INT_NUMBER { driver.option_num("mh_nblck", $3); }; o_load_mh_file : LOAD_MH_FILE { driver.option_num("load_mh_file", "1"); }; +o_load_results_after_load_mh : LOAD_RESULTS_AFTER_LOAD_MH { driver.option_num("load_results_after_load_mh", "1"); }; o_loglinear : LOGLINEAR { driver.option_num("loglinear", "1"); }; o_linear_approximation : LINEAR_APPROXIMATION { driver.option_num("linear_approximation", "1"); }; o_logdata : LOGDATA { driver.option_num("logdata", "1"); }; diff --git a/DynareFlex.ll b/DynareFlex.ll index a5ca4ac04a5f04c8a2a116b18cd92cc8daa671cb..e461cb82550b2a1001c235af3f2cb12ea9e11142 100644 --- a/DynareFlex.ll +++ b/DynareFlex.ll @@ -300,6 +300,7 @@ 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>mh_mode {return token::MH_MODE;} <DYNARE_STATEMENT>mh_nblocks {return token::MH_NBLOCKS;} <DYNARE_STATEMENT>load_mh_file {return token::LOAD_MH_FILE;} +<DYNARE_STATEMENT>load_results_after_load_mh {return token::LOAD_RESULTS_AFTER_LOAD_MH;} <DYNARE_STATEMENT>loglinear {return token::LOGLINEAR;} <DYNARE_STATEMENT>linear_approximation {return token::LINEAR_APPROXIMATION;} <DYNARE_STATEMENT>logdata {return token::LOGDATA;}