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.
118 lines
3.2 KiB
C++
118 lines
3.2 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2009, 2010, 2012 Laboratoire de Recherche et
|
|
// Développement de l'Epita (LRDE).
|
|
// Copyright (C) 2003, 2004 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 2 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 Spot; see the file COPYING. If not, write to the Free
|
|
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
// 02111-1307, USA.
|
|
|
|
#include "ltlast/allnodes.hh"
|
|
#include "lunabbrev.hh"
|
|
#include <cassert>
|
|
|
|
namespace spot
|
|
{
|
|
namespace ltl
|
|
{
|
|
|
|
unabbreviate_logic_visitor::unabbreviate_logic_visitor()
|
|
{
|
|
}
|
|
|
|
unabbreviate_logic_visitor::~unabbreviate_logic_visitor()
|
|
{
|
|
}
|
|
|
|
void
|
|
unabbreviate_logic_visitor::visit(const binop* bo)
|
|
{
|
|
const formula* f1 = recurse(bo->first());
|
|
const formula* f2 = recurse(bo->second());
|
|
|
|
binop::type op = bo->op();
|
|
switch (op)
|
|
{
|
|
/* f1 ^ f2 == (f1 & !f2) | (f2 & !f1) */
|
|
case binop::Xor:
|
|
{
|
|
const formula* a =
|
|
multop::instance(multop::And, f1->clone(),
|
|
unop::instance(unop::Not, f2->clone()));
|
|
const formula* b =
|
|
multop::instance(multop::And, f2,
|
|
unop::instance(unop::Not, f1));
|
|
result_ = multop::instance(multop::Or, a, b);
|
|
return;
|
|
}
|
|
/* f1 => f2 == !f1 | f2 */
|
|
case binop::Implies:
|
|
result_ = multop::instance(multop::Or,
|
|
unop::instance(unop::Not, f1), f2);
|
|
return;
|
|
/* f1 <=> f2 == (f1 & f2) | (!f1 & !f2) */
|
|
case binop::Equiv:
|
|
{
|
|
const formula* f1c = f1->clone();
|
|
const formula* f2c = f2->clone();
|
|
|
|
result_ =
|
|
multop::instance(multop::Or,
|
|
multop::instance(multop::And, f1c, f2c),
|
|
multop::instance(multop::And,
|
|
unop::instance(unop::Not, f1),
|
|
unop::instance(unop::Not, f2)));
|
|
return;
|
|
}
|
|
/* f1 U f2 == f1 U f2 */
|
|
/* f1 R f2 == f1 R f2 */
|
|
/* f1 W f2 == f1 W f2 */
|
|
/* f1 M f2 == f1 M f2 */
|
|
/* f1 UConcat f2 == f1 UConcat f2 */
|
|
/* f1 EConcat f2 == f1 EConcat f2 */
|
|
case binop::U:
|
|
case binop::R:
|
|
case binop::W:
|
|
case binop::M:
|
|
case binop::UConcat:
|
|
case binop::EConcat:
|
|
case binop::EConcatMarked:
|
|
result_ = binop::instance(op, f1, f2);
|
|
return;
|
|
}
|
|
/* Unreachable code. */
|
|
assert(0);
|
|
}
|
|
|
|
const formula*
|
|
unabbreviate_logic_visitor::recurse(const formula* f)
|
|
{
|
|
return unabbreviate_logic(f);
|
|
}
|
|
|
|
const formula*
|
|
unabbreviate_logic(const formula* f)
|
|
{
|
|
if (f->is_sugar_free_boolean())
|
|
return f->clone();
|
|
unabbreviate_logic_visitor v;
|
|
f->accept(v);
|
|
return v.result();
|
|
}
|
|
}
|
|
}
|