revamp the formula hierarchy (montro-patch)
Flatten the formula ltl::formula hiearchy into a single ltl::vnode that has an enumerator to distinguish the types of node, and a common interface to access children, update reference counts, etc. The ltl::formula class is now a thin wrapper around an ltl::vnode pointer to keep track of reference counts automatically. Visitor are not used anymore; we now have map() and traversor() methods that are more concise. This basically fixes #43, but should be followed by some fine tuning that should now be localized to the formula.hh and formula.cc files. Some statistics about this patch. I started working on it on Sep 9, had a first compiling version two weeks later on Sep 22, and it then took 5 days to fixes the ~70 distincts bugs that were introduced during the conversion. About 13200 lines were modified, and one third of those were removed. * src/ltlast/formula.cc, src/ltlast/formula.hh: Complete rewrite, including what was in separate nearby files. * src/ltlast/allnodes.hh, src/ltlast/atomic_prop.cc, src/ltlast/atomic_prop.hh, src/ltlast/binop.cc, src/ltlast/binop.hh, src/ltlast/bunop.cc, src/ltlast/bunop.hh, src/ltlast/constant.cc, src/ltlast/constant.hh, src/ltlast/multop.cc, src/ltlast/multop.hh, src/ltlast/unop.cc, src/ltlast/unop.hh, src/ltlvisit/dump.cc, src/ltlvisit/dump.hh, src/ltlast/predecl.hh: Delete these files. Their feature have been merged in formula.hh and formula.cc. * src/ltlast/visitor.hh, src/ltlvisit/clone.cc, src/ltlvisit/clone.hh, src/ltlvisit/dump.hh, src/ltlvisit/postfix.cc, src/ltlvisit/postfix.hh: Delete these files, as we do not use visitors anymore. * bench/stutter/stutter_invariance_formulas.cc, bench/stutter/stutter_invariance_randomgraph.cc, doc/org/tut01.org, doc/org/tut02.org, doc/org/tut10.org, doc/org/tut22.org, iface/ltsmin/ltsmin.cc, iface/ltsmin/ltsmin.hh, iface/ltsmin/modelcheck.cc, src/bin/autfilt.cc, src/bin/common_aoutput.cc, src/bin/common_aoutput.hh, src/bin/common_finput.cc, src/bin/common_finput.hh, src/bin/common_output.cc, src/bin/common_output.hh, src/bin/common_trans.cc, src/bin/common_trans.hh, src/bin/dstar2tgba.cc, src/bin/genltl.cc, src/bin/ltl2tgba.cc, src/bin/ltl2tgta.cc, src/bin/ltlcross.cc, src/bin/ltldo.cc, src/bin/ltlfilt.cc, src/bin/ltlgrind.cc, src/bin/randaut.cc, src/bin/randltl.cc, src/kripke/kripkeexplicit.cc, src/kripke/kripkeexplicit.hh, src/kripkeparse/kripkeparse.yy, src/ltlast/Makefile.am, src/ltlenv/declenv.cc, src/ltlenv/declenv.hh, src/ltlenv/defaultenv.cc, src/ltlenv/defaultenv.hh, src/ltlenv/environment.hh, src/ltlparse/ltlparse.yy, src/ltlparse/public.hh, src/ltlvisit/Makefile.am, src/ltlvisit/apcollect.cc, src/ltlvisit/apcollect.hh, src/ltlvisit/contain.cc, src/ltlvisit/contain.hh, src/ltlvisit/dot.cc, src/ltlvisit/dot.hh, src/ltlvisit/exclusive.cc, src/ltlvisit/exclusive.hh, src/ltlvisit/length.cc, src/ltlvisit/length.hh, src/ltlvisit/mark.cc, src/ltlvisit/mark.hh, src/ltlvisit/mutation.cc, src/ltlvisit/mutation.hh, src/ltlvisit/nenoform.cc, src/ltlvisit/nenoform.hh, src/ltlvisit/print.cc, src/ltlvisit/print.hh, src/ltlvisit/randomltl.cc, src/ltlvisit/randomltl.hh, src/ltlvisit/relabel.cc, src/ltlvisit/relabel.hh, src/ltlvisit/remove_x.cc, src/ltlvisit/remove_x.hh, src/ltlvisit/simpfg.cc, src/ltlvisit/simpfg.hh, src/ltlvisit/simplify.cc, src/ltlvisit/simplify.hh, src/ltlvisit/snf.cc, src/ltlvisit/snf.hh, src/ltlvisit/unabbrev.cc, src/ltlvisit/unabbrev.hh, src/parseaut/parseaut.yy, src/ta/taexplicit.cc, src/ta/tgtaexplicit.cc, src/taalgos/minimize.cc, src/taalgos/tgba2ta.cc, src/tests/bare.test, src/tests/checkpsl.cc, src/tests/checkta.cc, src/tests/complementation.cc, src/tests/consterm.cc, src/tests/emptchk.cc, src/tests/equalsf.cc, src/tests/ikwiad.cc, src/tests/isop.test, src/tests/kind.cc, src/tests/length.cc, src/tests/ltldo.test, src/tests/ltlfilt.test, src/tests/ltlgrind.test, src/tests/ltlprod.cc, src/tests/ltlrel.cc, src/tests/parse_print_test.cc, src/tests/parseaut.test, src/tests/parseerr.test, src/tests/randtgba.cc, src/tests/readltl.cc, src/tests/reduc.cc, src/tests/syntimpl.cc, src/tests/taatgba.cc, src/tests/tostring.cc, src/tests/twagraph.cc, src/tests/utf8.test, src/twa/acc.cc, src/twa/bdddict.cc, src/twa/bdddict.hh, src/twa/bddprint.cc, src/twa/formula2bdd.cc, src/twa/formula2bdd.hh, src/twa/taatgba.cc, src/twa/taatgba.hh, src/twa/twa.cc, src/twa/twa.hh src/twa/twagraph.cc, src/twa/twagraph.hh, src/twa/twasafracomplement.cc, src/twaalgos/compsusp.cc, src/twaalgos/compsusp.hh, src/twaalgos/dtgbasat.cc, src/twaalgos/hoa.cc, src/twaalgos/lbtt.cc, src/twaalgos/ltl2taa.cc, src/twaalgos/ltl2taa.hh, src/twaalgos/ltl2tgba_fm.cc, src/twaalgos/ltl2tgba_fm.hh, src/twaalgos/minimize.cc, src/twaalgos/minimize.hh, src/twaalgos/neverclaim.cc, src/twaalgos/postproc.cc, src/twaalgos/postproc.hh, src/twaalgos/powerset.cc, src/twaalgos/powerset.hh, src/twaalgos/randomgraph.cc, src/twaalgos/remprop.cc, src/twaalgos/remprop.hh, src/twaalgos/stats.cc, src/twaalgos/stats.hh, src/twaalgos/stutter.cc, src/twaalgos/stutter.hh, src/twaalgos/translate.cc, src/twaalgos/translate.hh, wrap/python/ajax/spotcgi.in, wrap/python/spot.py, wrap/python/spot_impl.i, wrap/python/Makefile.am, wrap/python/tests/automata-io.ipynb, wrap/python/tests/formulas.ipynb, wrap/python/tests/ltl2tgba.py, wrap/python/tests/ltlparse.py, wrap/python/tests/ltlsimple.py, wrap/python/tests/randltl.ipynb: Adjust to use the new interface. * src/sanity/style.test: Accept more C++11 patterns. * NEWS: Mention the change.
This commit is contained in:
Alexandre Duret-Lutz
parent
1628b188fe
commit
b77f7e24c3
177 changed files with 8295 additions and 13332 deletions
|
|
@ -26,13 +26,15 @@
|
|||
#include <cstddef>
|
||||
%}
|
||||
|
||||
%module(directors="1") spot_impl
|
||||
%module(director="1") spot_impl
|
||||
|
||||
%include "std_shared_ptr.i"
|
||||
%include "std_vector.i"
|
||||
%include "std_string.i"
|
||||
%include "std_list.i"
|
||||
%include "std_set.i"
|
||||
%include "std_map.i"
|
||||
%include "stdint.i"
|
||||
%include "exception.i"
|
||||
%include "typemaps.i"
|
||||
|
||||
|
|
@ -64,10 +66,6 @@
|
|||
%shared_ptr(spot::emptiness_check_instantiator)
|
||||
%shared_ptr(spot::tgbasl)
|
||||
|
||||
namespace std {
|
||||
%template(liststr) list<string>;
|
||||
};
|
||||
|
||||
%import "buddy.i"
|
||||
|
||||
%{
|
||||
|
|
@ -83,12 +81,6 @@ namespace std {
|
|||
#include "misc/random.hh"
|
||||
|
||||
#include "ltlast/formula.hh"
|
||||
#include "ltlast/atomic_prop.hh"
|
||||
#include "ltlast/binop.hh"
|
||||
#include "ltlast/constant.hh"
|
||||
#include "ltlast/multop.hh"
|
||||
#include "ltlast/unop.hh"
|
||||
#include "ltlast/visitor.hh"
|
||||
|
||||
#include "ltlenv/environment.hh"
|
||||
#include "ltlenv/defaultenv.hh"
|
||||
|
|
@ -99,7 +91,6 @@ namespace std {
|
|||
|
||||
#include "ltlvisit/apcollect.hh"
|
||||
#include "ltlvisit/dot.hh"
|
||||
#include "ltlvisit/dump.hh"
|
||||
#include "ltlvisit/nenoform.hh"
|
||||
#include "ltlvisit/print.hh"
|
||||
#include "ltlvisit/simplify.hh"
|
||||
|
|
@ -158,6 +149,8 @@ using namespace spot::ltl;
|
|||
using namespace spot;
|
||||
%}
|
||||
|
||||
|
||||
|
||||
// For spot::emptiness_check_instantiator::construct and any other
|
||||
// function that return errors via a "char **err" argument.
|
||||
%typemap(in, numinputs=0) char** OUTPUT (char* temp)
|
||||
|
|
@ -216,36 +209,17 @@ using namespace spot;
|
|||
%include "misc/optionmap.hh"
|
||||
%include "misc/random.hh"
|
||||
|
||||
%implicitconv std::vector<spot::ltl::formula>;
|
||||
|
||||
%include "ltlast/formula.hh"
|
||||
%include "ltlast/atomic_prop.hh"
|
||||
%include "ltlast/binop.hh"
|
||||
%include "ltlast/constant.hh"
|
||||
%include "ltlast/multop.hh"
|
||||
%include "ltlast/unop.hh"
|
||||
%include "ltlast/visitor.hh"
|
||||
|
||||
namespace std {
|
||||
%template(atomic_prop_set) set<const spot::ltl::atomic_prop*,
|
||||
spot::ltl::formula_ptr_less_than>;
|
||||
|
||||
%template(mapff) map<const spot::ltl::formula*, const spot::ltl::formula*,
|
||||
spot::ltl::formula_ptr_less_than>;
|
||||
%template(liststr) list<std::string>;
|
||||
%template(vectorformula) vector<spot::ltl::formula>;
|
||||
%template(atomic_prop_set) set<spot::ltl::formula>;
|
||||
%template(relabeling_map) map<spot::ltl::formula, spot::ltl::formula>;
|
||||
}
|
||||
|
||||
%{
|
||||
namespace swig {
|
||||
template <> struct traits<atomic_prop> {
|
||||
typedef pointer_category category;
|
||||
static const char* type_name() { return "spot::ltl::atomic_prop"; }
|
||||
};
|
||||
template <> struct traits<formula> {
|
||||
typedef pointer_category category;
|
||||
static const char* type_name() { return "spot::ltl::formula"; }
|
||||
};
|
||||
}
|
||||
%}
|
||||
|
||||
|
||||
%include "ltlenv/environment.hh"
|
||||
%include "ltlenv/defaultenv.hh"
|
||||
|
||||
|
|
@ -263,7 +237,6 @@ namespace std {
|
|||
|
||||
%include "ltlvisit/apcollect.hh"
|
||||
%include "ltlvisit/dot.hh"
|
||||
%include "ltlvisit/dump.hh"
|
||||
%include "ltlvisit/nenoform.hh"
|
||||
%include "ltlvisit/print.hh"
|
||||
%include "ltlvisit/simplify.hh"
|
||||
|
|
@ -323,33 +296,16 @@ namespace std {
|
|||
#undef ltl
|
||||
|
||||
%extend spot::ltl::formula {
|
||||
|
||||
// When comparing formula, make sure Python compare our
|
||||
// pointers, not the pointers to its wrappers.
|
||||
|
||||
// __cmp__ is for Python 2.0
|
||||
int __cmp__(const spot::ltl::formula* b) { return self - b; }
|
||||
// These are for Python 2.1+ or 3.x. They more closely match
|
||||
// the logic in Spot.
|
||||
bool __lt__(const spot::ltl::formula* b)
|
||||
{ spot::ltl::formula_ptr_less_than lt; return lt(self, b); }
|
||||
bool __le__(const spot::ltl::formula* b)
|
||||
{ spot::ltl::formula_ptr_less_than lt; return !lt(b, self); }
|
||||
bool __eq__(const spot::ltl::formula* b) { return self == b; }
|
||||
bool __ne__(const spot::ltl::formula* b) { return self != b; }
|
||||
bool __gt__(const spot::ltl::formula* b)
|
||||
{ spot::ltl::formula_ptr_less_than lt; return lt(b, self); }
|
||||
bool __ge__(const spot::ltl::formula* b)
|
||||
{ spot::ltl::formula_ptr_less_than lt; return !lt(self, b); }
|
||||
int __cmp__(spot::ltl::formula b) { return self->id() - b.id(); }
|
||||
size_t __hash__() { return self->id(); }
|
||||
|
||||
size_t __hash__() { return self->hash(); }
|
||||
|
||||
std::string __repr__() { return spot::ltl::str_psl(self); }
|
||||
std::string __repr__() { return spot::ltl::str_psl(*self); }
|
||||
std::string _repr_latex_()
|
||||
{
|
||||
return std::string("$") + spot::ltl::str_sclatex_psl(self) + '$';
|
||||
return std::string("$") + spot::ltl::str_sclatex_psl(*self) + '$';
|
||||
}
|
||||
std::string __str__() { return spot::ltl::str_psl(self); }
|
||||
std::string __str__() { return spot::ltl::str_psl(*self); }
|
||||
}
|
||||
|
||||
%extend spot::acc_cond::acc_code {
|
||||
|
|
@ -387,6 +343,11 @@ namespace std {
|
|||
}
|
||||
|
||||
%inline %{
|
||||
bool fnode_instances_check()
|
||||
{
|
||||
return spot::ltl::fnode::instances_check();
|
||||
}
|
||||
|
||||
spot::ltl::parse_error_list
|
||||
empty_parse_error_list()
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue