Add block_dynamic option to model_info

Also renames the old static option

src/DynareBison.yy

@@ -187,7 +187,7 @@ class ParsingDriver;
 %token NO_IDENTIFICATION_MINIMAL NO_IDENTIFICATION_SPECTRUM NORMALIZE_JACOBIANS GRID_NBR
 %token TOL_RANK TOL_DERIV TOL_SV CHECKS_VIA_SUBSETS MAX_DIM_SUBSETS_GROUPS ZERO_MOMENTS_TOLERANCE
 %token MAX_NROWS SQUEEZE_SHOCK_DECOMPOSITION WITH_EPILOGUE MODEL_REMOVE MODEL_REPLACE MODEL_OPTIONS
-%token VAR_REMOVE ESTIMATED_PARAMS_REMOVE STATIC INCIDENCE RESID NON_ZERO LEARNT_IN PLUS_EQUAL TIMES_EQUAL
+%token VAR_REMOVE ESTIMATED_PARAMS_REMOVE BLOCK_STATIC BLOCK_DYNAMIC INCIDENCE RESID NON_ZERO LEARNT_IN PLUS_EQUAL TIMES_EQUAL
 %token FSOLVE_OPTIONS
 
 %token <vector<string>> SYMBOL_VEC
@@ -1430,7 +1430,8 @@ model_info_options_list : model_info_options_list COMMA model_info_options
                    | model_info_options
                    ;
 
-model_info_options : o_static
+model_info_options : o_block_static
+                   | o_block_dynamic
                    | o_incidence
                    ;
 
@@ -4142,7 +4143,8 @@ o_tol_sv : TOL_SV EQUAL non_negative_number { driver.option_num("tol_sv", $3); }
 o_checks_via_subsets : CHECKS_VIA_SUBSETS EQUAL INT_NUMBER { driver.option_num("checks_via_subsets", $3); };
 o_max_dim_subsets_groups : MAX_DIM_SUBSETS_GROUPS EQUAL INT_NUMBER { driver.option_num("max_dim_subsets_groups", $3); };
 o_zero_moments_tolerance : ZERO_MOMENTS_TOLERANCE EQUAL non_negative_number { driver.option_num("zero_moments_tolerance", $3); };
-o_static : STATIC { driver.option_num("static","true"); };
+o_block_static : BLOCK_STATIC { driver.option_num("block_static","true"); };
+o_block_dynamic : BLOCK_DYNAMIC { driver.option_num("block_dynamic","true"); };
 o_incidence : INCIDENCE { driver.option_num("incidence","true"); };
 
 // Some options to "evaluate_planner_objective"

src/DynareFlex.ll

@@ -892,7 +892,8 @@ DATE -?[0-9]+([ya]|m([1-9]|1[0-2])|q[1-4])
 <DYNARE_STATEMENT>particle_filter_options {return token::PARTICLE_FILTER_OPTIONS;}
 <DYNARE_STATEMENT>terminal_steady_state_as_guess_value {return token::TERMINAL_STEADY_STATE_AS_GUESS_VALUE;}
 <DYNARE_STATEMENT>constant_simulation_length {return token::CONSTANT_SIMULATION_LENGTH;}
-<DYNARE_STATEMENT>static { return token::STATIC; }
+<DYNARE_STATEMENT>block_static { return token::BLOCK_STATIC; }
+<DYNARE_STATEMENT>block_dynamic { return token::BLOCK_DYNAMIC; }
 <DYNARE_STATEMENT>incidence { return token::INCIDENCE; }
 
 <DYNARE_BLOCK>stderr_multiples {return token::STDERR_MULTIPLES;}