alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

68
src/ltlvisit/mark.cc
View file

@ -33,7 +33,7 @@ namespace spot
{
class simplify_mark_visitor : public visitor
{
formula* result_;
const formula* result_;
mark_tools* tools_;
public:
@ -46,44 +46,44 @@ namespace spot
{
}
formula*
const formula*
result()
{
return result_;
}
void
visit(atomic_prop* ao)
visit(const atomic_prop* ao)
{
result_ = ao->clone();
}
void
visit(constant* c)
visit(const constant* c)
{
result_ = c->clone();
}
void
visit(bunop* bo)
visit(const bunop* bo)
{
result_ = bo->clone();
}
void
visit(unop* uo)
visit(const unop* uo)
{
result_ = uo->clone();
}
void
visit(automatop* ao)
visit(const automatop* ao)
{
result_ = ao->clone();
}
void
visit(multop* mo)
visit(const multop* mo)
{
unsigned mos = mo->size();
multop::vec* res = new multop::vec;
@ -101,12 +101,13 @@ namespace spot
break;
case multop::And:
{
typedef std::set<std::pair<formula*, formula*> > pset;
typedef std::set<std::pair<const formula*,
const formula*> > pset;
pset Epairs, EMpairs;
for (unsigned i = 0; i < mos; ++i)
{
formula* f = mo->nth(i);
const formula* f = mo->nth(i);
if (f->kind() != formula::BinOp)
{
@ -114,7 +115,7 @@ namespace spot
}
else
{
binop* bo = static_cast<binop*>(f);
const binop* bo = static_cast<const binop*>(f);
switch (bo->op())
{
case binop::Xor:
@ -157,13 +158,13 @@ namespace spot
}
void
visit(binop* bo)
visit(const binop* bo)
{
result_ = bo->clone();
}
formula*
recurse(formula* f)
const formula*
recurse(const formula* f)
{
return tools_->simplify_mark(f);
}
@ -172,7 +173,7 @@ namespace spot
class mark_visitor : public visitor
{
formula* result_;
const formula* result_;
mark_tools* tools_;
public:
@ -184,44 +185,44 @@ namespace spot
{
}
formula*
const formula*
result()
{
return result_;
}
void
visit(atomic_prop* ap)
visit(const atomic_prop* ap)
{
result_ = ap->clone();
}
void
visit(constant* c)
visit(const constant* c)
{
result_ = c->clone();
}
void
visit(bunop* bo)
visit(const bunop* bo)
{
result_ = bo->clone();
}
void
visit(unop* uo)
visit(const unop* uo)
{
result_ = uo->clone();
}
void
visit(automatop* ao)
visit(const automatop* ao)
{
result_ = ao->clone();
}
void
visit(multop* mo)
visit(const multop* mo)
{
multop::vec* res = new multop::vec;
unsigned mos = mo->size();
@ -231,7 +232,7 @@ namespace spot
}
void
visit(binop* bo)
visit(const binop* bo)
{
switch (bo->op())
{
@ -249,8 +250,8 @@ namespace spot
case binop::EConcatMarked:
case binop::EConcat:
{
formula* f1 = bo->first()->clone();
formula* f2 = recurse(bo->second());
const formula* f1 = bo->first()->clone();
const formula* f2 = recurse(bo->second());
result_ = binop::instance(binop::EConcatMarked, f1, f2);
return;
}
@ -259,8 +260,8 @@ namespace spot
assert(0);
}
formula*
recurse(formula* f)
const formula*
recurse(const formula* f)
{
return tools_->mark_concat_ops(f);
}
@ -301,21 +302,21 @@ namespace spot
}
}
formula*
const formula*
mark_tools::mark_concat_ops(const formula* f)
{
f2f_map::iterator i = markops_.find(f);
if (i != markops_.end())
return i->second->clone();
const_cast<formula*>(f)->accept(*markvisitor_);
f->accept(*markvisitor_);
formula* r = down_cast<mark_visitor*>(markvisitor_)->result();
const formula* r = down_cast<mark_visitor*>(markvisitor_)->result();
markops_[f->clone()] = r->clone();
return r;
}
formula*
const formula*
mark_tools::simplify_mark(const formula* f)
{
if (!f->is_marked())
@ -325,9 +326,10 @@ namespace spot
if (i != simpmark_.end())
return i->second->clone();
const_cast<formula*>(f)->accept(*simpvisitor_);
f->accept(*simpvisitor_);
formula* r = down_cast<simplify_mark_visitor*>(simpvisitor_)->result();
const formula* r =
down_cast<simplify_mark_visitor*>(simpvisitor_)->result();
simpmark_[f->clone()] = r->clone();
return r;
}