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.
445 lines
9.9 KiB
OpenEdge ABL
445 lines
9.9 KiB
OpenEdge ABL
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015 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 3 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 this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
%{
|
|
// Workaround for SWIG 2.0.2 using ptrdiff_t but not including cstddef.
|
|
// It matters with g++ 4.6.
|
|
#include <cstddef>
|
|
%}
|
|
|
|
%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"
|
|
|
|
// git grep 'typedef.*std::shared_ptr' | grep -v const |
|
|
// sed 's/.*<\(.*\)>.*/%shared_ptr(spot::\1)/g'
|
|
%shared_ptr(spot::dstar_aut)
|
|
%shared_ptr(spot::parsed_aut)
|
|
%shared_ptr(spot::fair_kripke)
|
|
%shared_ptr(spot::kripke)
|
|
%shared_ptr(spot::kripke_explicit)
|
|
%shared_ptr(spot::kripke)
|
|
%shared_ptr(spot::ta)
|
|
%shared_ptr(spot::ta_explicit)
|
|
%shared_ptr(spot::ta_product)
|
|
%shared_ptr(spot::tgta)
|
|
%shared_ptr(spot::tgta_explicit)
|
|
%shared_ptr(spot::bdd_dict)
|
|
%shared_ptr(spot::twa)
|
|
%shared_ptr(spot::twa_graph)
|
|
%shared_ptr(spot::twa_product)
|
|
%shared_ptr(spot::twa_product_init)
|
|
%shared_ptr(spot::taa_tgba)
|
|
%shared_ptr(spot::taa_tgba_string)
|
|
%shared_ptr(spot::taa_tgba_formula)
|
|
%shared_ptr(spot::twa_safra_complement)
|
|
%shared_ptr(spot::tgba_run)
|
|
%shared_ptr(spot::emptiness_check_result)
|
|
%shared_ptr(spot::emptiness_check)
|
|
%shared_ptr(spot::emptiness_check_instantiator)
|
|
%shared_ptr(spot::tgbasl)
|
|
|
|
%import "buddy.i"
|
|
|
|
%{
|
|
#include <iostream>
|
|
#include <fstream>
|
|
#include <sstream>
|
|
#include <signal.h>
|
|
|
|
#include "misc/common.hh"
|
|
#include "misc/version.hh"
|
|
#include "misc/minato.hh"
|
|
#include "misc/optionmap.hh"
|
|
#include "misc/random.hh"
|
|
|
|
#include "ltlast/formula.hh"
|
|
|
|
#include "ltlenv/environment.hh"
|
|
#include "ltlenv/defaultenv.hh"
|
|
|
|
#include "ltlparse/public.hh"
|
|
|
|
#include "twa/bdddict.hh"
|
|
|
|
#include "ltlvisit/apcollect.hh"
|
|
#include "ltlvisit/dot.hh"
|
|
#include "ltlvisit/nenoform.hh"
|
|
#include "ltlvisit/print.hh"
|
|
#include "ltlvisit/simplify.hh"
|
|
#include "ltlvisit/unabbrev.hh"
|
|
#include "ltlvisit/randomltl.hh"
|
|
#include "ltlvisit/length.hh"
|
|
#include "ltlvisit/remove_x.hh"
|
|
#include "ltlvisit/relabel.hh"
|
|
|
|
#include "twa/bddprint.hh"
|
|
#include "twa/fwd.hh"
|
|
#include "twa/acc.hh"
|
|
#include "twa/twa.hh"
|
|
#include "twa/taatgba.hh"
|
|
#include "twa/twaproduct.hh"
|
|
|
|
#include "twaalgos/cleanacc.hh"
|
|
#include "twaalgos/dot.hh"
|
|
#include "twaalgos/degen.hh"
|
|
#include "twaalgos/dupexp.hh"
|
|
#include "twaalgos/emptiness.hh"
|
|
#include "twaalgos/gtec/gtec.hh"
|
|
#include "twaalgos/lbtt.hh"
|
|
#include "twaalgos/ltl2taa.hh"
|
|
#include "twaalgos/ltl2tgba_fm.hh"
|
|
#include "twaalgos/compsusp.hh"
|
|
#include "twaalgos/magic.hh"
|
|
#include "twaalgos/minimize.hh"
|
|
#include "twaalgos/neverclaim.hh"
|
|
#include "twaalgos/remfin.hh"
|
|
#include "twaalgos/safety.hh"
|
|
#include "twaalgos/sccfilter.hh"
|
|
#include "twaalgos/stats.hh"
|
|
#include "twaalgos/isdet.hh"
|
|
#include "twaalgos/simulation.hh"
|
|
#include "twaalgos/postproc.hh"
|
|
#include "twaalgos/product.hh"
|
|
#include "twaalgos/stutter.hh"
|
|
#include "twaalgos/translate.hh"
|
|
#include "twaalgos/hoa.hh"
|
|
#include "twaalgos/dtgbasat.hh"
|
|
#include "twaalgos/relabel.hh"
|
|
|
|
#include "parseaut/public.hh"
|
|
|
|
#include "ta/ta.hh"
|
|
#include "ta/tgta.hh"
|
|
#include "ta/taexplicit.hh"
|
|
#include "ta/tgtaexplicit.hh"
|
|
#include "taalgos/tgba2ta.hh"
|
|
#include "taalgos/dot.hh"
|
|
#include "taalgos/stats.hh"
|
|
#include "taalgos/minimize.hh"
|
|
|
|
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)
|
|
"$1 = &temp;";
|
|
%typemap(argout) char** OUTPUT {
|
|
PyObject *obj = SWIG_FromCharPtr(*$1);
|
|
if (!$result) {
|
|
$result = obj;
|
|
//# If the function returns null_ptr (i.e. Py_None), we
|
|
//# don't want to override it with OUTPUT as in the
|
|
//# default implementation of t_output_helper.
|
|
// } else if ($result == Py_None) {
|
|
// Py_DECREF($result);
|
|
// $result = obj;
|
|
} else {
|
|
if (!PyList_Check($result)) {
|
|
PyObject *o2 = $result;
|
|
$result = PyList_New(1);
|
|
PyList_SetItem($result, 0, o2);
|
|
}
|
|
PyList_Append($result,obj);
|
|
Py_DECREF(obj);
|
|
}
|
|
|
|
};
|
|
%apply char** OUTPUT { char** err };
|
|
|
|
%exception {
|
|
try {
|
|
$action
|
|
}
|
|
catch (const spot::parse_error& e)
|
|
{
|
|
std::string er("\n");
|
|
er += e.what();
|
|
SWIG_exception(SWIG_SyntaxError, er.c_str());
|
|
}
|
|
catch (const std::invalid_argument& e)
|
|
{
|
|
SWIG_exception(SWIG_ValueError, e.what());
|
|
}
|
|
catch (const std::runtime_error& e)
|
|
{
|
|
SWIG_exception(SWIG_RuntimeError, e.what());
|
|
}
|
|
}
|
|
|
|
// False and True cannot be redefined in Python3, even in a class.
|
|
// Spot uses these in an enum of the constant class.
|
|
%rename(FalseVal) False;
|
|
%rename(TrueVal) True;
|
|
|
|
%include "misc/common.hh"
|
|
%include "misc/version.hh"
|
|
%include "misc/minato.hh"
|
|
%include "misc/optionmap.hh"
|
|
%include "misc/random.hh"
|
|
|
|
%implicitconv std::vector<spot::ltl::formula>;
|
|
|
|
%include "ltlast/formula.hh"
|
|
|
|
namespace std {
|
|
%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>;
|
|
}
|
|
|
|
%include "ltlenv/environment.hh"
|
|
%include "ltlenv/defaultenv.hh"
|
|
|
|
%include "ltlparse/public.hh"
|
|
|
|
/* these must come before apcollect.hh */
|
|
%include "twa/bdddict.hh"
|
|
%include "twa/bddprint.hh"
|
|
%include "twa/fwd.hh"
|
|
%feature("flatnested") spot::acc_cond::mark_t;
|
|
%feature("flatnested") spot::acc_cond::acc_code;
|
|
%apply bool* OUTPUT {bool& max, bool& odd};
|
|
%include "twa/acc.hh"
|
|
%include "twa/twa.hh"
|
|
|
|
%include "ltlvisit/apcollect.hh"
|
|
%include "ltlvisit/dot.hh"
|
|
%include "ltlvisit/nenoform.hh"
|
|
%include "ltlvisit/print.hh"
|
|
%include "ltlvisit/simplify.hh"
|
|
%include "ltlvisit/unabbrev.hh"
|
|
%include "ltlvisit/randomltl.hh"
|
|
%include "ltlvisit/length.hh"
|
|
%include "ltlvisit/remove_x.hh"
|
|
%include "ltlvisit/relabel.hh"
|
|
|
|
// Help SWIG with namespace lookups.
|
|
#define ltl spot::ltl
|
|
%include "twa/taatgba.hh"
|
|
%include "twa/twaproduct.hh"
|
|
%include "twa/twagraph.hh"
|
|
|
|
// Should come after the definition of twa_graph
|
|
|
|
%include "twaalgos/cleanacc.hh"
|
|
%include "twaalgos/degen.hh"
|
|
%include "twaalgos/dot.hh"
|
|
%include "twaalgos/dupexp.hh"
|
|
%include "twaalgos/emptiness.hh"
|
|
%include "twaalgos/gtec/gtec.hh"
|
|
%include "twaalgos/lbtt.hh"
|
|
%include "twaalgos/ltl2taa.hh"
|
|
%include "twaalgos/ltl2tgba_fm.hh"
|
|
%include "twaalgos/compsusp.hh"
|
|
%include "twaalgos/magic.hh"
|
|
%include "twaalgos/minimize.hh"
|
|
%include "twaalgos/neverclaim.hh"
|
|
%include "twaalgos/safety.hh"
|
|
%include "twaalgos/remfin.hh"
|
|
%include "twaalgos/sccfilter.hh"
|
|
%include "twaalgos/stats.hh"
|
|
%include "twaalgos/isdet.hh"
|
|
%include "twaalgos/simulation.hh"
|
|
%include "twaalgos/postproc.hh"
|
|
%include "twaalgos/product.hh"
|
|
%include "twaalgos/stutter.hh"
|
|
%include "twaalgos/translate.hh"
|
|
%include "twaalgos/hoa.hh"
|
|
%include "twaalgos/dtgbasat.hh"
|
|
%include "twaalgos/relabel.hh"
|
|
|
|
%include "parseaut/public.hh"
|
|
|
|
%include "ta/ta.hh"
|
|
%include "ta/tgta.hh"
|
|
%include "ta/taexplicit.hh"
|
|
%include "ta/tgtaexplicit.hh"
|
|
%include "taalgos/tgba2ta.hh"
|
|
%include "taalgos/dot.hh"
|
|
%include "taalgos/stats.hh"
|
|
%include "taalgos/minimize.hh"
|
|
|
|
|
|
#undef ltl
|
|
|
|
%extend spot::ltl::formula {
|
|
// __cmp__ is for Python 2.0
|
|
int __cmp__(spot::ltl::formula b) { return self->id() - b.id(); }
|
|
size_t __hash__() { return self->id(); }
|
|
|
|
std::string __repr__() { return spot::ltl::str_psl(*self); }
|
|
std::string _repr_latex_()
|
|
{
|
|
return std::string("$") + spot::ltl::str_sclatex_psl(*self) + '$';
|
|
}
|
|
std::string __str__() { return spot::ltl::str_psl(*self); }
|
|
}
|
|
|
|
%extend spot::acc_cond::acc_code {
|
|
std::string __repr__()
|
|
{
|
|
std::ostringstream os;
|
|
os << *self;
|
|
return os.str();
|
|
}
|
|
|
|
std::string __str__()
|
|
{
|
|
std::ostringstream os;
|
|
os << *self;
|
|
return os.str();
|
|
}
|
|
}
|
|
|
|
%nodefaultctor std::ostream;
|
|
namespace std {
|
|
class ostream {};
|
|
class ofstream : public ostream
|
|
{
|
|
public:
|
|
ofstream(const char *fn);
|
|
~ofstream();
|
|
};
|
|
class ostringstream : public ostream
|
|
{
|
|
public:
|
|
ostringstream();
|
|
std::string str() const;
|
|
~ostringstream();
|
|
};
|
|
}
|
|
|
|
%inline %{
|
|
bool fnode_instances_check()
|
|
{
|
|
return spot::ltl::fnode::instances_check();
|
|
}
|
|
|
|
spot::ltl::parse_error_list
|
|
empty_parse_error_list()
|
|
{
|
|
parse_error_list l;
|
|
return l;
|
|
}
|
|
|
|
spot::parse_aut_error_list
|
|
empty_parse_aut_error_list()
|
|
{
|
|
parse_aut_error_list l;
|
|
return l;
|
|
}
|
|
|
|
spot::twa_graph_ptr
|
|
ensure_digraph(const spot::twa_ptr& a)
|
|
{
|
|
auto aa = std::dynamic_pointer_cast<spot::twa_graph>(a);
|
|
if (aa)
|
|
return aa;
|
|
return spot::make_twa_graph(a, spot::twa::prop_set::all());
|
|
}
|
|
|
|
std::ostream&
|
|
get_cout()
|
|
{
|
|
return std::cout;
|
|
}
|
|
|
|
void
|
|
nl_cout()
|
|
{
|
|
std::cout << std::endl;
|
|
}
|
|
|
|
std::ostream&
|
|
get_cerr()
|
|
{
|
|
return std::cerr;
|
|
}
|
|
|
|
void
|
|
nl_cerr()
|
|
{
|
|
std::cerr << std::endl;
|
|
}
|
|
|
|
void
|
|
print_on(std::ostream& on, const std::string& what)
|
|
{
|
|
on << what;
|
|
}
|
|
|
|
int
|
|
unblock_signal(int signum)
|
|
{
|
|
sigset_t set;
|
|
sigemptyset(&set);
|
|
sigaddset(&set, signum);
|
|
return sigprocmask(SIG_UNBLOCK, &set, 0);
|
|
}
|
|
|
|
%}
|
|
|
|
%extend spot::ltl::parse_error_list {
|
|
|
|
bool
|
|
__nonzero__()
|
|
{
|
|
return !self->empty();
|
|
}
|
|
|
|
bool
|
|
__bool__()
|
|
{
|
|
return !self->empty();
|
|
}
|
|
|
|
}
|
|
|
|
%extend spot::parse_aut_error_list {
|
|
|
|
bool
|
|
__nonzero__()
|
|
{
|
|
return !self->empty();
|
|
}
|
|
|
|
bool
|
|
__bool__()
|
|
{
|
|
return !self->empty();
|
|
}
|
|
|
|
}
|