From 1b222106ab547ba154d0d29be0a536a47b45262b Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 14 Nov 2003 11:10:51 +0000 Subject: [PATCH] * src/ltlparse/ltlscan.ll: Include ltlparse/parsedecl.hh, not parsedecl.hh. * src/tgbaparse/tgbascan.ll: Likewise, include tgbaparse/parsedecl.hh. --- ChangeLog | 6 ++++++ src/ltlparse/ltlscan.ll | 2 +- src/tgbaparse/tgbascan.ll | 12 ++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index ead1aff22..f6e594a15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-11-14 Alexandre Duret-Lutz + + * src/ltlparse/ltlscan.ll: Include ltlparse/parsedecl.hh, + not parsedecl.hh. + * src/tgbaparse/tgbascan.ll: Likewise, include tgbaparse/parsedecl.hh. + 2003-11-13 Alexandre Duret-Lutz * src/tgbaalgos/emptinesscheck.cc (emptiness_check::complete_cycle): diff --git a/src/ltlparse/ltlscan.ll b/src/ltlparse/ltlscan.ll index d708fd4bb..8e73f6474 100644 --- a/src/ltlparse/ltlscan.ll +++ b/src/ltlparse/ltlscan.ll @@ -4,7 +4,7 @@ %{ #include -#include "parsedecl.hh" +#include "ltlparse/parsedecl.hh" /* Hack Flex so we read from a string instead of reading from a file. */ #define YY_INPUT(buf, result, max_size) \ diff --git a/src/tgbaparse/tgbascan.ll b/src/tgbaparse/tgbascan.ll index 6f883524d..19c94f1d8 100644 --- a/src/tgbaparse/tgbascan.ll +++ b/src/tgbaparse/tgbascan.ll @@ -4,7 +4,7 @@ %{ #include -#include "parsedecl.hh" +#include "tgbaparse/parsedecl.hh" #define YY_USER_ACTION \ yylloc->columns(yyleng); @@ -29,8 +29,8 @@ eol \n|\r|\n\r|\r\n yylloc->step (); %} -\"[^\"]*\" { - yylval->str = new std::string(yytext + 1, +\"[^\"]*\" { + yylval->str = new std::string(yytext + 1, yyleng - 2); return STRING; } @@ -42,9 +42,9 @@ acc[ \t]*= return ACC_DEF; return IDENT; } - /* discard whitespace */ + /* discard whitespace */ {eol} yylloc->lines(yyleng); yylloc->step(); -[ \t]+ yylloc->step(); +[ \t]+ yylloc->step(); . return *yytext; @@ -80,4 +80,4 @@ namespace spot { fclose(yyin); } -} \ No newline at end of file +}