Use 'const formula*' instead of 'formula*' everywhere.

The distinction makes no sense since Spot 0.5, where we switched from
mutable furmulae to immutable formulae.  The difference between
const_visitor and visitor made no sense either.  They have been merged
into one: visitor.

* iface/dve2/dve2check.cc, iface/gspn/ltlgspn.cc,
src/eltlparse/eltlparse.yy, src/eltlparse/public.hh,
src/evtgbatest/ltl2evtgba.cc, src/kripkeparse/kripkeparse.yy,
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/predecl.hh, src/ltlast/refformula.cc,
src/ltlast/refformula.hh, src/ltlast/unop.cc, src/ltlast/unop.hh,
src/ltlast/visitor.hh, src/ltlenv/declenv.cc, src/ltlenv/declenv.hh,
src/ltlenv/defaultenv.cc, src/ltlenv/defaultenv.hh,
src/ltlenv/environment.hh, src/ltlparse/ltlfile.cc,
src/ltlparse/ltlfile.hh, src/ltlparse/ltlparse.yy,
src/ltlparse/public.hh, src/ltltest/consterm.cc,
src/ltltest/equals.cc, src/ltltest/genltl.cc, src/ltltest/kind.cc,
src/ltltest/length.cc, src/ltltest/randltl.cc, src/ltltest/readltl.cc,
src/ltltest/reduc.cc, src/ltltest/syntimpl.cc,
src/ltltest/tostring.cc, 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/dotty.cc,
src/ltlvisit/length.cc, 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/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/tunabbrev.cc, src/ltlvisit/tunabbrev.hh,
src/ltlvisit/wmunabbrev.cc, src/ltlvisit/wmunabbrev.hh,
src/neverparse/neverclaimparse.yy, src/sabatest/sabacomplementtgba.cc,
src/tgba/bdddict.cc, src/tgba/formula2bdd.cc, src/tgba/taatgba.cc,
src/tgba/taatgba.hh, src/tgbaalgos/eltl2tgba_lacim.cc,
src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/ltl2tgba_fm.cc,
src/tgbaalgos/ltl2tgba_lacim.cc, src/tgbaalgos/minimize.cc,
src/tgbaalgos/randomgraph.cc, src/tgbaparse/tgbaparse.yy,
src/tgbatest/complementation.cc, src/tgbatest/ltl2tgba.cc,
src/tgbatest/ltlprod.cc, src/tgbatest/mixprod.cc,
src/tgbatest/randtgba.cc: Massive adjustment!
* src/tgbatest/reductgba.cc: Delete.
This commit is contained in:
Alexandre Duret-Lutz 2012-05-01 23:38:55 +02:00
parent 0f0ada825a
commit bf62d439c9
98 changed files with 1318 additions and 1535 deletions

View file

@ -1,7 +1,8 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2008, 2009, 2010, 2011, 2012 Laboratoire de Recherche
// et Développement de l'Epita (LRDE).
// et Développement de l'Epita (LRDE).
// Copyright (C) 2005 Laboratoire d'Informatique de Paris 6
// (LIP6), département Systèmes Répartis Coopératifs (SRC), Université
// (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.
@ -35,7 +36,7 @@ namespace spot
{
namespace
{
static formula*
static const formula*
ap_builder(const random_formula* rl, int n)
{
assert(n == 1);
@ -45,7 +46,7 @@ namespace spot
return (*i)->clone();
}
static formula*
static const formula*
true_builder(const random_formula*, int n)
{
assert(n == 1);
@ -53,7 +54,7 @@ namespace spot
return constant::true_instance();
}
static formula*
static const formula*
boolform_builder(const random_formula* rl, int n)
{
assert(n >= 1);
@ -61,7 +62,7 @@ namespace spot
return rs->rb.generate(n);
}
static formula*
static const formula*
false_builder(const random_formula*, int n)
{
assert(n == 1);
@ -69,7 +70,7 @@ namespace spot
return constant::false_instance();
}
static formula*
static const formula*
eword_builder(const random_formula*, int n)
{
assert(n == 1);
@ -78,14 +79,14 @@ namespace spot
}
template <unop::type Op>
static formula*
static const formula*
unop_builder(const random_formula* rl, int n)
{
assert(n >= 2);
return unop::instance(Op, rl->generate(n - 1));
}
static formula*
static const formula*
closure_builder(const random_formula* rl, int n)
{
assert(n >= 2);
@ -94,7 +95,7 @@ namespace spot
}
template <binop::type Op>
static formula*
static const formula*
binop_builder(const random_formula* rl, int n)
{
assert(n >= 3);
@ -104,7 +105,7 @@ namespace spot
}
template <binop::type Op>
static formula*
static const formula*
binop_SERELTL_builder(const random_formula* rl, int n)
{
assert(n >= 3);
@ -115,7 +116,7 @@ namespace spot
}
template <bunop::type Op>
static formula*
static const formula*
bunop_unbounded_builder(const random_formula* rl, int n)
{
assert(n >= 2);
@ -123,7 +124,7 @@ namespace spot
}
template <bunop::type Op>
static formula*
static const formula*
bunop_bounded_builder(const random_formula* rl, int n)
{
assert(n >= 2);
@ -133,7 +134,7 @@ namespace spot
}
template <bunop::type Op>
static formula*
static const formula*
bunop_bool_bounded_builder(const random_formula* rl, int n)
{
assert(n >= 2);
@ -145,7 +146,7 @@ namespace spot
template <multop::type Op>
static formula*
static const formula*
multop_builder(const random_formula* rl, int n)
{
assert(n >= 3);
@ -197,7 +198,7 @@ namespace spot
assert(total_2_and_more_ != 0.0);
}
formula*
const formula*
random_formula::generate(int n) const
{
assert(n > 0);