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
parent
0f0ada825a
commit
bf62d439c9
98 changed files with 1318 additions and 1535 deletions
|
|
@ -106,19 +106,16 @@ namespace spot
|
|||
/// - [*0] []-> Exp = 1
|
||||
/// - Exp []-> 1 = 1
|
||||
/// - boolExp <>-> Exp = !boolExp | Exp
|
||||
static formula* instance(type op, formula* first, formula* second);
|
||||
static const formula* instance(type op,
|
||||
const formula* first,
|
||||
const formula* second);
|
||||
|
||||
virtual void accept(visitor& v);
|
||||
virtual void accept(const_visitor& v) const;
|
||||
virtual void accept(visitor& v) const;
|
||||
|
||||
/// Get the first operand.
|
||||
const formula* first() const;
|
||||
/// Get the first operand.
|
||||
formula* first();
|
||||
/// Get the second operand.
|
||||
const formula* second() const;
|
||||
/// Get the second operand.
|
||||
formula* second();
|
||||
|
||||
/// Get the type of this operator.
|
||||
type op() const;
|
||||
|
|
@ -135,18 +132,18 @@ namespace spot
|
|||
static std::ostream& dump_instances(std::ostream& os);
|
||||
|
||||
protected:
|
||||
typedef std::pair<formula*, formula*> pairf;
|
||||
typedef std::pair<const formula*, const formula*> pairf;
|
||||
typedef std::pair<type, pairf> pair;
|
||||
typedef std::map<pair, binop*> map;
|
||||
typedef std::map<pair, const binop*> map;
|
||||
static map instances;
|
||||
|
||||
binop(type op, formula* first, formula* second);
|
||||
binop(type op, const formula* first, const formula* second);
|
||||
virtual ~binop();
|
||||
|
||||
private:
|
||||
type op_;
|
||||
formula* first_;
|
||||
formula* second_;
|
||||
const formula* first_;
|
||||
const formula* second_;
|
||||
};
|
||||
|
||||
/// \brief Cast \a f into a binop
|
||||
|
|
@ -154,12 +151,12 @@ namespace spot
|
|||
/// Cast \a f into a binop iff it is a binop instance. Return 0
|
||||
/// otherwise. This is faster than \c dynamic_cast.
|
||||
inline
|
||||
binop*
|
||||
is_binop(formula* f)
|
||||
const binop*
|
||||
is_binop(const formula* f)
|
||||
{
|
||||
if (f->kind() != formula::BinOp)
|
||||
return 0;
|
||||
return static_cast<binop*>(f);
|
||||
return static_cast<const binop*>(f);
|
||||
}
|
||||
|
||||
/// \brief Cast \a f into a binop if it has type \a op.
|
||||
|
|
@ -167,15 +164,13 @@ namespace spot
|
|||
/// Cast \a f into a binop iff it is a unop instance with operator \a op.
|
||||
/// Returns 0 otherwise.
|
||||
inline
|
||||
binop*
|
||||
is_binop(formula* f, binop::type op)
|
||||
const binop*
|
||||
is_binop(const formula* f, binop::type op)
|
||||
{
|
||||
if (f->kind() != formula::BinOp)
|
||||
return 0;
|
||||
binop* bo = static_cast<binop*>(f);
|
||||
if (bo->op() != op)
|
||||
return 0;
|
||||
return bo;
|
||||
if (const binop* bo = is_binop(f))
|
||||
if (bo->op() == op)
|
||||
return bo;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/// \brief Cast \a f into a binop if it has type \a op1 or \a op2.
|
||||
|
|
@ -183,15 +178,12 @@ namespace spot
|
|||
/// Cast \a f into a binop iff it is a unop instance with operator \a op1 or
|
||||
/// \a op2. Returns 0 otherwise.
|
||||
inline
|
||||
binop*
|
||||
is_binop(formula* f, binop::type op1, binop::type op2)
|
||||
const binop*
|
||||
is_binop(const formula* f, binop::type op1, binop::type op2)
|
||||
{
|
||||
if (f->kind() != formula::BinOp)
|
||||
return 0;
|
||||
binop* bo = static_cast<binop*>(f);
|
||||
binop::type op = bo->op();
|
||||
if (op == op1 || op == op2)
|
||||
return bo;
|
||||
if (const binop* bo = is_binop(f))
|
||||
if (bo->op() == op1 || bo->op() == op2)
|
||||
return bo;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -199,8 +191,8 @@ namespace spot
|
|||
///
|
||||
/// Return 0 otherwise.
|
||||
inline
|
||||
binop*
|
||||
is_U(formula* f)
|
||||
const binop*
|
||||
is_U(const formula* f)
|
||||
{
|
||||
return is_binop(f, binop::U);
|
||||
}
|
||||
|
|
@ -209,8 +201,8 @@ namespace spot
|
|||
///
|
||||
/// Return 0 otherwise.
|
||||
inline
|
||||
binop*
|
||||
is_M(formula* f)
|
||||
const binop*
|
||||
is_M(const formula* f)
|
||||
{
|
||||
return is_binop(f, binop::M);
|
||||
}
|
||||
|
|
@ -219,8 +211,8 @@ namespace spot
|
|||
///
|
||||
/// Return 0 otherwise.
|
||||
inline
|
||||
binop*
|
||||
is_R(formula* f)
|
||||
const binop*
|
||||
is_R(const formula* f)
|
||||
{
|
||||
return is_binop(f, binop::R);
|
||||
}
|
||||
|
|
@ -229,8 +221,8 @@ namespace spot
|
|||
///
|
||||
/// Return 0 otherwise.
|
||||
inline
|
||||
binop*
|
||||
is_W(formula* f)
|
||||
const binop*
|
||||
is_W(const formula* f)
|
||||
{
|
||||
return is_binop(f, binop::W);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue