* src/evtgbatest/evtgbaparse.yy, src/evtgbaparse/evtgbascan.ll,

src/evtgbaparse/parsedecl.hh, src/evtgbaparse/public.hh,
src/ltlparse/fmterror.cc, src/ltlparse/ltlparse.yy,
src/ltlparse/ltlscan.ll, src/ltlparse/parsedecl.hh,
src/ltlparse/public.hh, src/tgbaparse/parsedecl.hh,
src/tgbaparse/public.hh, src/tgbaparse/tgbaparse.yy,
src/tgbaparse/tgbascan.ll: Adjust for Bison 2.3.  Use %name-prefix
instead of the "#define yy ... " kludge.
This commit is contained in:
Alexandre Duret-Lutz 2006-08-01 16:35:06 +00:00
parent db98955e9d
commit c055212326
14 changed files with 86 additions and 70 deletions

View file

@ -33,6 +33,8 @@
#define YY_NEVER_INTERACTIVE 1
typedef tgbayy::parser::token token;
%}
eol \n|\r|\n\r|\r\n
@ -43,11 +45,11 @@ eol \n|\r|\n\r|\r\n
yylloc->step ();
%}
acc[ \t]*= return ACC_DEF;
acc[ \t]*= return token::ACC_DEF;
[a-zA-Z][a-zA-Z0-9_]* {
yylval->str = new std::string(yytext, yyleng);
return IDENT;
return token::IDENT;
}
/* discard whitespace */
@ -65,13 +67,13 @@ acc[ \t]*= return ACC_DEF;
<STATE_STRING>{
\" {
BEGIN(INITIAL);
return STRING;
return token::STRING;
}
\\["\\] yylval->str->append(1, yytext[1]);
[^"\\]+ yylval->str->append(yytext, yyleng);
<<EOF>> {
BEGIN(INITIAL);
return UNTERMINATED_STRING;
return token::UNTERMINATED_STRING;
}
}