0fc0ea3166
* src/ltlast/binop.cc, src/ltlast/binop.cc: Add support for these new operators. * src/ltlparse/ltlparse.yy, src/ltlparse/ltlscan.ll: Parse them. * src/ltltest/reduccmp.test: Add new tests for W and M. * src/ltlvisit/basicreduce.cc, src/ltlvisit/contain.cc, src/ltlvisit/lunabbrev.cc, src/ltlvisit/nenoform.cc, src/ltlvisit/randomltl.cc, src/ltlvisit/randomltl.hh, src/ltlvisit/reduce.cc, src/ltlvisite/simpfg.cc, src/ltlvisit/simpfg.hh, src/ltlvisit/syntimpl.cc, src/ltlvisit/tostring.cc, src/tgba/formula2bdd.cc, src/tgbaalgos/eltl2tgba_lacim.cc, src/tgbaalgos/ltl2taa.cc, src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/ltl2tgba_lacim.cc: Add support for W and M. * src/tgbatest/ltl2neverclaim.test: Test never claim output using LBTT, this is more thorough. Also we cannot use -N any more in the spotlbtt.test. * src/tgbatests/ltl2tgba.cc: Define M and W for ELTL. * src/tgbatest/ltl2neverclaim.test: Test W and M, and use -DS instead of -N, because lbtt-translate does not want to translate these operators for tools that masquerade as Spin.
105 lines
2.9 KiB
C++
105 lines
2.9 KiB
C++
// Copyright (C) 2009, 2010 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(binop* bo)
|
|
{
|
|
formula* f1 = recurse(bo->first());
|
|
formula* f2 = recurse(bo->second());
|
|
|
|
binop::type op = bo->op();
|
|
switch (op)
|
|
{
|
|
/* f1 ^ f2 == (f1 & !f2) | (f2 & !f1) */
|
|
case binop::Xor:
|
|
result_ = multop::instance(multop::Or,
|
|
multop::instance(multop::And, f1->clone(),
|
|
unop::instance(unop::Not,
|
|
f2)),
|
|
multop::instance(multop::And, f2->clone(),
|
|
unop::instance(unop::Not,
|
|
f1)));
|
|
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:
|
|
result_ = multop::instance(multop::Or,
|
|
multop::instance(multop::And,
|
|
f1->clone(), f2->clone()),
|
|
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 */
|
|
case binop::U:
|
|
case binop::R:
|
|
case binop::W:
|
|
case binop::M:
|
|
result_ = binop::instance(op, f1, f2);
|
|
return;
|
|
}
|
|
/* Unreachable code. */
|
|
assert(0);
|
|
}
|
|
|
|
formula*
|
|
unabbreviate_logic_visitor::recurse(formula* f)
|
|
{
|
|
return unabbreviate_logic(f);
|
|
}
|
|
|
|
formula*
|
|
unabbreviate_logic(const formula* f)
|
|
{
|
|
unabbreviate_logic_visitor v;
|
|
const_cast<formula*>(f)->accept(v);
|
|
return v.result();
|
|
}
|
|
}
|
|
}
|