diff --git a/DynareBison.yy b/DynareBison.yy index 17f6df9608dafd6b24763a9ecbaefa38f67fa08e..fe3ec9a813b0d371256f0b529bff7ea30d8f8693 100644 --- a/DynareBison.yy +++ b/DynareBison.yy @@ -85,7 +85,7 @@ class ParsingDriver; %token BVAR_PRIOR_MU BVAR_PRIOR_OMEGA BVAR_PRIOR_TAU BVAR_PRIOR_TRAIN %token BVAR_REPLIC %token CALIB CALIB_VAR CHECK CONF_SIG CONSTANT CORR COVAR CUTOFF -%token DATAFILE DR_ALGO DROP DSAMPLE DYNASAVE DYNATYPE +%token DATAFILE DROP DSAMPLE DYNASAVE DYNATYPE %token END ENDVAL EQUAL ESTIMATION ESTIMATED_PARAMS ESTIMATED_PARAMS_BOUNDS ESTIMATED_PARAMS_INIT %token FILENAME FILTER_STEP_AHEAD FILTERED_VARS FIRST_OBS %token <string_val> FLOAT_NUMBER @@ -653,8 +653,7 @@ stoch_simul_options_list : stoch_simul_options_list COMMA stoch_simul_options | stoch_simul_options ; -stoch_simul_options : o_dr_algo - | o_solve_algo +stoch_simul_options : o_solve_algo | o_simul_algo | o_linear | o_order @@ -1299,7 +1298,6 @@ number : INT_NUMBER | FLOAT_NUMBER ; -o_dr_algo : DR_ALGO EQUAL INT_NUMBER { driver.option_num("dr_algo", $3); }; o_solve_algo : SOLVE_ALGO EQUAL INT_NUMBER { driver.option_num("solve_algo", $3); }; o_simul_algo : SIMUL_ALGO EQUAL INT_NUMBER { driver.option_num("simul_algo", $3); }; o_linear : LINEAR { driver.linear(); }; diff --git a/DynareFlex.ll b/DynareFlex.ll index f206c35c774f1f71423ac724408002898a42bea2..30ee679ce142ef616d75dd771583e255e3b056c0 100644 --- a/DynareFlex.ll +++ b/DynareFlex.ll @@ -254,7 +254,6 @@ int sigma_e = 0; /* Inside Dynare statement */ <DYNARE_STATEMENT>solve_algo {return token::SOLVE_ALGO;} -<DYNARE_STATEMENT>dr_algo {return token::DR_ALGO;} <DYNARE_STATEMENT>simul_algo {return token::SIMUL_ALGO;} <DYNARE_STATEMENT>drop {return token::DROP;} <DYNARE_STATEMENT>order {return token::ORDER;}