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

hoa: swallow the neverclaim parser

Browse source 
This way we can easily parse a stream of HOAs intermixed with
neverclaims.

* src/hoaparse/hoaparse.yy, src/hoaparse/hoascan.ll: Add rules
for neverclaims, adjusted from src/neverparse/neverclaimparse.yy
and src/neverparse/neverclaimparse.ll.
* src/hoaparse/public.hh, NEWS: Update documentation.
* src/neverparse/: Remove this directory.
* README, configure.ac, src/Makefile.am: Adjust accordingly.
* src/tgbatest/ltl2tgba.cc, src/bin/ltlcross.cc: Use HOA
parser to read neverclaims.
* src/tgbatest/hoaparse.test, src/tgbatest/neverclaimread.test: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2014-12-03 18:20:35 +01:00
parent 39eefd0c6e
commit e1bba50047
18 changed files with 453 additions and 817 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/tgbatest/ltl2tgba.cc
View file

@ -41,7 +41,6 @@
#include "tgba/tgbaproduct.hh"
#include "tgbaalgos/reducerun.hh"
#include "tgbaparse/public.hh"
#include "neverparse/public.hh"
#include "dstarparse/public.hh"
#include "hoaparse/public.hh"
#include "tgbaalgos/dupexp.hh"
@ -358,8 +357,7 @@ checked_main(int argc, char** argv)
bool accepting_run = false;
bool accepting_run_replay = false;
bool from_file = false;
enum { ReadSpot, ReadLbtt, ReadNeverclaim, ReadDstar, ReadHoa } readformat
= ReadSpot;
enum { ReadSpot, ReadLbtt, ReadDstar, ReadHoa } readformat = ReadSpot;
bool nra2nba = false;
bool dra2dba = false;
bool scc_filter = false;
@ -936,10 +934,10 @@ checked_main(int argc, char** argv)
from_file = true;
readformat = ReadLbtt;
}
else if (!strcmp(argv[formula_index], "-XN"))
else if (!strcmp(argv[formula_index], "-XN")) // now synonym for -XH
{
from_file = true;
readformat = ReadNeverclaim;
readformat = ReadHoa;
}
else if (!strcmp(argv[formula_index], "-y"))
{
@ -1031,20 +1029,6 @@ checked_main(int argc, char** argv)
e->merge_transitions();
}
break;
case ReadNeverclaim:
{
spot::tgba_digraph_ptr e;
spot::neverclaim_parse_error_list pel;
tm.start("parsing neverclaim");
a = e = spot::neverclaim_parse(input, pel, dict,
env, debug_opt);
tm.stop("parsing neverclaim");
if (spot::format_neverclaim_parse_errors(std::cerr, input, pel))
return 2;
assume_sba = true;
e->merge_transitions();
}
break;
case ReadLbtt:
{
std::string error;
@ -1113,8 +1097,9 @@ checked_main(int argc, char** argv)
tm.stop("parsing hoa");
if (spot::format_hoa_parse_errors(std::cerr, input, pel))
return 2;
daut->aut->merge_transitions();
a = daut->aut;
assume_sba = false;
assume_sba = a->is_sba();
}
break;
}