From 637ca0f86ef6394e1980f8763e91bf3909a31689 Mon Sep 17 00:00:00 2001 From: sebastien Date: Fri, 22 Dec 2006 11:42:31 +0000 Subject: [PATCH] v4 parser DynareFlex/DynareBison: removed unused tokens and other minor cosmetic changes git-svn-id: https://www.dynare.org/svn/dynare/dynare_v4@1130 ac1d8469-bf42-47a9-8791-bf33cf982152 --- parser.src/DynareBison.yy | 36 +++++++++++++++++------------------- parser.src/DynareFlex.ll | 6 ------ 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/parser.src/DynareBison.yy b/parser.src/DynareBison.yy index 64e8d4767..a24cd9138 100644 --- a/parser.src/DynareBison.yy +++ b/parser.src/DynareBison.yy @@ -40,34 +40,32 @@ typedef pair ExpObj; %token AR AUTOCORR %token BAYESIAN_IRF BETA_PDF -%token CALIB CALIB_VAR CHECK CONF_SIG CORR COVAR -%token DATAFILE DIAGNOSTIC DIFFUSE_D DOLLAR DR_ALGO DROP DSAMPLE DYN2VEC DYNASAVE DYNATYPE +%token CALIB CALIB_VAR CHECK CONF_SIG CONSTANT CORR COVAR +%token DATAFILE DR_ALGO DROP DSAMPLE DYNASAVE DYNATYPE %token END ENDVAL EQUAL ESTIMATION ESTIMATED_PARAMS ESTIMATED_PARAMS_BOUNDS ESTIMATED_PARAMS_INIT -%token PRIOR_ANALYSIS POSTERIOR_ANALYSIS %token FILTER_STEP_AHEAD FILTERED_VARS FIRST_OBS %token FLOAT_NUMBER -%token FORECAST FUNCTIONS +%token FORECAST %token GAMMA_PDF GRAPH -%token HISTVAL HP_FILTER HP_NGRID -%token INITVAL INITVALF +%token HISTVAL HP_FILTER HP_NGRID +%token INITVAL %token INT_NUMBER -%token INV_GAMMA_PDF INV_GAMMA1_PDF INV_GAMMA2_PDF IRF -%token KALMAN_ALGO KALMAN_TOL CONSTANT NOCONSTANT +%token INV_GAMMA_PDF IRF +%token KALMAN_ALGO KALMAN_TOL %token LAPLACE LIK_ALGO LIK_INIT LINEAR LOAD_MH_FILE LOGLINEAR -%token MH_DROP MH_INIT_SCALE MH_JSCALE MH_MODE MH_NBLOCKS MH_REPLIC MODE_CHECK MODE_COMPUTE MODE_FILE MODEL MODEL_COMPARISON MODEL_COMPARISON_APPROXIMATION MODIFIEDHARMONICMEAN MOMENTS MOMENTS_VARENDO MSHOCKS +%token MH_DROP MH_INIT_SCALE MH_JSCALE MH_MODE MH_NBLOCKS MH_REPLIC MODE_CHECK MODE_COMPUTE MODE_FILE MODEL MODEL_COMPARISON MODEL_COMPARISON_APPROXIMATION MODIFIEDHARMONICMEAN MOMENTS_VARENDO MSHOCKS %token NAME -%token NOBS NOCORR NODIAGNOSTIC NOFUNCTIONS NOGRAPH XLS_SHEET XLS_RANGE -%token NOMOMENTS NOPRINT NORMAL_PDF +%token NOBS NOCONSTANT NOCORR NODIAGNOSTIC NOFUNCTIONS NOGRAPH NOMOMENTS NOPRINT NORMAL_PDF %token OBSERVATION_TRENDS OLR OLR_INST OLR_BETA OPTIM OPTIM_WEIGHTS ORDER OSR OSR_PARAMS -%token PARAMETERS PERIODS PLANNER_OBJECTIVE PREFILTER PRESAMPLE PRINT PRIOR_TRUNC +%token PARAMETERS PERIODS PLANNER_OBJECTIVE PREFILTER PRESAMPLE PRINT PRIOR_TRUNC PRIOR_ANALYSIS POSTERIOR_ANALYSIS %token QZ_CRITERIUM -%token RELATIVE_IRF REPLIC RESOL RPLOT +%token RELATIVE_IRF REPLIC RPLOT %token SHOCKS SIGMA_E SIMUL SIMUL_ALGO SIMUL_SEED SMOOTHER SOLVE_ALGO STDERR STEADY STOCH_SIMUL %token TEX %token TEX_NAME %token UNIFORM_PDF UNIT_ROOT_VARS USE_DLL %token VALUES VAR VAREXO VAREXO_DET VAROBS -%token XTICK XTICKLABEL +%token XLS_SHEET XLS_RANGE %left COMMA %left PLUS MINUS %left TIMES DIVIDE @@ -567,7 +565,7 @@ typedef pair ExpObj; | o_drop | o_ar | o_nocorr - | o_nofunction + | o_nofunctions | o_nomoments | o_irf | o_relative_irf @@ -1066,7 +1064,7 @@ typedef pair ExpObj; o_drop: DROP EQUAL INT_NUMBER {driver.option_num("drop", $3);}; o_ar: AR EQUAL INT_NUMBER {driver.option_num("ar", $3);}; o_nocorr: NOCORR {driver.option_num("nocorr", "1");}; - o_nofunction: NOFUNCTIONS {driver.option_num("nofunctions", "1");}; + o_nofunctions: NOFUNCTIONS {driver.option_num("nofunctions", "1");}; o_nomoments: NOMOMENTS {driver.option_num("nomoments", "1");}; o_irf: IRF EQUAL INT_NUMBER {driver.option_num("irf", $3);}; o_hp_filter: HP_FILTER EQUAL INT_NUMBER {driver.option_num("hp_filter", $3);}; @@ -1087,13 +1085,14 @@ typedef pair ExpObj; o_lik_algo: LIK_ALGO EQUAL INT_NUMBER {driver.option_num("lik_algo", $3);}; o_lik_init: LIK_INIT EQUAL INT_NUMBER {driver.option_num("lik_init", $3);}; o_nograph: NOGRAPH {driver.option_num("nograph","1");}; + | GRAPH {driver.option_num("nograph", "0");}; o_conf_sig: CONF_SIG EQUAL FLOAT_NUMBER {driver.option_num("conf_sig", $3);}; o_mh_replic: MH_REPLIC EQUAL INT_NUMBER {driver.option_num("mh_replic", $3);}; o_mh_drop: MH_DROP EQUAL FLOAT_NUMBER {driver.option_num("mh_drop", $3);}; o_mh_jscale: MH_JSCALE EQUAL FLOAT_NUMBER {driver.option_num("mh_jscale", $3);}; o_optim: OPTIM EQUAL '(' optim_options ')'; - o_mh_init_scale :MH_INIT_SCALE EQUAL FLOAT_NUMBER {driver.option_num("mh_init_scale", $3);}; - o_mh_init_scale :MH_INIT_SCALE EQUAL INT_NUMBER {driver.option_num("mh_init_scale", $3);}; + o_mh_init_scale: MH_INIT_SCALE EQUAL FLOAT_NUMBER {driver.option_num("mh_init_scale", $3);}; + | MH_INIT_SCALE EQUAL INT_NUMBER {driver.option_num("mh_init_scale", $3);}; o_mode_file : MODE_FILE EQUAL NAME {driver.option_str("mode_file", $3);}; o_mode_compute : MODE_COMPUTE EQUAL INT_NUMBER {driver.option_num("mode_compute", $3);}; o_mode_check : MODE_CHECK {driver.option_num("mode_check", "1");}; @@ -1121,7 +1120,6 @@ typedef pair ExpObj; ; o_print : PRINT {driver.option_num("noprint", "0");}; o_noprint : NOPRINT {driver.option_num("noprint", "1");}; - o_nograph : GRAPH {driver.option_num("nograph", "0");}; o_xls_sheet : XLS_SHEET EQUAL NAME {driver.option_str("xls_sheet", $3);} o_xls_range : XLS_RANGE EQUAL range {driver.option_str("xls_range", $3);} o_filter_step_ahead : FILTER_STEP_AHEAD EQUAL vec_int {driver.option_num("filter_step_ahead", $3);} diff --git a/parser.src/DynareFlex.ll b/parser.src/DynareFlex.ll index 8ef936b74..b123e805a 100644 --- a/parser.src/DynareFlex.ll +++ b/parser.src/DynareFlex.ll @@ -57,13 +57,11 @@ int sigma_e = 0; varexo_det {BEGIN DYNARE_STATEMENT; return token::VAREXO_DET;} parameters {BEGIN DYNARE_STATEMENT; return token::PARAMETERS;} periods {BEGIN DYNARE_STATEMENT; return token::PERIODS;} -initvalf {BEGIN DYNARE_STATEMENT; return token::INITVALF;} estimation {BEGIN DYNARE_STATEMENT; return token::ESTIMATION;} prior_analysis {BEGIN DYNARE_STATEMENT; return token::PRIOR_ANALYSIS;} posterior_analysis {BEGIN DYNARE_STATEMENT; return token::POSTERIOR_ANALYSIS;} varobs {BEGIN DYNARE_STATEMENT; return token::VAROBS;} unit_root_vars {BEGIN DYNARE_STATEMENT; return token::UNIT_ROOT_VARS;} -dyn2vec {BEGIN DYNARE_STATEMENT; return token::DYN2VEC;} rplot {BEGIN DYNARE_STATEMENT; return token::RPLOT;} osr_params {BEGIN DYNARE_STATEMENT; return token::OSR_PARAMS;} osr {BEGIN DYNARE_STATEMENT; return token::OSR;} @@ -144,13 +142,11 @@ int sigma_e = 0; filter_step_ahead {return token::FILTER_STEP_AHEAD;} relative_irf {return token::RELATIVE_IRF;} tex {return token::TEX;} -moments {return token::MOMENTS;} nomoments {return token::NOMOMENTS;} corr {return token::CORR;} nocorr {return token::NOCORR;} optim {return token::OPTIM;} periods {return token::PERIODS;} -diffuse_d {return token::DIFFUSE_D;} model_comparison_approximation {return token::MODEL_COMPARISON;} laplace {return token::LAPLACE;} modifiedharmonicmean {return token::MODIFIEDHARMONICMEAN;} @@ -200,8 +196,6 @@ int sigma_e = 0; qz_criterium {return token::QZ_CRITERIUM;} simul {return token::SIMUL;} olr_beta {return token::OLR_BETA;} -xtick {return token::XTICK;} -xticklabel {return token::XTICKLABEL;} xls_sheet {return token::XLS_SHEET;} xls_range {return token::XLS_RANGE;} [\.] {return yy::parser::token_type (yytext[0]);}