This helps working around missing C functions like strcasecmp that do not exist everywhere (e.g. on Cygwin), and for which lib/ supplies a replacement. Unfortunately we do not have such build in our current continuous integration suite, so we cannot easily detect files where such config.h inclusion would be useful. Therefore this patch simply makes it mandatory to include config.h in *.cc files. Including this in public *.hh file is currently forbidden. * spot/gen/automata.cc, spot/gen/formulas.cc, spot/kripke/fairkripke.cc, spot/kripke/kripke.cc, spot/ltsmin/ltsmin.cc, spot/misc/game.cc, spot/parseaut/fmterror.cc, spot/parsetl/fmterror.cc, spot/parsetl/parsetl.yy, spot/priv/bddalloc.cc, spot/priv/freelist.cc, spot/priv/satcommon.cc, spot/priv/trim.cc, spot/priv/weight.cc, spot/ta/ta.cc, spot/ta/taexplicit.cc, spot/ta/taproduct.cc, spot/ta/tgtaexplicit.cc, spot/ta/tgtaproduct.cc, spot/taalgos/dot.cc, spot/taalgos/emptinessta.cc, spot/taalgos/minimize.cc, spot/taalgos/reachiter.cc, spot/taalgos/statessetbuilder.cc, spot/taalgos/stats.cc, spot/taalgos/tgba2ta.cc, spot/tl/apcollect.cc, spot/tl/contain.cc, spot/tl/declenv.cc, spot/tl/defaultenv.cc, spot/tl/dot.cc, spot/tl/exclusive.cc, spot/tl/hierarchy.cc, spot/tl/length.cc, spot/tl/ltlf.cc, spot/tl/mark.cc, spot/tl/mutation.cc, spot/tl/nenoform.cc, spot/tl/print.cc, spot/tl/randomltl.cc, spot/tl/relabel.cc, spot/tl/remove_x.cc, spot/tl/simplify.cc, spot/tl/snf.cc, spot/tl/unabbrev.cc, spot/twa/acc.cc, spot/twa/bdddict.cc, spot/twa/bddprint.cc, spot/twa/formula2bdd.cc, spot/twa/taatgba.cc, spot/twa/twa.cc, spot/twa/twagraph.cc, spot/twa/twaproduct.cc, spot/twaalgos/aiger.cc, spot/twaalgos/alternation.cc, spot/twaalgos/are_isomorphic.cc, spot/twaalgos/bfssteps.cc, spot/twaalgos/canonicalize.cc, spot/twaalgos/cleanacc.cc, spot/twaalgos/cobuchi.cc, spot/twaalgos/complement.cc, spot/twaalgos/complete.cc, spot/twaalgos/compsusp.cc, spot/twaalgos/couvreurnew.cc, spot/twaalgos/cycles.cc, spot/twaalgos/degen.cc, spot/twaalgos/determinize.cc, spot/twaalgos/dot.cc, spot/twaalgos/dtbasat.cc, spot/twaalgos/dtwasat.cc, spot/twaalgos/dualize.cc, spot/twaalgos/emptiness.cc, spot/twaalgos/gtec/ce.cc, spot/twaalgos/gtec/gtec.cc, spot/twaalgos/gtec/sccstack.cc, spot/twaalgos/gtec/status.cc, spot/twaalgos/gv04.cc, spot/twaalgos/hoa.cc, spot/twaalgos/iscolored.cc, spot/twaalgos/isdet.cc, spot/twaalgos/isunamb.cc, spot/twaalgos/isweakscc.cc, spot/twaalgos/langmap.cc, spot/twaalgos/lbtt.cc, spot/twaalgos/ltl2taa.cc, spot/twaalgos/ltl2tgba_fm.cc, spot/twaalgos/magic.cc, spot/twaalgos/mask.cc, spot/twaalgos/minimize.cc, spot/twaalgos/neverclaim.cc, spot/twaalgos/parity.cc, spot/twaalgos/postproc.cc, spot/twaalgos/powerset.cc, spot/twaalgos/product.cc, spot/twaalgos/rabin2parity.cc, spot/twaalgos/randomgraph.cc, spot/twaalgos/randomize.cc, spot/twaalgos/reachiter.cc, spot/twaalgos/relabel.cc, spot/twaalgos/remfin.cc, spot/twaalgos/remprop.cc, spot/twaalgos/sbacc.cc, spot/twaalgos/sccfilter.cc, spot/twaalgos/sccinfo.cc, spot/twaalgos/se05.cc, spot/twaalgos/sepsets.cc, spot/twaalgos/simulation.cc, spot/twaalgos/split.cc, spot/twaalgos/stats.cc, spot/twaalgos/strength.cc, spot/twaalgos/stripacc.cc, spot/twaalgos/stutter.cc, spot/twaalgos/sum.cc, spot/twaalgos/tau03.cc, spot/twaalgos/tau03opt.cc, spot/twaalgos/totgba.cc, spot/twaalgos/toweak.cc, spot/twaalgos/translate.cc, spot/twaalgos/word.cc, tests/core/acc.cc, tests/core/bitvect.cc, tests/core/checkpsl.cc, tests/core/checkta.cc, tests/core/consterm.cc, tests/core/emptchk.cc, tests/core/equalsf.cc, tests/core/graph.cc, tests/core/ikwiad.cc, tests/core/intvcmp2.cc, tests/core/intvcomp.cc, tests/core/kind.cc, tests/core/kripkecat.cc, tests/core/length.cc, tests/core/ltlrel.cc, tests/core/ngraph.cc, tests/core/parity.cc, tests/core/randtgba.cc, tests/core/readltl.cc, tests/core/reduc.cc, tests/core/safra.cc, tests/core/sccif.cc, tests/core/syntimpl.cc, tests/core/taatgba.cc, tests/core/tostring.cc, tests/core/trival.cc, tests/core/twagraph.cc, tests/ltsmin/modelcheck.cc, spot/parseaut/scanaut.ll, spot/parsetl/scantl.ll: Include config.h. * spot/gen/Makefile.am, spot/graph/Makefile.am, spot/kripke/Makefile.am, spot/ltsmin/Makefile.am, spot/parseaut/Makefile.am, spot/parsetl/Makefile.am, spot/priv/Makefile.am, spot/ta/Makefile.am, spot/taalgos/Makefile.am, spot/tl/Makefile.am, spot/twa/Makefile.am, spot/twaalgos/Makefile.am, spot/twaalgos/gtec/Makefile.am, tests/Makefile.am: Add the -I lib/ flags. * tests/sanity/includes.test: Catch missing config.h in *.cc, and diagnose config.h in *.hh. * tests/sanity/style.test: Better diagnostics.
251 lines
6.4 KiB
C++
251 lines
6.4 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2015, 2018 Laboratoire de Recherche et Développement
|
|
// de l'Epita (LRDE).
|
|
//
|
|
// 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 3 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 this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
#include "config.h"
|
|
#include <spot/tl/unabbrev.hh>
|
|
|
|
namespace spot
|
|
{
|
|
unabbreviator::unabbreviator(const char* opt)
|
|
{
|
|
while (*opt)
|
|
switch (char c = *opt++)
|
|
{
|
|
case 'e':
|
|
re_e_ = true;
|
|
re_some_bool_ = true;
|
|
break;
|
|
case 'F':
|
|
re_f_ = true;
|
|
re_some_f_g_ = true;
|
|
break;
|
|
case 'G':
|
|
re_g_ = true;
|
|
re_some_f_g_ = true;
|
|
break;
|
|
case 'i':
|
|
re_i_ = true;
|
|
re_some_bool_ = true;
|
|
break;
|
|
case 'M':
|
|
re_m_ = true;
|
|
re_some_other_ = true;
|
|
break;
|
|
case 'R':
|
|
re_r_ = true;
|
|
re_some_other_ = true;
|
|
break;
|
|
case 'W':
|
|
re_w_ = true;
|
|
re_some_other_ = true;
|
|
break;
|
|
case '^':
|
|
re_xor_ = true;
|
|
re_some_bool_ = true;
|
|
break;
|
|
default:
|
|
throw std::runtime_error
|
|
(std::string("unknown unabbreviation option: ")
|
|
+ c);
|
|
}
|
|
}
|
|
|
|
formula unabbreviator::run(formula in)
|
|
{
|
|
auto entry = cache_.emplace(in, nullptr);
|
|
if (!entry.second)
|
|
return entry.first->second;
|
|
|
|
// Skip recursion whenever possible
|
|
bool no_boolean_rewrite = !re_some_bool_ || in.is_sugar_free_boolean();
|
|
bool no_f_g_rewrite = !re_some_f_g_ || in.is_sugar_free_ltl();
|
|
if (no_boolean_rewrite
|
|
&& (in.is_boolean() || (no_f_g_rewrite && !re_some_other_)))
|
|
return entry.first->second = in;
|
|
|
|
auto rec = [this](formula f)
|
|
{
|
|
return this->run(f);
|
|
};
|
|
|
|
formula out = in;
|
|
if (in.size() > 0)
|
|
out = in.map(rec);
|
|
|
|
switch (out.kind())
|
|
{
|
|
case op::ff:
|
|
case op::tt:
|
|
case op::eword:
|
|
case op::ap:
|
|
case op::Not:
|
|
case op::X:
|
|
case op::Closure:
|
|
case op::NegClosure:
|
|
case op::NegClosureMarked:
|
|
case op::EConcat:
|
|
case op::EConcatMarked:
|
|
case op::UConcat:
|
|
case op::U:
|
|
case op::Or:
|
|
case op::OrRat:
|
|
case op::And:
|
|
case op::AndRat:
|
|
case op::AndNLM:
|
|
case op::Concat:
|
|
case op::Fusion:
|
|
case op::Star:
|
|
case op::FStar:
|
|
break;
|
|
case op::F:
|
|
// F f = true U f
|
|
if (!re_f_)
|
|
break;
|
|
out = formula::U(formula::tt(), out[0]);
|
|
break;
|
|
case op::G:
|
|
// G f = false R f
|
|
// G f = f W false
|
|
// G f = !F!f
|
|
// G f = !(true U !f)
|
|
if (!re_g_)
|
|
break;
|
|
if (!re_r_)
|
|
{
|
|
out = formula::R(formula::ff(), out[0]);
|
|
break;
|
|
}
|
|
if (!re_w_)
|
|
{
|
|
out = formula::W(out[0], formula::ff());
|
|
break;
|
|
}
|
|
{
|
|
auto nc = formula::Not(out[0]);
|
|
if (!re_f_)
|
|
{
|
|
out = formula::Not(formula::F(nc));
|
|
break;
|
|
}
|
|
out = formula::Not(formula::U(formula::tt(), nc));
|
|
break;
|
|
}
|
|
case op::Xor:
|
|
// f1 ^ f2 == !(f1 <-> f2)
|
|
// f1 ^ f2 == (f1 & !f2) | (f2 & !f1)
|
|
if (!re_xor_)
|
|
break;
|
|
{
|
|
auto f1 = out[0];
|
|
auto f2 = out[1];
|
|
if (!re_e_)
|
|
{
|
|
out = formula::Not(formula::Equiv(f1, f2));
|
|
}
|
|
else
|
|
{
|
|
auto a = formula::And({f1, formula::Not(f2)});
|
|
auto b = formula::And({f2, formula::Not(f1)});
|
|
out = formula::Or({a, b});
|
|
}
|
|
}
|
|
break;
|
|
case op::Implies:
|
|
// f1 => f2 == !f1 | f2
|
|
if (!re_i_)
|
|
break;
|
|
out = formula::Or({formula::Not(out[0]), out[1]});
|
|
break;
|
|
case op::Equiv:
|
|
// f1 <=> f2 == (f1 & f2) | (!f1 & !f2)
|
|
if (!re_e_)
|
|
break;
|
|
{
|
|
auto f1 = out[0];
|
|
auto f2 = out[1];
|
|
auto nf1 = formula::Not(f1);
|
|
auto nf2 = formula::Not(f2);
|
|
auto term1 = formula::And({f1, f2});
|
|
auto term2 = formula::And({nf1, nf2});
|
|
out = formula::Or({term1, term2});
|
|
break;
|
|
}
|
|
case op::R:
|
|
// f1 R f2 = f2 W (f1 & f2)
|
|
// f1 R f2 = f2 U ((f1 & f2) | Gf2)
|
|
// f1 R f2 = f2 U ((f1 & f2) | !F!f2)
|
|
// f1 R f2 = f2 U ((f1 & f2) | !(1 U !f2))
|
|
if (!re_r_)
|
|
break;
|
|
{
|
|
auto f1 = out[0];
|
|
auto f2 = out[1];
|
|
auto f12 = formula::And({f1, f2});
|
|
if (!re_w_)
|
|
{
|
|
out = formula::W(f2, f12);
|
|
break;
|
|
}
|
|
auto gf2 = formula::G(f2);
|
|
if (re_g_)
|
|
gf2 = run(gf2);
|
|
out = formula::U(f2, formula::Or({f12, gf2}));
|
|
break;
|
|
}
|
|
case op::W:
|
|
// f1 W f2 = f2 R (f2 | f1)
|
|
// f1 W f2 = f1 U (f2 | G f1)
|
|
// f1 W f2 = f1 U (f2 | !F !f1)
|
|
// f1 W f2 = f1 U (f2 | !(1 U !f1))
|
|
if (!re_w_)
|
|
break;
|
|
{
|
|
auto f1 = out[0];
|
|
auto f2 = out[1];
|
|
if (!re_r_)
|
|
{
|
|
out = formula::R(f2, formula::Or({f2, f1}));
|
|
break;
|
|
}
|
|
auto gf1 = formula::G(f1);
|
|
if (re_g_)
|
|
gf1 = run(gf1);
|
|
out = formula::U(f1, formula::Or({f2, gf1}));
|
|
break;
|
|
}
|
|
case op::M:
|
|
// f1 M f2 = f2 U (g2 & f1)
|
|
if (!re_m_)
|
|
break;
|
|
{
|
|
auto f2 = out[1];
|
|
out = formula::U(f2, formula::And({f2, out[0]}));
|
|
break;
|
|
}
|
|
}
|
|
return entry.first->second = out;
|
|
}
|
|
|
|
formula unabbreviate(formula in, const char* opt)
|
|
{
|
|
unabbreviator un(opt);
|
|
return un.run(in);
|
|
}
|
|
}
|