From 4b338b4bcb96c5bea5f07d268964f1f972ff5ffb Mon Sep 17 00:00:00 2001
From: Houtan Bastani <houtan@dynare.org>
Date: Mon, 17 Nov 2014 12:15:38 +0100
Subject: [PATCH] preprocessor: add nodecomposition option to estimation and
 stoch_simul, #702

---
 preprocessor/DynareBison.yy | 7 +++++--
 preprocessor/DynareFlex.ll  | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/preprocessor/DynareBison.yy b/preprocessor/DynareBison.yy
index 2df2d1091..0908d0fcb 100644
--- a/preprocessor/DynareBison.yy
+++ b/preprocessor/DynareBison.yy
@@ -84,7 +84,7 @@ class ParsingDriver;
 
 %token AIM_SOLVER ANALYTIC_DERIVATION AR AUTOCORR
 %token BAYESIAN_IRF BETA_PDF BLOCK USE_CALIBRATION
-%token BVAR_DENSITY BVAR_FORECAST
+%token BVAR_DENSITY BVAR_FORECAST NODECOMPOSITION
 %token BVAR_PRIOR_DECAY BVAR_PRIOR_FLAT BVAR_PRIOR_LAMBDA
 %token BVAR_PRIOR_MU BVAR_PRIOR_OMEGA BVAR_PRIOR_TAU BVAR_PRIOR_TRAIN
 %token BVAR_REPLIC BYTECODE ALL_VALUES_REQUIRED
@@ -1096,6 +1096,7 @@ stoch_simul_primary_options : o_dr_algo
 
 stoch_simul_options : stoch_simul_primary_options
                     | o_loglinear
+                    | o_nodecomposition
                     ;
 
 symbol_list : symbol_list symbol
@@ -1625,7 +1626,8 @@ estimation_options : o_datafile
                    | o_mh_nblocks
                    | o_load_mh_file
                    | o_loglinear
-		   | o_logdata
+                   | o_logdata
+                   | o_nodecomposition
                    | o_nodiagnostic
                    | o_bayesian_irf
                    | o_dsge_var
@@ -2735,6 +2737,7 @@ o_parameter_set : PARAMETER_SET EQUAL PRIOR_MODE
                 | PARAMETER_SET EQUAL CALIBRATION
                   { driver.option_str("parameter_set", "calibration"); }
                 ;
+o_nodecomposition : NODECOMPOSITION { driver.option_num("nodecomposition", "1"); };
 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
diff --git a/preprocessor/DynareFlex.ll b/preprocessor/DynareFlex.ll
index 829841dea..9052a1027 100644
--- a/preprocessor/DynareFlex.ll
+++ b/preprocessor/DynareFlex.ll
@@ -453,6 +453,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
   yylval->string_val = new string(yytext);
   return token::CNUM;
 }
+<DYNARE_STATEMENT>nodecomposition {return token::NODECOMPOSITION;};
 <DYNARE_STATEMENT>banact {return token::BANACT;}
 <DYNARE_BLOCK>use_calibration {return token::USE_CALIBRATION;}
 <DYNARE_STATEMENT>output_file_tag {return token::OUTPUT_FILE_TAG;}