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

Fix compatibility issue with Bison 3. 

Closes #570
time-shift
Sébastien Villemot 2013-12-28 20:44:30 +01:00
parent 503d2baa89
commit 96e973a07f
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
preprocessor/DynareBison.yy
View File

@ -38,23 +38,23 @@ class ParsingDriver;
/* Little hack: we redefine the macro which computes the locations, because /* Little hack: we redefine the macro which computes the locations, because
we need to access the location from within the parsing driver for error we need to access the location from within the parsing driver for error
and warning messages. */ and warning messages. */
#define YYLLOC_DEFAULT(Current, Rhs, N) \ #define YYLLOC_DEFAULT(Current, Rhs, N) \
do { \ do { \
if (N) \ if (N) \
{ \ { \
(Current).begin = (Rhs)[1].begin; \ (Current).begin = YYRHSLOC(Rhs, 1).begin; \
(Current).end = (Rhs)[N].end; \ (Current).end = YYRHSLOC(Rhs, N).end; \
} \ } \
else \ else \
{ \ { \
(Current).begin = (Current).end = (Rhs)[0].end; \ (Current).begin = (Current).end = YYRHSLOC(Rhs, 0).end; \
} \ } \
driver.location = (Current); \ driver.location = (Current); \
} while(false) } while(false)
%} %}
%name-prefix="Dynare" %name-prefix "Dynare"
%parse-param { ParsingDriver &driver } %parse-param { ParsingDriver &driver }
%lex-param { ParsingDriver &driver } %lex-param { ParsingDriver &driver }

2
preprocessor/macro/MacroBison.yy
View File

@ -35,7 +35,7 @@ using namespace std;
class MacroDriver; class MacroDriver;
%} %}
%name-prefix="Macro" %name-prefix "Macro"
%parse-param { MacroDriver &driver } %parse-param { MacroDriver &driver }
%parse-param { ostream &out } %parse-param { ostream &out }