* src/ltlast/multop.cc, src/ltlast/multop.hh: Declare AndNML
operator.
* src/ltlparse/ltlscan.ll: Distinguish "&" and "&&".
* src/ltlparse/ltlparse.yy: Handle them both as "And" for LTL
formula, use AndNML or And for rational expressions.
* src/ltlvisit/tostring.cc: Adjust to distinguish "&" and "&&" in
rational expressions. Also use {braces} to group rational
expressions.
* src/tgbaalgos/ltl2tgba_fm.cc
(ratexp_trad_visitor::ratexp_trad_visitor): Remove the possibility
to select the empty_word should act like true, and fix the rules
for Closure and NegClosure to rely on constant_term instead.
(ratexp_trad_visitor::visit) Adjust the And translation to also
support AndNML.
(ratexp_trad_visitor::recurse_and_concat): Introduce this new
method to simplify some calls to recurse(f, to_concat_).
* src/tgbatest/ltl2tgba.test: Add more test cases.
* src/ltlvisit/basicreduce.cc, src/ltlvisit/consterm.cc,
src/ltlvisit/contain.cc, src/ltlvisit/mark.cc,
src/ltlvisit/nenoform.cc, src/ltlvisit/syntimpl.cc,
src/tgba/formula2bdd.cc, src/tgbaalgos/eltl2tgba_lacim.cc,
src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/ltl2tgba_lacim.cc: Add
missing cases in switches.
169 lines
5.5 KiB
LLVM
169 lines
5.5 KiB
LLVM
/* Copyright (C) 2010, 2011, Laboratoire de Recherche et Développement de
|
|
** l'Epita (LRDE).
|
|
** Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
|
** département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
|
** et Marie Curie.
|
|
**
|
|
** This file is part of Spot, a model checking library.
|
|
**
|
|
** Spot is free software; you can redistribute it and/or modify it
|
|
** under the terms of the GNU General Public License as published by
|
|
** the Free Software Foundation; either version 2 of the License, or
|
|
** (at your option) any later version.
|
|
**
|
|
** Spot is distributed in the hope that it will be useful, but WITHOUT
|
|
** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
** or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
|
** License for more details.
|
|
**
|
|
** You should have received a copy of the GNU General Public License
|
|
** along with Spot; see the file COPYING. If not, write to the Free
|
|
** Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
** 02111-1307, USA.
|
|
*/
|
|
%option noyywrap
|
|
%option prefix="ltlyy"
|
|
%option outfile="lex.yy.c"
|
|
|
|
%{
|
|
#include <string>
|
|
#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) \
|
|
do { \
|
|
result = (max_size < to_parse_size) ? max_size : to_parse_size; \
|
|
memcpy(buf, to_parse, result); \
|
|
to_parse_size -= result; \
|
|
to_parse += result; \
|
|
} while (0);
|
|
|
|
#define YY_USER_ACTION \
|
|
yylloc->columns(yyleng);
|
|
|
|
static const char* to_parse = 0;
|
|
static size_t to_parse_size = 0;
|
|
static int start_token = 0;
|
|
|
|
typedef ltlyy::parser::token token;
|
|
|
|
void
|
|
flex_set_buffer(const char* buf, int start_tok)
|
|
{
|
|
to_parse = buf;
|
|
to_parse_size = strlen(to_parse);
|
|
start_token = start_tok;
|
|
}
|
|
|
|
%}
|
|
|
|
%s not_prop
|
|
|
|
%%
|
|
|
|
%{
|
|
if (start_token)
|
|
{
|
|
int t = start_token;
|
|
start_token = 0;
|
|
return t;
|
|
}
|
|
yylloc->step();
|
|
%}
|
|
|
|
"(" BEGIN(0); return token::PAR_OPEN;
|
|
")" BEGIN(not_prop); return token::PAR_CLOSE;
|
|
"{" BEGIN(0); return token::BRACE_OPEN;
|
|
"}" BEGIN(not_prop); return token::BRACE_CLOSE;
|
|
|
|
/* Must go before the other operators, because the F of FALSE
|
|
should not be mistaken with a unary F. */
|
|
"1"|[tT][rR][uU][eE] BEGIN(0); return token::CONST_TRUE;
|
|
"0"|[fF][aA][lL][sS][eE] BEGIN(0); return token::CONST_FALSE;
|
|
|
|
|
|
/* ~ comes from Goal, ! from everybody else */
|
|
"!"|"~" BEGIN(0); return token::OP_NOT;
|
|
|
|
/* PSL operators */
|
|
"[*0]" BEGIN(0); return token::CONST_EMPTYWORD;
|
|
"[]->"|"|->" BEGIN(0); return token::OP_UCONCAT;
|
|
"<>->" BEGIN(0); return token::OP_ECONCAT;
|
|
"*"|"[*]" BEGIN(0); return token::OP_STAR;
|
|
";" BEGIN(0); return token::OP_CONCAT;
|
|
":" BEGIN(0); return token::OP_FUSION;
|
|
|
|
/* & and | come from Spin. && and || from LTL2BA.
|
|
/\, \/, and xor are from LBTT.
|
|
--> and <--> come from Goal. */
|
|
"||"|"|"|"+"|"\\/" BEGIN(0); return token::OP_OR;
|
|
"&&"|"/\\" BEGIN(0); return token::OP_AND;
|
|
"&" BEGIN(0); return token::OP_SHORT_AND;
|
|
"^"|"xor" BEGIN(0); return token::OP_XOR;
|
|
"=>"|"->"|"-->" BEGIN(0); return token::OP_IMPLIES;
|
|
"<=>"|"<->"|"<-->" BEGIN(0); return token::OP_EQUIV;
|
|
"*"|"[*]" BEGIN(0); return token::OP_STAR;
|
|
";" BEGIN(0); return token::OP_CONCAT;
|
|
":" BEGIN(0); return token::OP_FUSION;
|
|
"[]->" BEGIN(0); return token::OP_UCONCAT;
|
|
"<>->" BEGIN(0); return token::OP_ECONCAT;
|
|
|
|
/* <>, [], and () are used in Spin. */
|
|
"F"|"<>" BEGIN(0); return token::OP_F;
|
|
"G"|"[]" BEGIN(0); return token::OP_G;
|
|
"U" BEGIN(0); return token::OP_U;
|
|
"R"|"V" BEGIN(0); return token::OP_R;
|
|
"X"|"()" BEGIN(0); return token::OP_X;
|
|
"W" BEGIN(0); return token::OP_W;
|
|
"M" BEGIN(0); return token::OP_M;
|
|
|
|
"=0" return token::OP_POST_NEG;
|
|
"=1" return token::OP_POST_POS;
|
|
|
|
[ \t\n]+ /* discard whitespace */ yylloc->step ();
|
|
|
|
/* An Atomic proposition cannot start with the letter
|
|
used by a unary operator (F,G,X), unless this
|
|
letter is followed by a digit in which case we assume
|
|
it's an ATOMIC_PROP (even though F0 could be seen as Ffalse, we
|
|
don't, because Ffalse is never used in practice).
|
|
*/
|
|
<INITIAL>[a-zA-EH-WYZ_.][a-zA-Z0-9_.]* |
|
|
<INITIAL>[FGX][0-9][a-zA-Z0-9_.]* |
|
|
/*
|
|
However if we have just parsed an atomic proposition, then we
|
|
are not expecting another atomic proposition, so we can be stricter
|
|
and disallow propositions that start with U, R and V. If you wonder
|
|
why we do this, consider the Wring formula `p=0Uq=1'. When p is
|
|
parsed, we enter the not_prop start condition, we remain into this
|
|
condition when `=0' is processed, and then because we are in this
|
|
condition we will not consider `Uq' as an atomic proposition but as
|
|
a `U' operator followed by a `q' atomic proposition.
|
|
|
|
We also disable atomic proposition that may look a combination
|
|
of a binary operator followed by several unary operators.
|
|
E.g. UFXp. This way, `p=0UFXp=1' will be parsed as `(p=0)U(F(X(p=1)))'.
|
|
*/
|
|
<not_prop>[a-zA-EH-QSTWYZ_.][a-zA-EH-WYZ0-9_.]* |
|
|
<not_prop>[a-zA-EH-QSTWYZ_.][a-zA-EH-WYZ0-9_.][a-zA-Z0-9_.]* {
|
|
yylval->str = new std::string(yytext, yyleng);
|
|
BEGIN(not_prop);
|
|
return token::ATOMIC_PROP;
|
|
}
|
|
|
|
/* Atomic propositions can also be enclosed in double quotes. */
|
|
\"[^\"]*\" {
|
|
yylval->str = new std::string(yytext + 1,
|
|
yyleng - 2);
|
|
BEGIN(not_prop);
|
|
return token::ATOMIC_PROP;
|
|
}
|
|
|
|
. return *yytext;
|
|
|
|
<<EOF>> return token::END_OF_INPUT;
|
|
|
|
%{
|
|
/* Dummy use of yyunput to shut up a gcc warning. */
|
|
(void) &yyunput;
|
|
%}
|