Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
preprocessor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Willi Mutschler
preprocessor
Commits
107ad143
Commit
107ad143
authored
Jul 30, 2018
by
Sébastien Villemot
Browse files
Options
Downloads
Patches
Plain Diff
Fix various Bison warnings
parent
45cd8e68
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/DynareBison.yy
+5
-5
5 additions, 5 deletions
src/DynareBison.yy
src/Makefile.am
+1
-1
1 addition, 1 deletion
src/Makefile.am
src/macro/MacroBison.yy
+6
-6
6 additions, 6 deletions
src/macro/MacroBison.yy
src/macro/Makefile.am
+1
-1
1 addition, 1 deletion
src/macro/Makefile.am
with
13 additions
and
13 deletions
src/DynareBison.yy
+
5
−
5
View file @
107ad143
...
@@ -92,7 +92,7 @@ class ParsingDriver;
...
@@ -92,7 +92,7 @@ class ParsingDriver;
%token BVAR_PRIOR_MU BVAR_PRIOR_OMEGA BVAR_PRIOR_TAU BVAR_PRIOR_TRAIN DETAIL_PLOT TYPE
%token BVAR_PRIOR_MU BVAR_PRIOR_OMEGA BVAR_PRIOR_TAU BVAR_PRIOR_TRAIN DETAIL_PLOT TYPE
%token BVAR_REPLIC BYTECODE ALL_VALUES_REQUIRED PROPOSAL_DISTRIBUTION REALTIME VINTAGE
%token BVAR_REPLIC BYTECODE ALL_VALUES_REQUIRED PROPOSAL_DISTRIBUTION REALTIME VINTAGE
%token CALIB_SMOOTHER CHANGE_TYPE CHECK CONDITIONAL_FORECAST CONDITIONAL_FORECAST_PATHS CONF_SIG CONSTANT CONTROLLED_VAREXO CORR COVAR CUTOFF CYCLE_REDUCTION LOGARITHMIC_REDUCTION
%token CALIB_SMOOTHER CHANGE_TYPE CHECK CONDITIONAL_FORECAST CONDITIONAL_FORECAST_PATHS CONF_SIG CONSTANT CONTROLLED_VAREXO CORR COVAR CUTOFF CYCLE_REDUCTION LOGARITHMIC_REDUCTION
%token CONSIDER_ALL_ENDOGENOUS CONSIDER_ONLY_OBSERVED INITIAL_CONDITION_DECOMPOSITION
%token
COMMA
CONSIDER_ALL_ENDOGENOUS CONSIDER_ONLY_OBSERVED INITIAL_CONDITION_DECOMPOSITION
%token DATAFILE FILE SERIES DOUBLING DR_CYCLE_REDUCTION_TOL DR_LOGARITHMIC_REDUCTION_TOL DR_LOGARITHMIC_REDUCTION_MAXITER DR_ALGO DROP DSAMPLE DYNASAVE DYNATYPE CALIBRATION DIFFERENTIATE_FORWARD_VARS
%token DATAFILE FILE SERIES DOUBLING DR_CYCLE_REDUCTION_TOL DR_LOGARITHMIC_REDUCTION_TOL DR_LOGARITHMIC_REDUCTION_MAXITER DR_ALGO DROP DSAMPLE DYNASAVE DYNATYPE CALIBRATION DIFFERENTIATE_FORWARD_VARS
%token END ENDVAL EQUAL ESTIMATION ESTIMATED_PARAMS ESTIMATED_PARAMS_BOUNDS ESTIMATED_PARAMS_INIT EXTENDED_PATH ENDOGENOUS_PRIOR
%token END ENDVAL EQUAL ESTIMATION ESTIMATED_PARAMS ESTIMATED_PARAMS_BOUNDS ESTIMATED_PARAMS_INIT EXTENDED_PATH ENDOGENOUS_PRIOR
%token FILENAME DIRNAME FILTER_STEP_AHEAD FILTERED_VARS FIRST_OBS LAST_OBS SET_TIME OSR_PARAMS_BOUNDS KEEP_KALMAN_ALGO_IF_SINGULARITY_IS_DETECTED
%token FILENAME DIRNAME FILTER_STEP_AHEAD FILTERED_VARS FIRST_OBS LAST_OBS SET_TIME OSR_PARAMS_BOUNDS KEEP_KALMAN_ALGO_IF_SINGULARITY_IS_DETECTED
...
@@ -133,12 +133,11 @@ class ParsingDriver;
...
@@ -133,12 +133,11 @@ class ParsingDriver;
%token VALUES VAR VAREXO VAREXO_DET VAROBS VAREXOBS PREDETERMINED_VARIABLES VAR_EXPECTATION PLOT_SHOCK_DECOMPOSITION MODEL_LOCAL_VARIABLE
%token VALUES VAR VAREXO VAREXO_DET VAROBS VAREXOBS PREDETERMINED_VARIABLES VAR_EXPECTATION PLOT_SHOCK_DECOMPOSITION MODEL_LOCAL_VARIABLE
%token WRITE_LATEX_DYNAMIC_MODEL WRITE_LATEX_STATIC_MODEL WRITE_LATEX_ORIGINAL_MODEL CROSSEQUATIONS COVARIANCE WRITE_LATEX_STEADY_STATE_MODEL
%token WRITE_LATEX_DYNAMIC_MODEL WRITE_LATEX_STATIC_MODEL WRITE_LATEX_ORIGINAL_MODEL CROSSEQUATIONS COVARIANCE WRITE_LATEX_STEADY_STATE_MODEL
%token XLS_SHEET XLS_RANGE LMMCP OCCBIN BANDPASS_FILTER COLORMAP VAR_MODEL PAC_MODEL QOQ YOY AOA UNDIFF PAC_EXPECTATION
%token XLS_SHEET XLS_RANGE LMMCP OCCBIN BANDPASS_FILTER COLORMAP VAR_MODEL PAC_MODEL QOQ YOY AOA UNDIFF PAC_EXPECTATION
%left COMMA
%left EQUAL_EQUAL EXCLAMATION_EQUAL
%left EQUAL_EQUAL EXCLAMATION_EQUAL
%left LESS GREATER LESS_EQUAL GREATER_EQUAL
%left LESS GREATER LESS_EQUAL GREATER_EQUAL
%left PLUS MINUS
%left PLUS MINUS
%left TIMES DIVIDE
%left TIMES DIVIDE
%
left
UMINUS UPLUS
%
precedence
UMINUS UPLUS
%nonassoc POWER
%nonassoc POWER
%token EXP LOG LN LOG10 SIN COS TAN ASIN ACOS ATAN SINH COSH TANH ERF DIFF ADL
%token EXP LOG LN LOG10 SIN COS TAN ASIN ACOS ATAN SINH COSH TANH ERF DIFF ADL
%token ASINH ACOSH ATANH SQRT NORMCDF NORMPDF STEADY_STATE EXPECTATION VAR_ESTIMATION
%token ASINH ACOSH ATANH SQRT NORMCDF NORMPDF STEADY_STATE EXPECTATION VAR_ESTIMATION
...
@@ -799,7 +798,8 @@ comma_expression : expression
...
@@ -799,7 +798,8 @@ comma_expression : expression
{ driver.add_external_function_arg($3); }
{ driver.add_external_function_arg($3); }
;
;
expression_or_empty : {$$ = driver.add_nan_constant();}
expression_or_empty : %empty
{ $$ = driver.add_nan_constant(); }
| expression
| expression
;
;
...
@@ -1209,7 +1209,7 @@ model_info : MODEL_INFO ';'
...
@@ -1209,7 +1209,7 @@ model_info : MODEL_INFO ';'
model_info_options_list : model_info_options_list COMMA model_info_options
model_info_options_list : model_info_options_list COMMA model_info_options
| model_info_options
| model_info_options
;
;
model_info_options :
model_info_options :
%empty
perfect_foresight_setup : PERFECT_FORESIGHT_SETUP ';'
perfect_foresight_setup : PERFECT_FORESIGHT_SETUP ';'
{ driver.perfect_foresight_setup(); }
{ driver.perfect_foresight_setup(); }
...
...
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.am
+
1
−
1
View file @
107ad143
...
@@ -71,7 +71,7 @@ DynareFlex.cc FlexLexer.h: DynareFlex.ll
...
@@ -71,7 +71,7 @@ DynareFlex.cc FlexLexer.h: DynareFlex.ll
cp
$(
LEXINC
)
/FlexLexer.h
.
||
test
-f
./FlexLexer.h
cp
$(
LEXINC
)
/FlexLexer.h
.
||
test
-f
./FlexLexer.h
DynareBison.cc DynareBison.hh location.hh stack.hh position.hh
:
DynareBison.yy
DynareBison.cc DynareBison.hh location.hh stack.hh position.hh
:
DynareBison.yy
$(
YACC
)
-o
DynareBison.cc DynareBison.yy
$(
YACC
)
-W
-o
DynareBison.cc DynareBison.yy
all-local
:
$(PROGRAMS)
all-local
:
$(PROGRAMS)
...
...
...
...
This diff is collapsed.
Click to expand it.
src/macro/MacroBison.yy
+
6
−
6
View file @
107ad143
...
@@ -67,13 +67,12 @@ class MacroDriver;
...
@@ -67,13 +67,12 @@ class MacroDriver;
}
}
%token DEFINE LINE FOR IN IF ELSE ENDIF ECHO_DIR ERROR IFDEF IFNDEF
%token
COMMA
DEFINE LINE FOR IN IF ELSE ENDIF ECHO_DIR ERROR IFDEF IFNDEF
%token LPAREN RPAREN LBRACKET RBRACKET EQUAL EOL LENGTH ECHOMACROVARS SAVE
%token LPAREN RPAREN LBRACKET RBRACKET EQUAL EOL LENGTH ECHOMACROVARS SAVE
%token <int> INTEGER
%token <int> INTEGER
%token <string> NAME STRING
%token <string> NAME STRING
%left COMMA
%left LOGICAL_OR
%left LOGICAL_OR
%left LOGICAL_AND
%left LOGICAL_AND
%left LESS GREATER LESS_EQUAL GREATER_EQUAL EQUAL_EQUAL EXCLAMATION_EQUAL
%left LESS GREATER LESS_EQUAL GREATER_EQUAL EQUAL_EQUAL EXCLAMATION_EQUAL
...
@@ -81,8 +80,8 @@ class MacroDriver;
...
@@ -81,8 +80,8 @@ class MacroDriver;
%nonassoc COLON
%nonassoc COLON
%left PLUS MINUS
%left PLUS MINUS
%left TIMES DIVIDE
%left TIMES DIVIDE
%
left
UMINUS UPLUS EXCLAMATION
%
precedence
UMINUS UPLUS EXCLAMATION
%
left
LBRACKET
%
precedence
LBRACKET
%type <vector<string>> func_args
%type <vector<string>> func_args
%type <MacroValuePtr> expr
%type <MacroValuePtr> expr
...
@@ -91,7 +90,7 @@ class MacroDriver;
...
@@ -91,7 +90,7 @@ class MacroDriver;
%start statement_list_or_nothing;
%start statement_list_or_nothing;
statement_list_or_nothing :
/*
empty
*/
statement_list_or_nothing :
%
empty
| statement_list
| statement_list
;
;
...
@@ -207,7 +206,8 @@ expr : INTEGER
...
@@ -207,7 +206,8 @@ expr : INTEGER
{ TYPERR_CATCH($$ = $3->in($1), @$); }
{ TYPERR_CATCH($$ = $3->in($1), @$); }
;
;
comma_expr : { $$ = vector<MacroValuePtr>{}; } // Empty array
comma_expr : %empty
{ $$ = vector<MacroValuePtr>{}; } // Empty array
| expr
| expr
{ $$ = vector<MacroValuePtr>{$1}; }
{ $$ = vector<MacroValuePtr>{$1}; }
| comma_expr COMMA expr
| comma_expr COMMA expr
...
...
...
...
This diff is collapsed.
Click to expand it.
src/macro/Makefile.am
+
1
−
1
View file @
107ad143
...
@@ -20,4 +20,4 @@ MacroFlex.cc: MacroFlex.ll
...
@@ -20,4 +20,4 @@ MacroFlex.cc: MacroFlex.ll
$(
LEX
)
-o
MacroFlex.cc MacroFlex.ll
$(
LEX
)
-o
MacroFlex.cc MacroFlex.ll
MacroBison.cc MacroBison.hh location.hh stack.hh position.hh
:
MacroBison.yy
MacroBison.cc MacroBison.hh location.hh stack.hh position.hh
:
MacroBison.yy
$(
YACC
)
-o
MacroBison.cc MacroBison.yy
$(
YACC
)
-W
-o
MacroBison.cc MacroBison.yy
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment