arcs. ltl2tgba_fm benefits from this and join multiple arcs with the same destination and acceptance conditions. * src/tgba/formula2bdd.cc, src/tgba/formula2bdd.hh: New files. * src/tgba/Makefile.am (tgba_HEADERS, libtgba_la_SOURCES): Add them. * src/tgba/bddprint.cc, src/tgba/bddprint.hh (bdd_pring_formula, bdd_format_formula): New functions. * src/tgba/tgbaexplicit.hh (tgba_explicit::get_condition, tgba_explicit::add_condition, tgba_explicit::add_neg_condition, tgba_explicit::declare_accepting_condition, tgba_explicit::has_accepting_condition, tgba_explicit::get_accepting_condition, tgba_explicit::add_accepting_condition): Take a const formula*. * src/tgba/tgbaexplicit.cc (tgba_explicit::add_condition): Rewrite using formula_to_bdd. * src/tgbaalgos/dotty.cc (dotty_bfs::process_link): Use bdd_print_formula to display conditions. * src/tgbaalgos/save.cc (save_bfs::process_state): Likewise. * src/tgbaalgos/ltl2tgba_fm.cc (translate_dict::bdd_to_formula): New function. (translate_dict::conj_bdd_to_atomic_props): Remove. (ltl_to_tgba_fm): Factor successors on accepting conditions and destinations, not conditions. Use bdd_to_formula to translate the conditions. * src/tgbaparse/tgbaparse.yy: Expect conditions as a formula in a string, call the LTL parser for this. * src/tgbaparse/tgbascan.ll: Process " and \ escapes in strings. * src/tgbatest/emptchke.test, src/tgbatest/explicit.test, src/tgbatest/explpro2.test, src/tgbatest/explpro3.test, src/tgbatest/explprod.test, src/tgbatest/mixprod.test, src/tgbatest/readsave.test, src/tgbatest/tgbaread.test, src/tgbatest/tripprod.test: Adjust to new syntax for explicit automata.
221 lines
5.2 KiB
Text
221 lines
5.2 KiB
Text
/* Copyright (C) 2003 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.
|
|
*/
|
|
%{
|
|
#include <string>
|
|
#include "public.hh"
|
|
%}
|
|
|
|
%parse-param {spot::tgba_parse_error_list &error_list}
|
|
%parse-param {spot::ltl::environment &parse_environment}
|
|
%parse-param {spot::tgba_explicit* &result}
|
|
%debug
|
|
%error-verbose
|
|
%union
|
|
{
|
|
int token;
|
|
std::string* str;
|
|
std::list<std::pair<bool, spot::ltl::formula*> >* listp;
|
|
std::list<spot::ltl::formula*>* list;
|
|
}
|
|
|
|
%{
|
|
#include "ltlast/constant.hh"
|
|
#include "ltlvisit/destroy.hh"
|
|
#include "ltlparse/public.hh"
|
|
|
|
/* tgbaparse.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;
|
|
|
|
/* Ugly hack so that Bison use tgbayylex, not yylex.
|
|
(%name-prefix doesn't work for the lalr1.cc skeleton
|
|
at the time of writing.) */
|
|
#define yylex tgbayylex
|
|
|
|
typedef std::pair<bool, spot::ltl::formula*> pair;
|
|
%}
|
|
|
|
%token <str> STRING UNTERMINATED_STRING
|
|
%token <str> IDENT
|
|
%type <str> strident string
|
|
%type <listp> cond_list
|
|
%type <list> acc_list
|
|
%token ACC_DEF
|
|
|
|
%%
|
|
tgba: accepting_decl lines | lines;
|
|
|
|
accepting_decl: ACC_DEF acc_decl ';'
|
|
|
|
/* At least one line. */
|
|
lines: line
|
|
| lines line
|
|
;
|
|
|
|
line: strident ',' strident ',' cond_list ',' acc_list ';'
|
|
{
|
|
spot::tgba_explicit::transition* t
|
|
= result->create_transition(*$1, *$3);
|
|
std::list<pair>::iterator i;
|
|
for (i = $5->begin(); i != $5->end(); ++i)
|
|
if (i->first)
|
|
result->add_neg_condition(t, i->second);
|
|
else
|
|
result->add_condition(t, i->second);
|
|
std::list<formula*>::iterator i2;
|
|
for (i2 = $7->begin(); i2 != $7->end(); ++i2)
|
|
result->add_accepting_condition(t, *i2);
|
|
delete $1;
|
|
delete $3;
|
|
delete $5;
|
|
delete $7;
|
|
}
|
|
;
|
|
|
|
string: STRING
|
|
| UNTERMINATED_STRING
|
|
{
|
|
error_list.push_back(spot::tgba_parse_error(@1,
|
|
"unterminated string"));
|
|
}
|
|
|
|
strident: string | IDENT
|
|
|
|
cond_list:
|
|
{
|
|
$$ = new std::list<pair>;
|
|
}
|
|
| cond_list string§
|
|
{
|
|
if (*$2 != "")
|
|
{
|
|
parse_error_list pel;
|
|
formula* f = spot::ltl::parse(*$2, pel, parse_environment);
|
|
for (parse_error_list::iterator i = pel.begin();
|
|
i != pel.end(); ++i)
|
|
{
|
|
// Adjust the diagnostic to the current position.
|
|
Location here = @2;
|
|
here.begin.line += i->first.begin.line;
|
|
here.begin.column += i->first.begin.column;
|
|
here.end.line = here.begin.line + i->first.begin.line;
|
|
here.end.column = here.begin.column + i->first.begin.column;
|
|
error_list.push_back(spot::tgba_parse_error(here, i->second));
|
|
}
|
|
$1->push_back(pair(false, f));
|
|
}
|
|
delete $2;
|
|
$$ = $1;
|
|
}
|
|
| cond_list '!' strident
|
|
{
|
|
if (*$3 != "")
|
|
{
|
|
$1->push_back(pair(true, parse_environment.require(*$3)));
|
|
}
|
|
delete $3;
|
|
$$ = $1;
|
|
}
|
|
;
|
|
|
|
acc_list:
|
|
{
|
|
$$ = new std::list<formula*>;
|
|
}
|
|
| acc_list strident
|
|
{
|
|
if (*$2 == "true")
|
|
{
|
|
$1->push_back(constant::true_instance());
|
|
}
|
|
else if (*$2 != "" && *$2 != "false")
|
|
{
|
|
formula* f = parse_environment.require(*$2);
|
|
if (! result->has_accepting_condition(f))
|
|
{
|
|
error_list.push_back(spot::tgba_parse_error(@2,
|
|
"undeclared accepting condition"));
|
|
destroy(f);
|
|
delete $2;
|
|
YYERROR;
|
|
}
|
|
$1->push_back(f);
|
|
}
|
|
delete $2;
|
|
$$ = $1;
|
|
}
|
|
;
|
|
|
|
|
|
acc_decl:
|
|
| acc_decl strident
|
|
{
|
|
formula* f = parse_environment.require(*$2);
|
|
result->declare_accepting_condition(f);
|
|
delete $2;
|
|
}
|
|
;
|
|
|
|
%%
|
|
|
|
void
|
|
yy::Parser::print_()
|
|
{
|
|
if (looka_ == STRING || looka_ == IDENT)
|
|
YYCDEBUG << " '" << *value.str << "'";
|
|
}
|
|
|
|
void
|
|
yy::Parser::error_()
|
|
{
|
|
error_list.push_back(spot::tgba_parse_error(location, message));
|
|
}
|
|
|
|
namespace spot
|
|
{
|
|
tgba_explicit*
|
|
tgba_parse(const std::string& name,
|
|
tgba_parse_error_list& error_list,
|
|
bdd_dict* dict,
|
|
environment& env,
|
|
bool debug)
|
|
{
|
|
if (tgbayyopen(name))
|
|
{
|
|
error_list.push_back
|
|
(tgba_parse_error(yy::Location(),
|
|
std::string("Cannot open file ") + name));
|
|
return 0;
|
|
}
|
|
tgba_explicit* result = new tgba_explicit(dict);
|
|
tgbayy::Parser parser(debug, yy::Location(), error_list, env, result);
|
|
parser.parse();
|
|
tgbayyclose();
|
|
return result;
|
|
}
|
|
}
|
|
|
|
// Local Variables:
|
|
// mode: c++
|
|
// End:
|