* NEWS: Mention this. * COPYING: Replace by GPL v3. * src/sanity/style.test: Check files with the wrong license, in case we forgot to update it during a merge. * Makefile.am, bench/Makefile.am, bench/emptchk/Makefile.am, bench/emptchk/defs.in, bench/emptchk/ltl-human.sh, bench/emptchk/ltl-random.sh, bench/emptchk/pml-clserv.sh, bench/emptchk/pml-eeaean.sh, bench/emptchk/pml2tgba.pl, bench/ltl2tgba/big, bench/ltl2tgba/defs.in, bench/ltl2tgba/known, bench/ltl2tgba/lbtt2csv.pl, bench/ltl2tgba/ltl2baw.in, bench/ltl2tgba/parseout.pl, bench/ltl2tgba/small, bench/ltlclasses/Makefile.am, bench/ltlclasses/defs.in, bench/ltlclasses/run, bench/ltlcounter/Makefile.am, bench/ltlcounter/defs.in, bench/ltlcounter/run, bench/scc-stats/Makefile.am, bench/scc-stats/stats.cc, bench/split-product/Makefile.am, bench/split-product/cutscc.cc, bench/split-product/pml2tgba.pl, bench/wdba/Makefile.am, bench/wdba/defs.in, bench/wdba/run, configure.ac, doc/Makefile.am, doc/dot.in, doc/tl/Makefile.am, iface/Makefile.am, iface/dve2/Makefile.am, iface/dve2/defs.in, iface/dve2/dve2.cc, iface/dve2/dve2.hh, iface/dve2/dve2check.cc, iface/dve2/dve2check.test, iface/dve2/finite.test, iface/dve2/kripke.test, iface/gspn/Makefile.am, iface/gspn/common.cc, iface/gspn/common.hh, iface/gspn/dcswave.test, iface/gspn/dcswaveeltl.test, iface/gspn/dcswavefm.test, iface/gspn/dcswaveltl.test, iface/gspn/dottygspn.cc, iface/gspn/dottyssp.cc, iface/gspn/gspn.cc, iface/gspn/gspn.hh, iface/gspn/ltlgspn.cc, iface/gspn/simple.test, iface/gspn/ssp.cc, iface/gspn/ssp.hh, iface/gspn/udcsefm.test, iface/gspn/udcseltl.test, iface/gspn/udcsfm.test, iface/gspn/udcsltl.test, src/Makefile.am, src/bin/Makefile.am, src/bin/common_cout.cc, src/bin/common_cout.hh, src/bin/common_finput.cc, src/bin/common_finput.hh, src/bin/common_output.cc, src/bin/common_output.hh, src/bin/common_post.cc, src/bin/common_post.hh, src/bin/common_r.cc, src/bin/common_r.hh, src/bin/common_range.cc, src/bin/common_range.hh, src/bin/common_setup.cc, src/bin/common_setup.hh, src/bin/common_sys.hh, src/bin/genltl.cc, src/bin/ltl2tgba.cc, src/bin/ltl2tgta.cc, src/bin/ltlfilt.cc, src/bin/man/Makefile.am, src/bin/randltl.cc, src/eltlparse/Makefile.am, src/eltlparse/eltlparse.yy, src/eltlparse/eltlscan.ll, src/eltlparse/fmterror.cc, src/eltlparse/parsedecl.hh, src/eltlparse/public.hh, src/eltltest/Makefile.am, src/eltltest/acc.cc, src/eltltest/acc.test, src/eltltest/defs.in, src/eltltest/nfa.cc, src/eltltest/nfa.test, src/evtgba/Makefile.am, src/evtgba/evtgba.cc, src/evtgba/evtgba.hh, src/evtgba/evtgbaiter.hh, src/evtgba/explicit.cc, src/evtgba/explicit.hh, src/evtgba/product.cc, src/evtgba/product.hh, src/evtgba/symbol.cc, src/evtgba/symbol.hh, src/evtgbaalgos/Makefile.am, src/evtgbaalgos/dotty.cc, src/evtgbaalgos/dotty.hh, src/evtgbaalgos/reachiter.cc, src/evtgbaalgos/reachiter.hh, src/evtgbaalgos/save.cc, src/evtgbaalgos/save.hh, src/evtgbaalgos/tgba2evtgba.cc, src/evtgbaalgos/tgba2evtgba.hh, src/evtgbaparse/Makefile.am, src/evtgbaparse/evtgbaparse.yy, src/evtgbaparse/evtgbascan.ll, src/evtgbaparse/fmterror.cc, src/evtgbaparse/parsedecl.hh, src/evtgbaparse/public.hh, src/evtgbatest/Makefile.am, src/evtgbatest/defs.in, src/evtgbatest/explicit.cc, src/evtgbatest/explicit.test, src/evtgbatest/ltl2evtgba.cc, src/evtgbatest/ltl2evtgba.test, src/evtgbatest/product.cc, src/evtgbatest/product.test, src/evtgbatest/readsave.cc, src/evtgbatest/readsave.test, src/kripke/Makefile.am, src/kripke/fairkripke.cc, src/kripke/fairkripke.hh, src/kripke/kripke.cc, src/kripke/kripke.hh, src/kripke/kripkeexplicit.cc, src/kripke/kripkeexplicit.hh, src/kripke/kripkeprint.cc, src/kripke/kripkeprint.hh, src/kripkeparse/Makefile.am, src/kripkeparse/fmterror.cc, src/kripkeparse/kripkeparse.yy, src/kripkeparse/kripkescan.ll, src/kripkeparse/parsedecl.hh, src/kripkeparse/public.hh, src/kripkeparse/scankripke.ll, src/kripketest/Makefile.am, src/kripketest/bad_parsing.test, src/kripketest/defs.in, src/kripketest/kripke.test, src/kripketest/parse_print_test.cc, src/ltlast/Makefile.am, src/ltlast/allnodes.hh, src/ltlast/atomic_prop.cc, src/ltlast/atomic_prop.hh, src/ltlast/automatop.cc, src/ltlast/automatop.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/formula.cc, src/ltlast/formula.hh, src/ltlast/formula_tree.cc, src/ltlast/formula_tree.hh, src/ltlast/multop.cc, src/ltlast/multop.hh, src/ltlast/nfa.cc, src/ltlast/nfa.hh, src/ltlast/predecl.hh, src/ltlast/refformula.cc, src/ltlast/refformula.hh, src/ltlast/unop.cc, src/ltlast/unop.hh, src/ltlast/visitor.hh, src/ltlenv/Makefile.am, src/ltlenv/declenv.cc, src/ltlenv/declenv.hh, src/ltlenv/defaultenv.cc, src/ltlenv/defaultenv.hh, src/ltlenv/environment.hh, src/ltlparse/Makefile.am, src/ltlparse/fmterror.cc, src/ltlparse/ltlfile.cc, src/ltlparse/ltlfile.hh, src/ltlparse/ltlparse.yy, src/ltlparse/ltlscan.ll, src/ltlparse/parsedecl.hh, src/ltlparse/public.hh, src/ltltest/Makefile.am, src/ltltest/consterm.cc, src/ltltest/consterm.test, src/ltltest/defs.in, src/ltltest/equals.cc, src/ltltest/equals.test, src/ltltest/kind.cc, src/ltltest/kind.test, src/ltltest/length.cc, src/ltltest/length.test, src/ltltest/lunabbrev.test, src/ltltest/nenoform.test, src/ltltest/parse.test, src/ltltest/parseerr.test, src/ltltest/readltl.cc, src/ltltest/reduc.cc, src/ltltest/reduc.test, src/ltltest/reduccmp.test, src/ltltest/reducpsl.test, src/ltltest/syntimpl.cc, src/ltltest/syntimpl.test, src/ltltest/tostring.cc, src/ltltest/tostring.test, src/ltltest/tunabbrev.test, src/ltltest/tunenoform.test, src/ltltest/utf8.test, src/ltltest/uwrm.test, src/ltlvisit/Makefile.am, src/ltlvisit/apcollect.cc, src/ltlvisit/apcollect.hh, src/ltlvisit/clone.cc, src/ltlvisit/clone.hh, src/ltlvisit/contain.cc, src/ltlvisit/contain.hh, src/ltlvisit/destroy.cc, src/ltlvisit/destroy.hh, src/ltlvisit/dotty.cc, src/ltlvisit/dotty.hh, src/ltlvisit/dump.cc, src/ltlvisit/dump.hh, src/ltlvisit/lbt.cc, src/ltlvisit/lbt.hh, src/ltlvisit/length.cc, src/ltlvisit/length.hh, src/ltlvisit/lunabbrev.cc, src/ltlvisit/lunabbrev.hh, src/ltlvisit/mark.cc, src/ltlvisit/mark.hh, src/ltlvisit/nenoform.cc, src/ltlvisit/nenoform.hh, src/ltlvisit/postfix.cc, src/ltlvisit/postfix.hh, src/ltlvisit/randomltl.cc, src/ltlvisit/randomltl.hh, src/ltlvisit/reduce.cc, src/ltlvisit/reduce.hh, src/ltlvisit/relabel.cc, src/ltlvisit/relabel.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/tostring.cc, src/ltlvisit/tostring.hh, src/ltlvisit/tunabbrev.cc, src/ltlvisit/tunabbrev.hh, src/ltlvisit/wmunabbrev.cc, src/ltlvisit/wmunabbrev.hh, src/misc/Makefile.am, src/misc/acccompl.cc, src/misc/acccompl.hh, src/misc/accconv.cc, src/misc/accconv.hh, src/misc/bareword.cc, src/misc/bareword.hh, src/misc/bddalloc.cc, src/misc/bddalloc.hh, src/misc/bddlt.hh, src/misc/bddop.cc, src/misc/bddop.hh, src/misc/casts.hh, src/misc/escape.cc, src/misc/escape.hh, src/misc/fixpool.hh, src/misc/freelist.cc, src/misc/freelist.hh, src/misc/hash.hh, src/misc/hashfunc.hh, src/misc/intvcmp2.cc, src/misc/intvcmp2.hh, src/misc/intvcomp.cc, src/misc/intvcomp.hh, src/misc/ltstr.hh, src/misc/memusage.cc, src/misc/memusage.hh, src/misc/minato.cc, src/misc/minato.hh, src/misc/modgray.cc, src/misc/modgray.hh, src/misc/mspool.hh, src/misc/optionmap.cc, src/misc/optionmap.hh, src/misc/random.cc, src/misc/random.hh, src/misc/timer.cc, src/misc/timer.hh, src/misc/unique_ptr.hh, src/misc/version.cc, src/misc/version.hh, src/neverparse/Makefile.am, src/neverparse/fmterror.cc, src/neverparse/neverclaimparse.yy, src/neverparse/neverclaimscan.ll, src/neverparse/parsedecl.hh, src/neverparse/public.hh, src/saba/Makefile.am, src/saba/explicitstateconjunction.cc, src/saba/explicitstateconjunction.hh, src/saba/saba.cc, src/saba/saba.hh, src/saba/sabacomplementtgba.cc, src/saba/sabacomplementtgba.hh, src/saba/sabastate.hh, src/saba/sabasucciter.hh, src/sabaalgos/Makefile.am, src/sabaalgos/sabadotty.cc, src/sabaalgos/sabadotty.hh, src/sabaalgos/sabareachiter.cc, src/sabaalgos/sabareachiter.hh, src/sabatest/Makefile.am, src/sabatest/defs.in, src/sabatest/sabacomplementtgba.cc, src/sanity/Makefile.am, src/sanity/readme.test, src/sanity/style.test, src/ta/Makefile.am, src/ta/ta.cc, src/ta/ta.hh, src/ta/taexplicit.cc, src/ta/taexplicit.hh, src/ta/taproduct.cc, src/ta/taproduct.hh, src/ta/tgta.cc, src/ta/tgta.hh, src/ta/tgtaexplicit.cc, src/ta/tgtaexplicit.hh, src/ta/tgtaproduct.cc, src/ta/tgtaproduct.hh, src/taalgos/Makefile.am, src/taalgos/dotty.cc, src/taalgos/dotty.hh, src/taalgos/emptinessta.cc, src/taalgos/emptinessta.hh, src/taalgos/minimize.cc, src/taalgos/minimize.hh, src/taalgos/reachiter.cc, src/taalgos/reachiter.hh, src/taalgos/statessetbuilder.cc, src/taalgos/statessetbuilder.hh, src/taalgos/stats.cc, src/taalgos/stats.hh, src/taalgos/tgba2ta.cc, src/taalgos/tgba2ta.hh, src/tgba/Makefile.am, src/tgba/bdddict.cc, src/tgba/bdddict.hh, src/tgba/bddprint.cc, src/tgba/bddprint.hh, src/tgba/formula2bdd.cc, src/tgba/formula2bdd.hh, src/tgba/futurecondcol.cc, src/tgba/futurecondcol.hh, src/tgba/public.hh, src/tgba/sba.hh, src/tgba/state.hh, src/tgba/statebdd.cc, src/tgba/statebdd.hh, src/tgba/succiter.hh, src/tgba/succiterconcrete.cc, src/tgba/succiterconcrete.hh, src/tgba/taatgba.cc, src/tgba/taatgba.hh, src/tgba/tgba.cc, src/tgba/tgba.hh, src/tgba/tgbabddconcrete.cc, src/tgba/tgbabddconcrete.hh, src/tgba/tgbabddconcretefactory.cc, src/tgba/tgbabddconcretefactory.hh, src/tgba/tgbabddconcreteproduct.cc, src/tgba/tgbabddconcreteproduct.hh, src/tgba/tgbabddcoredata.cc, src/tgba/tgbabddcoredata.hh, src/tgba/tgbabddfactory.hh, src/tgba/tgbaexplicit.cc, src/tgba/tgbaexplicit.hh, src/tgba/tgbakvcomplement.cc, src/tgba/tgbakvcomplement.hh, src/tgba/tgbaproduct.cc, src/tgba/tgbaproduct.hh, src/tgba/tgbasafracomplement.cc, src/tgba/tgbasafracomplement.hh, src/tgba/tgbascc.cc, src/tgba/tgbascc.hh, src/tgba/tgbasgba.cc, src/tgba/tgbasgba.hh, src/tgba/tgbatba.cc, src/tgba/tgbatba.hh, src/tgba/tgbaunion.cc, src/tgba/tgbaunion.hh, src/tgba/wdbacomp.cc, src/tgba/wdbacomp.hh, src/tgbaalgos/Makefile.am, src/tgbaalgos/bfssteps.cc, src/tgbaalgos/bfssteps.hh, src/tgbaalgos/cutscc.cc, src/tgbaalgos/cutscc.hh, src/tgbaalgos/cycles.cc, src/tgbaalgos/cycles.hh, src/tgbaalgos/degen.cc, src/tgbaalgos/degen.hh, src/tgbaalgos/dotty.cc, src/tgbaalgos/dotty.hh, src/tgbaalgos/dottydec.cc, src/tgbaalgos/dottydec.hh, src/tgbaalgos/dupexp.cc, src/tgbaalgos/dupexp.hh, src/tgbaalgos/eltl2tgba_lacim.cc, src/tgbaalgos/eltl2tgba_lacim.hh, src/tgbaalgos/emptiness.cc, src/tgbaalgos/emptiness.hh, src/tgbaalgos/emptiness_stats.hh, src/tgbaalgos/gtec/Makefile.am, src/tgbaalgos/gtec/ce.cc, src/tgbaalgos/gtec/ce.hh, src/tgbaalgos/gtec/explscc.cc, src/tgbaalgos/gtec/explscc.hh, src/tgbaalgos/gtec/gtec.cc, src/tgbaalgos/gtec/gtec.hh, src/tgbaalgos/gtec/nsheap.cc, src/tgbaalgos/gtec/nsheap.hh, src/tgbaalgos/gtec/sccstack.cc, src/tgbaalgos/gtec/sccstack.hh, src/tgbaalgos/gtec/status.cc, src/tgbaalgos/gtec/status.hh, src/tgbaalgos/gv04.cc, src/tgbaalgos/gv04.hh, src/tgbaalgos/isdet.cc, src/tgbaalgos/isdet.hh, src/tgbaalgos/isweakscc.cc, src/tgbaalgos/isweakscc.hh, src/tgbaalgos/lbtt.cc, src/tgbaalgos/lbtt.hh, src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/ltl2taa.hh, src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/ltl2tgba_fm.hh, src/tgbaalgos/ltl2tgba_lacim.cc, src/tgbaalgos/ltl2tgba_lacim.hh, src/tgbaalgos/magic.cc, src/tgbaalgos/magic.hh, src/tgbaalgos/minimize.cc, src/tgbaalgos/minimize.hh, src/tgbaalgos/ndfs_result.hxx, src/tgbaalgos/neverclaim.cc, src/tgbaalgos/neverclaim.hh, src/tgbaalgos/postproc.cc, src/tgbaalgos/postproc.hh, src/tgbaalgos/powerset.cc, src/tgbaalgos/powerset.hh, src/tgbaalgos/projrun.cc, src/tgbaalgos/projrun.hh, src/tgbaalgos/randomgraph.cc, src/tgbaalgos/randomgraph.hh, src/tgbaalgos/reachiter.cc, src/tgbaalgos/reachiter.hh, src/tgbaalgos/reducerun.cc, src/tgbaalgos/reducerun.hh, src/tgbaalgos/reductgba_sim.cc, src/tgbaalgos/reductgba_sim.hh, src/tgbaalgos/replayrun.cc, src/tgbaalgos/replayrun.hh, src/tgbaalgos/rundotdec.cc, src/tgbaalgos/rundotdec.hh, src/tgbaalgos/safety.cc, src/tgbaalgos/safety.hh, src/tgbaalgos/save.cc, src/tgbaalgos/save.hh, src/tgbaalgos/scc.cc, src/tgbaalgos/scc.hh, src/tgbaalgos/sccfilter.cc, src/tgbaalgos/sccfilter.hh, src/tgbaalgos/se05.cc, src/tgbaalgos/se05.hh, src/tgbaalgos/simulation.cc, src/tgbaalgos/simulation.hh, src/tgbaalgos/stats.cc, src/tgbaalgos/stats.hh, src/tgbaalgos/tau03.cc, src/tgbaalgos/tau03.hh, src/tgbaalgos/tau03opt.cc, src/tgbaalgos/tau03opt.hh, src/tgbaalgos/weight.cc, src/tgbaalgos/weight.hh, src/tgbaparse/Makefile.am, src/tgbaparse/fmterror.cc, src/tgbaparse/parsedecl.hh, src/tgbaparse/public.hh, src/tgbaparse/tgbaparse.yy, src/tgbaparse/tgbascan.ll, src/tgbatest/Makefile.am, src/tgbatest/babiak.test, src/tgbatest/bddprod.test, src/tgbatest/complementation.cc, src/tgbatest/complementation.test, src/tgbatest/cycles.test, src/tgbatest/defs.in, src/tgbatest/degendet.test, src/tgbatest/degenid.test, src/tgbatest/dfs.test, src/tgbatest/dupexp.test, src/tgbatest/eltl2tgba.test, src/tgbatest/emptchk.test, src/tgbatest/emptchke.test, src/tgbatest/emptchkr.test, src/tgbatest/explicit.cc, src/tgbatest/explicit.test, src/tgbatest/explicit2.cc, src/tgbatest/explicit2.test, src/tgbatest/explpro2.test, src/tgbatest/explpro3.test, src/tgbatest/explpro4.test, src/tgbatest/explprod.cc, src/tgbatest/explprod.test, src/tgbatest/intvcmp2.cc, src/tgbatest/intvcomp.cc, src/tgbatest/intvcomp.test, src/tgbatest/kv.test, src/tgbatest/ltl2neverclaim.test, src/tgbatest/ltl2ta.test, src/tgbatest/ltl2tgba.cc, src/tgbatest/ltl2tgba.test, src/tgbatest/ltlcounter.test, src/tgbatest/ltlprod.cc, src/tgbatest/ltlprod.test, src/tgbatest/mixprod.cc, src/tgbatest/mixprod.test, src/tgbatest/neverclaimread.test, src/tgbatest/nondet.test, src/tgbatest/obligation.test, src/tgbatest/powerset.cc, src/tgbatest/randpsl.test, src/tgbatest/randtgba.cc, src/tgbatest/randtgba.test, src/tgbatest/readsave.test, src/tgbatest/renault.test, src/tgbatest/scc.test, src/tgbatest/sccsimpl.test, src/tgbatest/spotlbtt.test, src/tgbatest/spotlbtt2.test, src/tgbatest/taatgba.cc, src/tgbatest/taatgba.test, src/tgbatest/tgbaread.cc, src/tgbatest/tgbaread.test, src/tgbatest/tripprod.cc, src/tgbatest/tripprod.test, src/tgbatest/wdba.test, src/tgbatest/wdba2.test, wrap/Makefile.am, wrap/python/Makefile.am, wrap/python/ajax/Makefile.am, wrap/python/ajax/spot.in, wrap/python/buddy.i, wrap/python/spot.i, wrap/python/tests/Makefile.am, wrap/python/tests/alarm.py, wrap/python/tests/bddnqueen.py, wrap/python/tests/implies.py, wrap/python/tests/interdep.py, wrap/python/tests/ltl2tgba.py, wrap/python/tests/ltl2tgba.test, wrap/python/tests/ltlparse.py, wrap/python/tests/ltlsimple.py, wrap/python/tests/minato.py, wrap/python/tests/modgray.py, wrap/python/tests/optionmap.py, wrap/python/tests/parsetgba.py, wrap/python/tests/run.in, wrap/python/tests/setxor.py: Update licence version, and replace the FSF address by a URL.
640 lines
15 KiB
C++
640 lines
15 KiB
C++
// Copyright (C) 2009, 2010, 2011, 2012 Laboratoire de Recherche et
|
|
// Développement de l'Epita (LRDE).
|
|
// Copyright (C) 2003, 2004, 2005 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/>.
|
|
|
|
#include <cassert>
|
|
#include <utility>
|
|
#include <algorithm>
|
|
#include <iostream>
|
|
#include "multop.hh"
|
|
#include "constant.hh"
|
|
#include "bunop.hh"
|
|
#include "visitor.hh"
|
|
|
|
namespace spot
|
|
{
|
|
namespace ltl
|
|
{
|
|
multop::multop(type op, vec* v)
|
|
: ref_formula(MultOp), op_(op), children_(v)
|
|
{
|
|
unsigned s = v->size();
|
|
assert(s > 1);
|
|
|
|
props = (*v)[0]->get_props();
|
|
|
|
switch (op)
|
|
{
|
|
case Fusion:
|
|
is.accepting_eword = false;
|
|
case Concat:
|
|
case AndNLM:
|
|
case AndRat:
|
|
// Note: AndNLM(p1,p2) and AndRat(p1,p2) are Boolean
|
|
// formulae, but there are actually rewritten as And(p1,p2)
|
|
// by trivial identities before this constructor is called.
|
|
// So at this point, AndNLM/AndRat are always used with at
|
|
// most one Boolean argument, and the result is therefore
|
|
// NOT Boolean.
|
|
is.boolean = false;
|
|
is.ltl_formula = false;
|
|
is.eltl_formula = false;
|
|
is.psl_formula = false;
|
|
is.eventual = false;
|
|
is.universal = false;
|
|
case And:
|
|
for (unsigned i = 1; i < s; ++i)
|
|
props &= (*v)[i]->get_props();
|
|
break;
|
|
case OrRat:
|
|
// Note: OrRat(p1,p2) is a Boolean formula, but its is
|
|
// actually rewritten as Or(p1,p2) by trivial identities
|
|
// before this constructor is called. So at this point,
|
|
// AndNLM is always used with at most one Boolean argument,
|
|
// and the result is therefore NOT Boolean.
|
|
is.boolean = false;
|
|
is.ltl_formula = false;
|
|
is.eltl_formula = false;
|
|
is.psl_formula = false;
|
|
is.eventual = false;
|
|
is.universal = false;
|
|
case Or:
|
|
{
|
|
bool ew = (*v)[0]->accepts_eword();
|
|
for (unsigned i = 1; i < s; ++i)
|
|
{
|
|
ew |= (*v)[i]->accepts_eword();
|
|
props &= (*v)[i]->get_props();
|
|
}
|
|
is.accepting_eword = ew;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
multop::~multop()
|
|
{
|
|
// Get this instance out of the instance map.
|
|
pair p(op(), children_);
|
|
map::iterator i = instances.find(p);
|
|
assert (i != instances.end());
|
|
instances.erase(i);
|
|
|
|
// Dereference children.
|
|
for (unsigned n = 0; n < size(); ++n)
|
|
nth(n)->destroy();
|
|
|
|
delete children_;
|
|
}
|
|
|
|
std::string
|
|
multop::dump() const
|
|
{
|
|
std::string r = "multop(";
|
|
r += op_name();
|
|
unsigned max = size();
|
|
for (unsigned n = 0; n < max; ++n)
|
|
r += ", " + nth(n)->dump();
|
|
r += ")";
|
|
return r;
|
|
}
|
|
|
|
void
|
|
multop::accept(visitor& v) const
|
|
{
|
|
v.visit(this);
|
|
}
|
|
|
|
unsigned
|
|
multop::size() const
|
|
{
|
|
return children_->size();
|
|
}
|
|
|
|
const formula*
|
|
multop::nth(unsigned n) const
|
|
{
|
|
return (*children_)[n];
|
|
}
|
|
|
|
const formula*
|
|
multop::all_but(unsigned n) const
|
|
{
|
|
unsigned s = size();
|
|
vec* v = new vec;
|
|
v->reserve(s - 1);
|
|
for (unsigned pos = 0; pos < n; ++pos)
|
|
v->push_back(nth(pos)->clone());
|
|
for (unsigned pos = n + 1; pos < s; ++pos)
|
|
v->push_back(nth(pos)->clone());
|
|
return instance(op_, v);
|
|
}
|
|
|
|
multop::type
|
|
multop::op() const
|
|
{
|
|
return op_;
|
|
}
|
|
|
|
const char*
|
|
multop::op_name() const
|
|
{
|
|
switch (op_)
|
|
{
|
|
case And:
|
|
return "And";
|
|
case AndRat:
|
|
return "AndRat";
|
|
case AndNLM:
|
|
return "AndNLM";
|
|
case Or:
|
|
return "Or";
|
|
case OrRat:
|
|
return "OrRat";
|
|
case Concat:
|
|
return "Concat";
|
|
case Fusion:
|
|
return "Fusion";
|
|
}
|
|
// Unreachable code.
|
|
assert(0);
|
|
return 0;
|
|
}
|
|
|
|
namespace
|
|
{
|
|
static void
|
|
gather_bool(multop::vec* v, multop::type op)
|
|
{
|
|
// Gather all boolean terms.
|
|
multop::vec* b = new multop::vec;
|
|
multop::vec::iterator i = v->begin();
|
|
while (i != v->end())
|
|
{
|
|
if ((*i)->is_boolean())
|
|
{
|
|
b->push_back(*i);
|
|
i = v->erase(i);
|
|
}
|
|
else
|
|
{
|
|
++i;
|
|
}
|
|
}
|
|
// - AndNLM(Exps1...,Bool1,Exps2...,Bool2,Exps3...) =
|
|
// AndNLM(Exps1...,Exps2...,Exps3...,And(Bool1,Bool2))
|
|
// - AndRat(Exps1...,Bool1,Exps2...,Bool2,Exps3...) =
|
|
// AndRat(Exps1...,Exps2...,Exps3...,And(Bool1,Bool2))
|
|
// - OrRat(Exps1...,Bool1,Exps2...,Bool2,Exps3...) =
|
|
// AndRat(Exps1...,Exps2...,Exps3...,Or(Bool1,Bool2))
|
|
if (!b->empty())
|
|
v->push_back(multop::instance(op, b));
|
|
else
|
|
delete b;
|
|
}
|
|
}
|
|
|
|
multop::map multop::instances;
|
|
|
|
// We match equivalent formulae modulo "ACI rules"
|
|
// (i.e. associativity, commutativity and idempotence of the
|
|
// operator). For instance if `+' designates the OR operator and
|
|
// `0' is false (the neutral element for `+') , then `f+f+0' is
|
|
// equivalent to `f'.
|
|
const formula*
|
|
multop::instance(type op, vec* v)
|
|
{
|
|
// Inline children of same kind.
|
|
//
|
|
// When we construct a formula such as Multop(Op,X,Multop(Op,Y,Z))
|
|
// we will want to inline it as Multop(Op,X,Y,Z).
|
|
{
|
|
vec inlined;
|
|
vec::iterator i = v->begin();
|
|
while (i != v->end())
|
|
{
|
|
// Some simplification routines erase terms using null
|
|
// pointers that we must ignore.
|
|
if ((*i) == 0)
|
|
{
|
|
// FIXME: For commutative operators we should replace
|
|
// the pointer by the first non-null value at the end
|
|
// of the array instead of calling erase.
|
|
i = v->erase(i);
|
|
continue;
|
|
}
|
|
if (const multop* p = is_multop(*i))
|
|
{
|
|
if (p->op() == op)
|
|
{
|
|
unsigned ps = p->size();
|
|
for (unsigned n = 0; n < ps; ++n)
|
|
inlined.push_back(p->nth(n)->clone());
|
|
(*i)->destroy();
|
|
// FIXME: Do not use erase. See previous FIXME.
|
|
i = v->erase(i);
|
|
continue;
|
|
}
|
|
}
|
|
// All operator except "Concat" and "Fusion" are
|
|
// commutative, so we just keep a list of the inlined
|
|
// arguments that should later be added to the vector.
|
|
// For concat we have to keep track of the order of
|
|
// all the arguments.
|
|
if (op == Concat || op == Fusion)
|
|
inlined.push_back(*i);
|
|
++i;
|
|
}
|
|
if (op == Concat || op == Fusion)
|
|
*v = inlined;
|
|
else
|
|
v->insert(v->end(), inlined.begin(), inlined.end());
|
|
}
|
|
|
|
if (op != Concat && op != Fusion)
|
|
std::sort(v->begin(), v->end(), formula_ptr_less_than());
|
|
|
|
unsigned orig_size = v->size();
|
|
|
|
const formula* neutral;
|
|
const formula* neutral2;
|
|
const formula* abs;
|
|
const formula* abs2;
|
|
const formula* weak_abs;
|
|
switch (op)
|
|
{
|
|
case And:
|
|
neutral = constant::true_instance();
|
|
neutral2 = 0;
|
|
abs = constant::false_instance();
|
|
abs2 = 0;
|
|
weak_abs = 0;
|
|
break;
|
|
case AndRat:
|
|
neutral = bunop::one_star();
|
|
neutral2 = 0;
|
|
abs = constant::false_instance();
|
|
abs2 = 0;
|
|
weak_abs = constant::empty_word_instance();
|
|
gather_bool(v, And);
|
|
break;
|
|
case AndNLM:
|
|
neutral = constant::empty_word_instance();
|
|
neutral2 = 0;
|
|
abs = constant::false_instance();
|
|
abs2 = 0;
|
|
weak_abs = constant::true_instance();
|
|
gather_bool(v, And);
|
|
break;
|
|
case Or:
|
|
neutral = constant::false_instance();
|
|
neutral2 = 0;
|
|
abs = constant::true_instance();
|
|
abs2 = 0;
|
|
weak_abs = 0;
|
|
break;
|
|
case OrRat:
|
|
neutral = constant::false_instance();
|
|
neutral2 = 0;
|
|
abs = bunop::one_star();
|
|
abs2 = 0;
|
|
weak_abs = 0;
|
|
gather_bool(v, Or);
|
|
break;
|
|
case Concat:
|
|
neutral = constant::empty_word_instance();
|
|
neutral2 = 0;
|
|
abs = constant::false_instance();
|
|
abs2 = 0;
|
|
weak_abs = 0;
|
|
|
|
// - Concat(Exps1...,FExps2...,1[*],FExps3...,Exps4) =
|
|
// Concat(Exps1...,1[*],Exps4)
|
|
// If FExps2... and FExps3 all accept [*0].
|
|
{
|
|
vec::iterator i = v->begin();
|
|
const formula* os = bunop::one_star();
|
|
while (i != v->end())
|
|
{
|
|
while (i != v->end() && !(*i)->accepts_eword())
|
|
++i;
|
|
if (i == v->end())
|
|
break;
|
|
vec::iterator b = i;
|
|
// b is the first expressions that accepts [*0].
|
|
// let's find more, and locate the position of
|
|
// 1[*] at the same time.
|
|
bool os_seen = false;
|
|
do
|
|
{
|
|
os_seen |= (*i == os);
|
|
++i;
|
|
}
|
|
while (i != v->end() && (*i)->accepts_eword());
|
|
|
|
if (os_seen) // [b..i) is a range that contains [*].
|
|
{
|
|
// Place [*] at the start of the range, and erase
|
|
// all other formulae.
|
|
(*b)->destroy();
|
|
*b++ = os->clone();
|
|
for (vec::iterator c = b; c < i; ++c)
|
|
(*c)->destroy();
|
|
i = v->erase(b, i);
|
|
}
|
|
}
|
|
}
|
|
|
|
break;
|
|
case Fusion:
|
|
neutral = constant::true_instance();
|
|
neutral2 = 0;
|
|
abs = constant::false_instance();
|
|
abs2 = constant::empty_word_instance();
|
|
weak_abs = 0;
|
|
|
|
// Make a first pass to group adjacent Boolean formulae.
|
|
// - Fusion(Exps1...,BoolExp1...BoolExpN,Exps2,Exps3...) =
|
|
// Fusion(Exps1...,And(BoolExp1...BoolExpN),Exps2,Exps3...)
|
|
{
|
|
vec::iterator i = v->begin();
|
|
while (i != v->end())
|
|
{
|
|
if ((*i)->is_boolean())
|
|
{
|
|
vec::iterator first = i;
|
|
++i;
|
|
if (i == v->end())
|
|
break;
|
|
if (!(*i)->is_boolean())
|
|
{
|
|
++i;
|
|
continue;
|
|
}
|
|
do
|
|
++i;
|
|
while (i != v->end() && (*i)->is_boolean());
|
|
// We have at least two adjacent Boolean formulae.
|
|
// Replace the first one by the conjunction of all.
|
|
vec* b = new vec;
|
|
b->insert(b->begin(), first, i);
|
|
i = v->erase(first + 1, i);
|
|
*first = instance(And, b);
|
|
}
|
|
else
|
|
{
|
|
++i;
|
|
}
|
|
}
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
neutral = 0;
|
|
neutral2 = 0;
|
|
abs = 0;
|
|
abs2 = 0;
|
|
weak_abs = 0;
|
|
break;
|
|
}
|
|
|
|
// Remove duplicates (except for Concat and Fusion). We can't use
|
|
// std::unique(), because we must destroy() any formula we drop.
|
|
// Also ignore neutral elements and handle absorbent elements.
|
|
{
|
|
const formula* last = 0;
|
|
vec::iterator i = v->begin();
|
|
bool weak_abs_seen = false;
|
|
while (i != v->end())
|
|
{
|
|
if ((*i == neutral) || (*i == neutral2) || (*i == last))
|
|
{
|
|
(*i)->destroy();
|
|
i = v->erase(i);
|
|
}
|
|
else if (*i == abs || *i == abs2)
|
|
{
|
|
for (i = v->begin(); i != v->end(); ++i)
|
|
(*i)->destroy();
|
|
delete v;
|
|
return abs->clone();
|
|
}
|
|
else
|
|
{
|
|
weak_abs_seen |= (*i == weak_abs);
|
|
if (op != Concat && op != Fusion) // Don't remove duplicates
|
|
last = *i;
|
|
++i;
|
|
}
|
|
}
|
|
|
|
if (weak_abs_seen)
|
|
{
|
|
if (op == AndRat)
|
|
{
|
|
// We have a* && [*0] && c = 0
|
|
// and a* && [*0] && c* = [*0]
|
|
// So if [*0] has been seen, check if alls term
|
|
// recognize the empty word.
|
|
bool acc_eword = true;
|
|
for (i = v->begin(); i != v->end(); ++i)
|
|
{
|
|
acc_eword &= (*i)->accepts_eword();
|
|
(*i)->destroy();
|
|
}
|
|
delete v;
|
|
if (acc_eword)
|
|
return weak_abs;
|
|
else
|
|
return abs;
|
|
}
|
|
else
|
|
{
|
|
// Similarly, a* & 1 & (c;d) = c;d
|
|
// a* & 1 & c* = 1
|
|
assert(op == AndNLM);
|
|
multop::vec tmp;
|
|
for (i = v->begin(); i != v->end(); ++i)
|
|
{
|
|
if (*i == weak_abs)
|
|
continue;
|
|
if ((*i)->accepts_eword())
|
|
{
|
|
(*i)->destroy();
|
|
continue;
|
|
}
|
|
tmp.push_back(*i);
|
|
}
|
|
if (tmp.empty())
|
|
tmp.push_back(weak_abs);
|
|
v->swap(tmp);
|
|
}
|
|
}
|
|
else if (op == Concat)
|
|
{
|
|
// Perform an extra loop to merge starable items.
|
|
// f;f -> f[*2]
|
|
// f;f[*i..j] -> f[*i+1..j+1]
|
|
// f[*i..j];f -> f[*i+1..j+1]
|
|
// f[*i..j];f[*k..l] -> f[*i+k..j+l]
|
|
i = v->begin();
|
|
while (i != v->end())
|
|
{
|
|
vec::iterator fpos = i;
|
|
const formula* f;
|
|
unsigned min;
|
|
unsigned max;
|
|
bool changed = false;
|
|
if (const bunop* is = is_Star(*i))
|
|
{
|
|
f = is->child();
|
|
min = is->min();
|
|
max = is->max();
|
|
}
|
|
else
|
|
{
|
|
f = *i;
|
|
min = max = 1;
|
|
}
|
|
|
|
++i;
|
|
while (i != v->end())
|
|
{
|
|
const formula* f2;
|
|
unsigned min2;
|
|
unsigned max2;
|
|
if (const bunop* is = is_Star(*i))
|
|
{
|
|
f2 = is->child();
|
|
if (f2 != f)
|
|
break;
|
|
min2 = is->min();
|
|
max2 = is->max();
|
|
}
|
|
else
|
|
{
|
|
f2 = *i;
|
|
if (f2 != f)
|
|
break;
|
|
min2 = max2 = 1;
|
|
}
|
|
if (min2 == bunop::unbounded)
|
|
min = bunop::unbounded;
|
|
else if (min != bunop::unbounded)
|
|
min += min2;
|
|
if (max2 == bunop::unbounded)
|
|
max = bunop::unbounded;
|
|
else if (max != bunop::unbounded)
|
|
max += max2;
|
|
(*i)->destroy();
|
|
i = v->erase(i);
|
|
changed = true;
|
|
}
|
|
if (changed)
|
|
{
|
|
const formula* newfs =
|
|
bunop::instance(bunop::Star, f->clone(), min, max);
|
|
(*fpos)->destroy();
|
|
*fpos = newfs;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
vec::size_type s = v->size();
|
|
if (s == 0)
|
|
{
|
|
delete v;
|
|
assert(neutral != 0);
|
|
return neutral->clone();
|
|
}
|
|
else if (s == 1)
|
|
{
|
|
// Simply replace Multop(Op,X) by X.
|
|
// Except we should never reduce the
|
|
// arguments of a Fusion operator to
|
|
// a list with a single formula that
|
|
// accepts [*0].
|
|
const formula* res = (*v)[0];
|
|
if (op != Fusion || orig_size == 1
|
|
|| !res->accepts_eword())
|
|
{
|
|
delete v;
|
|
return res;
|
|
}
|
|
// If Fusion(f, ...) reduce to Fusion(f), emit Fusion(1,f).
|
|
// to ensure that [*0] is not accepted.
|
|
v->insert(v->begin(), constant::true_instance());
|
|
}
|
|
// The hash key.
|
|
pair p(op, v);
|
|
|
|
const multop* res;
|
|
// FIXME: Use lower_bound or hash_map.
|
|
map::iterator i = instances.find(p);
|
|
if (i != instances.end())
|
|
{
|
|
// The instance already exists.
|
|
for (vec::iterator vi = v->begin(); vi != v->end(); ++vi)
|
|
(*vi)->destroy();
|
|
delete v;
|
|
res = i->second;
|
|
}
|
|
else
|
|
{
|
|
// This is the first instance of this formula.
|
|
// Record the instance in the map,
|
|
res = instances[p] = new multop(op, v);
|
|
}
|
|
res->clone();
|
|
return res;
|
|
}
|
|
|
|
const formula*
|
|
multop::instance(type op, const formula* first, const formula* second)
|
|
{
|
|
vec* v = new vec;
|
|
v->push_back(first);
|
|
v->push_back(second);
|
|
return instance(op, v);
|
|
}
|
|
|
|
unsigned
|
|
multop::instance_count()
|
|
{
|
|
return instances.size();
|
|
}
|
|
|
|
std::ostream&
|
|
multop::dump_instances(std::ostream& os)
|
|
{
|
|
for (map::iterator i = instances.begin(); i != instances.end(); ++i)
|
|
{
|
|
os << i->second << " = "
|
|
<< i->second->ref_count_() << " * "
|
|
<< i->second->dump()
|
|
<< std::endl;
|
|
}
|
|
return os;
|
|
}
|
|
|
|
}
|
|
}
|