diff --git a/ChangeLog b/ChangeLog index 494c66ac8..6c8e5f307 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-02-07 Alexandre Duret-Lutz + + Generalize patch from 2011-02-03 by allowing guards like "! (...)". + + * src/neverparse/neverclaimscan.ll: Allow space between ! and (. + * src/tgbatest/neverclaimread.test: Add space for testing. + 2011-02-06 Alexandre Duret-Lutz Speedup scc_filter on tgba_explicit_number automata. diff --git a/src/neverparse/neverclaimscan.ll b/src/neverparse/neverclaimscan.ll index d92e780bd..9d4e95af4 100644 --- a/src/neverparse/neverclaimscan.ll +++ b/src/neverparse/neverclaimscan.ll @@ -56,7 +56,7 @@ eol \n|\r|\n\r|\r\n "goto" return token::GOTO; "false"|"0" return token::FALSE; -"!"?"(".*")"|"true"|"1" { +("!"[ \t]+)?"(".*")"|"true"|"1" { yylval->str = new std::string(yytext, yyleng); return token::FORMULA; } diff --git a/src/tgbatest/neverclaimread.test b/src/tgbatest/neverclaimread.test index 1fbc0182e..fcdd807d5 100755 --- a/src/tgbatest/neverclaimread.test +++ b/src/tgbatest/neverclaimread.test @@ -35,7 +35,7 @@ T1: if :: (p1 && (! p0)) -> goto accept_all :: (p1) -> goto T1 -:: !(p1) -> goto T2_init +:: ! (p1) -> goto T2_init fi; accept_all: skip