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.
220 lines
6.1 KiB
C++
220 lines
6.1 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2008-2012, 2014-2016, 2018 Laboratoire de
|
|
// Recherche et Développement de l'Epita (LRDE).
|
|
// Copyright (C) 2003, 2004, 2006 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 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 <iostream>
|
|
#include <fstream>
|
|
#include <sstream>
|
|
#include <cassert>
|
|
#include <cstdlib>
|
|
#include <cstring>
|
|
#include <spot/tl/parse.hh>
|
|
#include <spot/tl/unabbrev.hh>
|
|
#include <spot/tl/nenoform.hh>
|
|
#include <spot/tl/simplify.hh>
|
|
#include <spot/tl/print.hh>
|
|
|
|
static void
|
|
syntax(char* prog)
|
|
{
|
|
std::cerr << prog << " [-E] file" << std::endl;
|
|
exit(2);
|
|
}
|
|
|
|
int
|
|
main(int argc, char** argv)
|
|
{
|
|
bool check_first = true;
|
|
|
|
if (argc > 1 && !strcmp(argv[1], "-E"))
|
|
{
|
|
check_first = false;
|
|
argv[1] = argv[0];
|
|
++argv;
|
|
--argc;
|
|
}
|
|
if (argc != 2)
|
|
syntax(argv[0]);
|
|
std::ifstream input(argv[1]);
|
|
if (!input)
|
|
{
|
|
std::cerr << "failed to open " << argv[1] << '\n';
|
|
return 2;
|
|
}
|
|
|
|
std::string s;
|
|
unsigned line = 0;
|
|
while (std::getline(input, s))
|
|
{
|
|
++line;
|
|
std::cerr << line << ": " << s << '\n';
|
|
if (s[0] == '#') // Skip comments
|
|
continue;
|
|
std::vector<std::string> formulas;
|
|
{
|
|
std::istringstream ss(s);
|
|
std::string form;
|
|
while (std::getline(ss, form, ','))
|
|
{
|
|
std::string tmp;
|
|
while (form.size() > 0 && form.back() == '\\'
|
|
&& std::getline(ss, tmp, ','))
|
|
{
|
|
form.back() = ',';
|
|
form += tmp;
|
|
}
|
|
formulas.push_back(form);
|
|
}
|
|
}
|
|
|
|
unsigned size = formulas.size();
|
|
if (size == 0) // Skip empty lines
|
|
continue;
|
|
|
|
if (size == 1)
|
|
{
|
|
std::cerr << "Not enough formulas on line " << line << '\n';
|
|
return 2;
|
|
}
|
|
|
|
auto pf2 = spot::parse_infix_psl(formulas[size - 1]);
|
|
|
|
if (pf2.format_errors(std::cerr))
|
|
return 2;
|
|
auto f2 = pf2.f;
|
|
|
|
for (unsigned n = 0; n < size - 1; ++n)
|
|
{
|
|
|
|
auto pf1 = spot::parse_infix_psl(formulas[n]);
|
|
|
|
if (check_first && pf1.format_errors(std::cerr))
|
|
return 2;
|
|
auto f1 = pf1.f;
|
|
|
|
int exit_code = 0;
|
|
|
|
{
|
|
#if defined UNABBREV || defined NENOFORM
|
|
spot::formula tmp;
|
|
#endif
|
|
#ifdef UNABBREV
|
|
tmp = f1;
|
|
f1 = spot::unabbreviate(f1, UNABBREV);
|
|
f1.dump(std::cout) << std::endl;
|
|
#endif
|
|
#ifdef NENOFORM
|
|
tmp = f1;
|
|
f1 = spot::negative_normal_form(f1);
|
|
f1.dump(std::cout) << std::endl;
|
|
#endif
|
|
#ifdef REDUC
|
|
spot::tl_simplifier_options opt(true, true, true,
|
|
false, false);
|
|
# ifdef EVENT_UNIV
|
|
opt.favor_event_univ = true;
|
|
# endif
|
|
spot::tl_simplifier simp(opt);
|
|
{
|
|
spot::formula tmp;
|
|
tmp = f1;
|
|
f1 = simp.simplify(f1);
|
|
|
|
if (!simp.are_equivalent(f1, tmp))
|
|
{
|
|
std::cerr
|
|
<< "Source and simplified formulae are not equivalent!\n";
|
|
spot::print_psl(std::cerr << "Simplified: ", f1) << '\n';
|
|
exit_code = 1;
|
|
}
|
|
}
|
|
f1.dump(std::cout) << std::endl;
|
|
#endif
|
|
#ifdef REDUC_TAU
|
|
spot::tl_simplifier_options opt(false, false, false,
|
|
true, false);
|
|
spot::tl_simplifier simp(opt);
|
|
{
|
|
spot::formula tmp;
|
|
tmp = f1;
|
|
f1 = simp.simplify(f1);
|
|
|
|
if (!simp.are_equivalent(f1, tmp))
|
|
{
|
|
std::cerr
|
|
<< "Source and simplified formulae are not equivalent!\n";
|
|
spot::print_psl(std::cerr << "Simplified: ", f1) << '\n';
|
|
exit_code = 1;
|
|
}
|
|
}
|
|
f1.dump(std::cout) << std::endl;
|
|
#endif
|
|
#ifdef REDUC_TAUSTR
|
|
spot::tl_simplifier_options opt(false, false, false,
|
|
true, true);
|
|
spot::tl_simplifier simp(opt);
|
|
{
|
|
spot::formula tmp;
|
|
tmp = f1;
|
|
f1 = simp.simplify(f1);
|
|
|
|
if (!simp.are_equivalent(f1, tmp))
|
|
{
|
|
std::cerr
|
|
<< "Source and simplified formulae are not equivalent!\n";
|
|
spot::print_psl(std::cerr << "Simplified: ", f1) << '\n';
|
|
exit_code = 1;
|
|
}
|
|
}
|
|
f1.dump(std::cout) << std::endl;
|
|
#endif
|
|
|
|
exit_code |= f1 != f2;
|
|
|
|
#if (!defined(REDUC) && !defined(REDUC_TAU) && !defined(REDUC_TAUSTR))
|
|
spot::tl_simplifier simp;
|
|
#endif
|
|
|
|
if (!simp.are_equivalent(f1, f2))
|
|
{
|
|
#if (!defined(REDUC) && !defined(REDUC_TAU) && !defined(REDUC_TAUSTR))
|
|
std::cerr
|
|
<< "Source and destination formulae are not equivalent!\n";
|
|
#else
|
|
std::cerr
|
|
<< "Simpl. and destination formulae are not equivalent!\n";
|
|
#endif
|
|
exit_code = 1;
|
|
}
|
|
|
|
#if NEGATE
|
|
exit_code ^= 1;
|
|
#endif
|
|
if (exit_code)
|
|
return exit_code;
|
|
}
|
|
}
|
|
}
|
|
|
|
assert(spot::fnode::instances_check());
|
|
return 0;
|
|
}
|