* src/ltlast/binop.cc, src/ltlast/binop.cc: Add support for these new operators. * src/ltlparse/ltlparse.yy, src/ltlparse/ltlscan.ll: Parse them. * src/ltltest/reduccmp.test: Add new tests for W and M. * src/ltlvisit/basicreduce.cc, src/ltlvisit/contain.cc, src/ltlvisit/lunabbrev.cc, src/ltlvisit/nenoform.cc, src/ltlvisit/randomltl.cc, src/ltlvisit/randomltl.hh, src/ltlvisit/reduce.cc, src/ltlvisite/simpfg.cc, src/ltlvisit/simpfg.hh, src/ltlvisit/syntimpl.cc, src/ltlvisit/tostring.cc, src/tgba/formula2bdd.cc, src/tgbaalgos/eltl2tgba_lacim.cc, src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/ltl2tgba_lacim.cc: Add support for W and M. * src/tgbatest/ltl2neverclaim.test: Test never claim output using LBTT, this is more thorough. Also we cannot use -N any more in the spotlbtt.test. * src/tgbatests/ltl2tgba.cc: Define M and W for ELTL. * src/tgbatest/ltl2neverclaim.test: Test W and M, and use -DS instead of -N, because lbtt-translate does not want to translate these operators for tools that masquerade as Spin.
299 lines
8.4 KiB
Text
299 lines
8.4 KiB
Text
/* Copyright (C) 2009, 2010 Laboratoire de Recherche et Développement
|
|
** de l'Epita (LRDE).
|
|
/* Copyright (C) 2010 Laboratoire de Recherche et Développement de
|
|
** l'Epita (LRDE).
|
|
** Copyright (C) 2003, 2004, 2005, 2006 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.
|
|
*/
|
|
%language "C++"
|
|
%locations
|
|
%defines
|
|
%name-prefix "ltlyy"
|
|
%debug
|
|
%error-verbose
|
|
|
|
%code requires
|
|
{
|
|
#include <string>
|
|
#include "public.hh"
|
|
#include "ltlast/allnodes.hh"
|
|
}
|
|
|
|
%parse-param {spot::ltl::parse_error_list &error_list}
|
|
%parse-param {spot::ltl::environment &parse_environment}
|
|
%parse-param {spot::ltl::formula* &result}
|
|
%union
|
|
{
|
|
std::string* str;
|
|
spot::ltl::formula* ltl;
|
|
}
|
|
|
|
%code {
|
|
/* ltlparse.hh and parsedecl.hh include each other recursively.
|
|
We mut ensure that YYSTYPE is declared (by the above %union)
|
|
before parsedecl.hh uses it. */
|
|
#include "parsedecl.hh"
|
|
using namespace spot::ltl;
|
|
|
|
#define missing_right_op(res, op, str) \
|
|
do \
|
|
{ \
|
|
error_list.push_back(parse_error(op, \
|
|
"missing right operand for \"" str "\"")); \
|
|
res = constant::false_instance(); \
|
|
} \
|
|
while (0);
|
|
|
|
#define missing_right_binop(res, left, op, str) \
|
|
do \
|
|
{ \
|
|
left->destroy(); \
|
|
missing_right_op(res, op, str); \
|
|
} \
|
|
while (0);
|
|
|
|
}
|
|
|
|
|
|
/* All tokens. */
|
|
|
|
%token PAR_OPEN "opening parenthesis" PAR_CLOSE "closing parenthesis"
|
|
%token OP_OR "or operator" OP_XOR "xor operator" OP_AND "and operator"
|
|
%token OP_IMPLIES "implication operator" OP_EQUIV "equivalent operator"
|
|
%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 <str> ATOMIC_PROP "atomic proposition"
|
|
%token CONST_TRUE "constant true" CONST_FALSE "constant false"
|
|
%token END_OF_INPUT "end of formula"
|
|
%token OP_POST_NEG "negative suffix" OP_POST_POS "positive suffix"
|
|
|
|
/* Priorities. */
|
|
|
|
/* Logical operators. */
|
|
%left OP_IMPLIES OP_EQUIV
|
|
%left OP_OR
|
|
%left OP_XOR
|
|
%left OP_AND
|
|
|
|
/* LTL operators. */
|
|
%left OP_U OP_R OP_M OP_W
|
|
%nonassoc OP_F OP_G
|
|
%nonassoc OP_X
|
|
|
|
/* Not has the most important priority after Wring's `=0' and `=1'. */
|
|
%nonassoc OP_NOT
|
|
|
|
%nonassoc OP_POST_NEG OP_POST_POS
|
|
|
|
%type <ltl> subformula
|
|
|
|
%destructor { delete $$; } <str>
|
|
%destructor { $$->destroy(); } <ltl>
|
|
|
|
%printer { debug_stream() << *$$; } <str>
|
|
|
|
%%
|
|
result: subformula END_OF_INPUT
|
|
{ result = $1;
|
|
YYACCEPT;
|
|
}
|
|
| error END_OF_INPUT
|
|
{ error_list.push_back(parse_error(@1,
|
|
"could not parse anything sensible"));
|
|
result = 0;
|
|
YYABORT;
|
|
}
|
|
| subformula error END_OF_INPUT
|
|
{ error_list.push_back(parse_error(@2,
|
|
"ignoring trailing garbage"));
|
|
result = $1;
|
|
YYACCEPT;
|
|
}
|
|
| END_OF_INPUT
|
|
{ error_list.push_back(parse_error(@$, "empty input"));
|
|
result = 0;
|
|
YYABORT;
|
|
}
|
|
|
|
/* The reason we use `constant::false_instance()' for error recovery
|
|
is that it isn't reference counted. (Hence it can't leak references.) */
|
|
|
|
subformula: ATOMIC_PROP
|
|
{
|
|
$$ = parse_environment.require(*$1);
|
|
if (! $$)
|
|
{
|
|
std::string s = "unknown atomic proposition `";
|
|
s += *$1;
|
|
s += "' in environment `";
|
|
s += parse_environment.name();
|
|
s += "'";
|
|
error_list.push_back(parse_error(@1, s));
|
|
delete $1;
|
|
YYERROR;
|
|
}
|
|
else
|
|
delete $1;
|
|
}
|
|
| ATOMIC_PROP OP_POST_POS
|
|
{
|
|
$$ = parse_environment.require(*$1);
|
|
if (! $$)
|
|
{
|
|
std::string s = "unknown atomic proposition `";
|
|
s += *$1;
|
|
s += "' in environment `";
|
|
s += parse_environment.name();
|
|
s += "'";
|
|
error_list.push_back(parse_error(@1, s));
|
|
delete $1;
|
|
YYERROR;
|
|
}
|
|
else
|
|
delete $1;
|
|
}
|
|
| ATOMIC_PROP OP_POST_NEG
|
|
{
|
|
$$ = parse_environment.require(*$1);
|
|
if (! $$)
|
|
{
|
|
std::string s = "unknown atomic proposition `";
|
|
s += *$1;
|
|
s += "' in environment `";
|
|
s += parse_environment.name();
|
|
s += "'";
|
|
error_list.push_back(parse_error(@1, s));
|
|
delete $1;
|
|
YYERROR;
|
|
}
|
|
else
|
|
delete $1;
|
|
$$ = unop::instance(unop::Not, $$);
|
|
}
|
|
| CONST_TRUE
|
|
{ $$ = constant::true_instance(); }
|
|
| CONST_FALSE
|
|
{ $$ = constant::false_instance(); }
|
|
| PAR_OPEN subformula PAR_CLOSE
|
|
{ $$ = $2; }
|
|
| PAR_OPEN error PAR_CLOSE
|
|
{ error_list.push_back(parse_error(@$,
|
|
"treating this parenthetical block as false"));
|
|
$$ = constant::false_instance();
|
|
}
|
|
| PAR_OPEN subformula END_OF_INPUT
|
|
{ error_list.push_back(parse_error(@1 + @2,
|
|
"missing closing parenthesis"));
|
|
$$ = $2;
|
|
}
|
|
| PAR_OPEN error END_OF_INPUT
|
|
{ error_list.push_back(parse_error(@$,
|
|
"missing closing parenthesis, "
|
|
"treating this parenthetical block as false"));
|
|
$$ = constant::false_instance();
|
|
}
|
|
| subformula OP_AND subformula
|
|
{ $$ = multop::instance(multop::And, $1, $3); }
|
|
| subformula OP_AND error
|
|
{ missing_right_binop($$, $1, @2, "and operator"); }
|
|
| subformula OP_OR subformula
|
|
{ $$ = multop::instance(multop::Or, $1, $3); }
|
|
| subformula OP_OR error
|
|
{ missing_right_binop($$, $1, @2, "or operator"); }
|
|
| subformula OP_XOR subformula
|
|
{ $$ = binop::instance(binop::Xor, $1, $3); }
|
|
| subformula OP_XOR error
|
|
{ missing_right_binop($$, $1, @2, "xor operator"); }
|
|
| subformula OP_IMPLIES subformula
|
|
{ $$ = binop::instance(binop::Implies, $1, $3); }
|
|
| subformula OP_IMPLIES error
|
|
{ missing_right_binop($$, $1, @2, "implication operator"); }
|
|
| subformula OP_EQUIV subformula
|
|
{ $$ = binop::instance(binop::Equiv, $1, $3); }
|
|
| subformula OP_EQUIV error
|
|
{ missing_right_binop($$, $1, @2, "equivalent operator"); }
|
|
| subformula OP_U subformula
|
|
{ $$ = binop::instance(binop::U, $1, $3); }
|
|
| subformula OP_U error
|
|
{ missing_right_binop($$, $1, @2, "until operator"); }
|
|
| subformula OP_R subformula
|
|
{ $$ = binop::instance(binop::R, $1, $3); }
|
|
| subformula OP_R error
|
|
{ missing_right_binop($$, $1, @2, "release operator"); }
|
|
| subformula OP_W subformula
|
|
{ $$ = binop::instance(binop::W, $1, $3); }
|
|
| subformula OP_W error
|
|
{ missing_right_binop($$, $1, @2, "weak until operator"); }
|
|
| subformula OP_M subformula
|
|
{ $$ = binop::instance(binop::M, $1, $3); }
|
|
| subformula OP_M error
|
|
{ missing_right_binop($$, $1, @2, "strong release operator"); }
|
|
| OP_F subformula
|
|
{ $$ = unop::instance(unop::F, $2); }
|
|
| OP_F error
|
|
{ missing_right_op($$, @1, "sometimes operator"); }
|
|
| OP_G subformula
|
|
{ $$ = unop::instance(unop::G, $2); }
|
|
| OP_G error
|
|
{ missing_right_op($$, @1, "always operator"); }
|
|
| OP_X subformula
|
|
{ $$ = unop::instance(unop::X, $2); }
|
|
| OP_X error
|
|
{ missing_right_op($$, @1, "next operator"); }
|
|
| OP_NOT subformula
|
|
{ $$ = unop::instance(unop::Not, $2); }
|
|
| OP_NOT error
|
|
{ missing_right_op($$, @1, "not operator"); }
|
|
;
|
|
|
|
%%
|
|
|
|
void
|
|
ltlyy::parser::error(const location_type& location, const std::string& message)
|
|
{
|
|
error_list.push_back(parse_error(location, message));
|
|
}
|
|
|
|
namespace spot
|
|
{
|
|
namespace ltl
|
|
{
|
|
formula*
|
|
parse(const std::string& ltl_string,
|
|
parse_error_list& error_list,
|
|
environment& env,
|
|
bool debug)
|
|
{
|
|
formula* result = 0;
|
|
flex_set_buffer(ltl_string.c_str());
|
|
ltlyy::parser parser(error_list, env, result);
|
|
parser.set_debug_level(debug);
|
|
parser.parse();
|
|
return result;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Local Variables:
|
|
// mode: c++
|
|
// End:
|