stepan
/
preprocessor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Manually reformat Flex and Bison files to be closer to clang-format style

master
Sébastien Villemot 2023-11-30 16:11:28 +01:00
parent d463607e90
commit b6adff7de7
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
4 changed files with 322 additions and 305 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/DynareBison.yy
View File

@ -58,7 +58,8 @@ class ParsingDriver;
we need to access the location from within the parsing driver for error
and warning messages. */
#define YYLLOC_DEFAULT(Current, Rhs, N) \
do { \
do \
{ \
if (N) \
{ \
(Current).begin = YYRHSLOC(Rhs, 1).begin; \
@ -69,7 +70,8 @@ class ParsingDriver;
(Current).begin = (Current).end = YYRHSLOC(Rhs, 0).end; \
} \
driver.location = (Current); \
} while(false)
} \
while (false)
#include "ParsingDriver.hh"
@ -1323,7 +1325,9 @@ mshocks : MSHOCKS ';' mshock_list END ';'
alternative in the variant, so that default initialization of the
variant by the [] operator will give false */
if ($3.contains("learnt_in"))
driver.end_mshocks_learnt_in(get<string>($3.at("learnt_in")), get<bool>($3["overwrite"]), get<bool>($3["relative_to_initval"]));
driver.end_mshocks_learnt_in(get<string>($3.at("learnt_in")),
get<bool>($3["overwrite"]),
get<bool>($3["relative_to_initval"]));
else
driver.end_mshocks(get<bool>($3["overwrite"]), get<bool>($3["relative_to_initval"]));
}
@ -1409,22 +1413,22 @@ value_list : value_list COMMA '(' expression ')'
| value_list COMMA signed_number
{
$$ = $1;
$$.push_back($3.at(0) == '-' ?
driver.add_uminus(driver.add_non_negative_constant($3.substr(1))) :
driver.add_non_negative_constant($3));
$$.push_back($3.at(0) == '-'
? driver.add_uminus(driver.add_non_negative_constant($3.substr(1)))
: driver.add_non_negative_constant($3));
}
| value_list signed_number
{
$$ = $1;
$$.push_back($2.at(0) == '-' ?
driver.add_uminus(driver.add_non_negative_constant($2.substr(1))) :
driver.add_non_negative_constant($2));
$$.push_back($2.at(0) == '-'
? driver.add_uminus(driver.add_non_negative_constant($2.substr(1)))
: driver.add_non_negative_constant($2));
}
| signed_number
{
$$ = { $1.at(0) == '-' ?
driver.add_uminus(driver.add_non_negative_constant($1.substr(1))) :
driver.add_non_negative_constant($1) };
$$ = {$1.at(0) == '-'
? driver.add_uminus(driver.add_non_negative_constant($1.substr(1)))
: driver.add_non_negative_constant($1)};
}
;
@ -2422,13 +2426,17 @@ trend_list : trend_list trend_element
trend_element : symbol '(' expression ')' ';' { driver.set_trend_element($1, $3); };
filter_initial_state : FILTER_INITIAL_STATE ';' filter_initial_state_list END ';' { driver.set_filter_initial_state(); };
filter_initial_state : FILTER_INITIAL_STATE ';' filter_initial_state_list END ';'
{ driver.set_filter_initial_state(); }
;
filter_initial_state_list : filter_initial_state_list filter_initial_state_element
| filter_initial_state_element
;
filter_initial_state_element : symbol '(' signed_integer ')' EQUAL expression ';' { driver.set_filter_initial_state_element($1, $3, $6); };
filter_initial_state_element : symbol '(' signed_integer ')' EQUAL expression ';'
{ driver.set_filter_initial_state_element($1, $3, $6); }
;
unit_root_vars : UNIT_ROOT_VARS symbol_list ';' { driver.set_unit_root_vars(); };
@ -3336,7 +3344,9 @@ conditional_forecast_paths_shock_list : conditional_forecast_paths_shock_elem
;
conditional_forecast_paths_shock_elem : VAR symbol ';' PERIODS period_list ';' VALUES value_list ';'
{ driver.add_det_shock($2, $5, $8, ParsingDriver::DetShockType::conditional_forecast); }
{ driver.add_det_shock(
$2, $5, $8,
ParsingDriver::DetShockType::conditional_forecast); }
;
steady_state_model : STEADY_STATE_MODEL ';' { driver.begin_steady_state_model(); }
@ -3446,7 +3456,8 @@ calibration_range : '[' expression COMMA expression ']'
| PLUS
{ $$ = {driver.add_non_negative_constant("0"), driver.add_inf_constant()}; }
| MINUS
{ $$ = { driver.add_uminus(driver.add_inf_constant()), driver.add_non_negative_constant("0") }; }
{ $$ = {driver.add_uminus(driver.add_inf_constant()),
driver.add_non_negative_constant("0")}; }
;
moment_calibration : MOMENT_CALIBRATION ';' moment_calibration_list END ';'
@ -4443,8 +4454,7 @@ symbol : NAME
%%
void
Dynare::parser::error(const Dynare::parser::location_type &l,
const string &m)
Dynare::parser::error(const Dynare::parser::location_type& l, const string& m)
{
driver.error(l, m);
}

21
src/macro/Parser.yy
View File

@ -1,6 +1,6 @@
// -*- C++ -*-
/*
* Copyright © 2019-2022 Dynare Team
* Copyright © 2019-2023 Dynare Team
*
* This file is part of Dynare.
*
@ -307,7 +307,10 @@ function : NAME LPAREN RPAREN
function_args : symbol
{ $$ = {$1}; }
| function_args COMMA symbol
{ $1.emplace_back($3); $$ = $1; }
{
$1.emplace_back($3);
$$ = $1;
}
;
comma_expr : %empty
@ -315,7 +318,10 @@ comma_expr : %empty
| expr
{ $$ = {$1}; }
| comma_expr COMMA expr
{ $1.emplace_back($3); $$ = $1; }
{
$1.emplace_back($3);
$$ = $1;
}
;
tuple_comma_expr : %empty
@ -325,7 +331,10 @@ tuple_comma_expr : %empty
| expr COMMA expr
{ $$ = {$1, $3}; }
| tuple_comma_expr COMMA expr
{ $1.emplace_back($3); $$ = $1; }
{
$1.emplace_back($3);
$$ = $1;
}
;
primary_expr : LPAREN expr RPAREN
@ -333,9 +342,7 @@ primary_expr : LPAREN expr RPAREN
| symbol
{ $$ = $1; } // Explicit rule needed for type conversion
| NAME LBRACKET comma_expr RBRACKET
{
$$ = make_shared<Variable>($1, make_shared<Array>($3, @3), @$);
}
{ $$ = make_shared<Variable>($1, make_shared<Array>($3, @3), @$); }
| NAME LPAREN comma_expr RPAREN
{ $$ = make_shared<Function>($1, $3, @$); }
| TRUE