alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Parse the fusion operator (":") and translate it in ltl2tgba_fm().

Browse source 
* src/ltlast/multop.hh (multop::type::Fusion): New operator.
* src/ltlast/multop.cc: Handle it.
* src/ltlparse/ltlparse.yy: Declare OP_FUSION and add grammar
rules.
* src/ltlparse/ltlscan.ll: Recognize ":" as OP_FUSION.
* src/tgbaalgos/ltl2tgba_fm.cc (ratexp_trad_visitor::visit):
Add translation rule for multop::Fusion.
* src/tgbatest/ltl2tgba.test: Add more tests.
* 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/ltlvisit/tostring.cc, src/tgba/formula2bdd.cc,
src/tgbaalgos/eltl2tgba_lacim.cc, src/tgbaalgos/ltl2taa.cc,
src/tgbaalgos/ltl2tgba_lacim.cc: Handle multop::Fusion in switches.
This commit is contained in:
Alexandre Duret-Lutz 2010-03-02 16:25:08 +01:00
parent ad519b8568
commit c2b3dac7aa
17 changed files with 146 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ltlparse/ltlparse.yy
View file

@ -83,11 +83,11 @@ using namespace spot::ltl;
%token OP_U "until operator" OP_R "release operator"
%token OP_W "weak until operator" OP_M "strong release operator"
%token OP_F "sometimes operator" OP_G "always operator"
%token OP_X "next operator" OP_NOT "not operator"
%token OP_X "next operator" OP_NOT "not operator" OP_STAR "star operator"
%token OP_UCONCAT "universal concat operator"
%token OP_ECONCAT "existential concat operator"
%token <str> ATOMIC_PROP "atomic proposition"
%token OP_STAR "star operator" OP_CONCAT "concat operator"
%token OP_CONCAT "concat operator" OP_FUSION "fusion operator"
%token CONST_TRUE "constant true" CONST_FALSE "constant false"
%token END_OF_INPUT "end of formula" CONST_EMPTYWORD "empty word"
%token OP_POST_NEG "negative suffix" OP_POST_POS "positive suffix"
@ -97,7 +97,7 @@ using namespace spot::ltl;
/* Low priority regex operator. */
%left OP_UCONCAT OP_ECONCAT
%left OP_CONCAT
%left OP_CONCAT OP_FUSION
/* Logical operators. */
%left OP_IMPLIES OP_EQUIV
@ -264,6 +264,10 @@ rationalexp: booleanatom
{ $$ = multop::instance(multop::Concat, $1, $3); }
| rationalexp OP_CONCAT error
{ missing_right_binop($$, $1, @2, "concat operator"); }
| rationalexp OP_FUSION rationalexp
{ $$ = multop::instance(multop::Fusion, $1, $3); }
| rationalexp OP_FUSION error
{ missing_right_binop($$, $1, @2, "fusion operator"); }
| rationalexp OP_STAR
{ $$ = unop::instance(unop::Star, $1); }