diff --git a/DynareBison.yy b/DynareBison.yy index 03e4b844683d8a40c8affeee6500a03c21e6f036..d84d779077d4794d8ad826e8c96a236e17a96419 100644 --- a/DynareBison.yy +++ b/DynareBison.yy @@ -114,7 +114,7 @@ class ParsingDriver; %token FILTER_ALGORITHM PROPOSAL_APPROXIMATION CUBATURE UNSCENTED MONTECARLO DISTRIBUTION_APPROXIMATION %token <string_val> NAME %token NAN_CONSTANT NO_STATIC NOBS NOCONSTANT NODISPLAY NOCORR NODIAGNOSTIC NOFUNCTIONS NO_HOMOTOPY -%token NOGRAPH NOMOMENTS NOPRINT NORMAL_PDF SAVE_DRAWS +%token NOGRAPH POSTERIOR_NOGRAPH POSTERIOR_GRAPH NOMOMENTS NOPRINT NORMAL_PDF SAVE_DRAWS %token OBSERVATION_TRENDS OPTIM OPTIM_WEIGHTS ORDER OSR OSR_PARAMS MAX_DIM_COVA_GROUP ADVANCED OUTFILE OUTVARS OVERWRITE %token PARALLEL_LOCAL_FILES PARAMETERS PARAMETER_SET PARTIAL_INFORMATION PERIODS PERIOD PLANNER_OBJECTIVE PLOT_CONDITIONAL_FORECAST PLOT_PRIORS PREFILTER PRESAMPLE %token PERFECT_FORESIGHT_SETUP PERFECT_FORESIGHT_SOLVER NO_POSTERIOR_KERNEL_DENSITY FUNCTION @@ -1726,6 +1726,7 @@ estimation_options : o_datafile | o_lik_algo | o_lik_init | o_nograph + | o_posterior_nograph | o_nodisplay | o_graph_format | o_forecasts_conf_sig @@ -2816,6 +2817,11 @@ o_nograph : NOGRAPH | GRAPH { driver.option_num("nograph", "0"); } ; +o_posterior_nograph : POSTERIOR_NOGRAPH + { driver.option_num("no_graph.posterior","1"); } + | POSTERIOR_GRAPH + { driver.option_num("no_graph.posterior", "0"); } + ; o_shock_decomposition_nograph : NOGRAPH { driver.option_num("no_graph.shock_decomposition", "1"); } o_nodisplay : NODISPLAY { driver.option_num("nodisplay","1"); }; o_graph_format : GRAPH_FORMAT EQUAL allowed_graph_formats diff --git a/DynareFlex.ll b/DynareFlex.ll index e461cb82550b2a1001c235af3f2cb12ea9e11142..8d00b28740b69aba1715e4b1c743f045b41dab6c 100644 --- a/DynareFlex.ll +++ b/DynareFlex.ll @@ -276,6 +276,8 @@ 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>raftery_lewis_diagnostics {return token::RAFTERY_LEWIS_DIAGNOSTICS;} <DYNARE_STATEMENT>graph {return token::GRAPH;} <DYNARE_STATEMENT>nograph {return token::NOGRAPH;} +<DYNARE_STATEMENT>posterior_graph {return token::POSTERIOR_GRAPH;} +<DYNARE_STATEMENT>posterior_nograph {return token::POSTERIOR_NOGRAPH;} <DYNARE_STATEMENT>nodisplay {return token::NODISPLAY;} <DYNARE_STATEMENT>graph_format {return token::GRAPH_FORMAT;} <DYNARE_STATEMENT>eps {yylval->string_val = new string(yytext); return token::EPS;}