TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix for bison greater than 1.35

Browse Source
This commit is contained in:
David Rose 2003-01-19 18:59:18 +00:00
parent 81b27b0b27
commit df88308629
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dtool/src/cppparser/cppBisonDefs.h
View File

@ -97,14 +97,19 @@ public:
// lexer.
struct cppyyltype {
int timestamp;
int first_line;
int first_column;
int last_line;
int last_column;
char *text;
CPPFile file;
};
#define YYLTYPE cppyyltype
// Beginning around bison 1.35 or so, we need to define this macro as
// well, to tell bison how to collect multiple locations together.
#define YYLLOC_DEFAULT(Current, Rhs, N) \
Current = Rhs[1]; \
Current.last_line = Rhs[N].last_line; \
Current.last_column = Rhs[N].last_column;
#endif

2
dtool/src/cppparser/cppToken.cxx
View File

@ -35,12 +35,10 @@ CPPToken(int token, int line_number, int col_number,
_token(token), _lval(lval)
{
_lval.str = str;
_lloc.timestamp = 0;
_lloc.first_line = line_number;
_lloc.first_column = col_number;
_lloc.last_line = line_number;
_lloc.last_column = col_number;
_lloc.text = NULL;
_lloc.file = file;
}