6ded5e75c4
The ltl prefix does not make a lot of sens anymore (since we support psl as well). ltlast/ and ltlenv/ were almost empty. And ltlvisit/ did not contain any visitor anymore. * src/ltlvisit/, src/ltlast/, src/ltlenv/: Merge into... * src/tl/: ...this. * NEWS: Mention the change. * README, bench/stutter/stutter_invariance_formulas.cc, bench/stutter/stutter_invariance_randomgraph.cc, configure.ac, doc/org/tut01.org, doc/org/tut02.org, doc/org/tut10.org, doc/tl/tl.tex, iface/ltsmin/ltsmin.hh, iface/ltsmin/modelcheck.cc, src/Makefile.am, src/bin/autfilt.cc, src/bin/common_output.cc, src/bin/common_output.hh, src/bin/common_r.hh, src/bin/common_trans.cc, src/bin/genltl.cc, src/bin/ltl2tgba.cc, src/bin/ltl2tgta.cc, src/bin/ltlcross.cc, src/bin/ltldo.cc, src/bin/ltlfilt.cc, src/bin/ltlgrind.cc, src/bin/randltl.cc, src/kripke/kripkeexplicit.hh, src/kripkeparse/public.hh, src/parseaut/public.hh, src/priv/accmap.hh, src/ta/taexplicit.hh, src/ta/tgtaexplicit.hh, src/tests/equalsf.cc, src/tests/ikwiad.cc, src/tests/length.cc, src/tests/ltlrel.cc, src/tests/randtgba.cc, src/tests/readltl.cc, src/tests/reduc.cc, src/tests/syntimpl.cc, src/tests/taatgba.cc, src/tests/tostring.cc, src/tests/twagraph.cc, src/twa/acc.hh, src/twa/bdddict.cc, src/twa/bdddict.hh, src/twa/bddprint.cc, src/twa/taatgba.cc, src/twa/taatgba.hh, src/twa/twa.hh, src/twa/twagraph.cc, src/twa/twagraph.hh, src/twa/twasafracomplement.cc, src/twaalgos/compsusp.cc, src/twaalgos/compsusp.hh, src/twaalgos/dtgbasat.cc, src/twaalgos/hoa.cc, src/twaalgos/isweakscc.cc, src/twaalgos/lbtt.cc, src/twaalgos/ltl2taa.cc, src/twaalgos/ltl2taa.hh, src/twaalgos/ltl2tgba_fm.cc, src/twaalgos/ltl2tgba_fm.hh, src/twaalgos/minimize.hh, src/twaalgos/neverclaim.cc, src/twaalgos/randomgraph.hh, src/twaalgos/relabel.hh, src/twaalgos/remprop.hh, src/twaalgos/stats.cc, src/twaalgos/stutter.cc, src/twaalgos/translate.hh, wrap/python/spot_impl.i, src/ltlparse/ltlparse.yy, src/ltlparse/public.hh: Adjust.
107 lines
2.8 KiB
C++
107 lines
2.8 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014, 2015 Laboratoire de
|
|
// Recherche et Développement de l'Epita (LRDE).
|
|
// Copyright (C) 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 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 <iostream>
|
|
#include <cassert>
|
|
#include <cstdlib>
|
|
#include "ltlparse/public.hh"
|
|
#include "tl/print.hh"
|
|
#include "tl/simplify.hh"
|
|
#include "tl/nenoform.hh"
|
|
|
|
void
|
|
syntax(char* prog)
|
|
{
|
|
std::cerr << prog << " formula1 formula2?" << std::endl;
|
|
exit(2);
|
|
}
|
|
|
|
int
|
|
main(int argc, char** argv)
|
|
{
|
|
if (argc < 4)
|
|
syntax(argv[0]);
|
|
|
|
int opt = atoi(argv[1]);
|
|
int exit_return = 0;
|
|
|
|
{
|
|
spot::ltl::parse_error_list p1;
|
|
auto ftmp1 = spot::ltl::parse_infix_psl(argv[2], p1);
|
|
|
|
if (spot::ltl::format_parse_errors(std::cerr, argv[2], p1))
|
|
return 2;
|
|
|
|
spot::ltl::parse_error_list p2;
|
|
auto ftmp2 = spot::ltl::parse_infix_psl(argv[3], p2);
|
|
|
|
if (spot::ltl::format_parse_errors(std::cerr, argv[3], p2))
|
|
return 2;
|
|
|
|
spot::ltl::formula f1 = spot::ltl::negative_normal_form(ftmp1);
|
|
spot::ltl::formula f2 = spot::ltl::negative_normal_form(ftmp2);
|
|
|
|
std::string f1s = spot::ltl::str_psl(f1);
|
|
std::string f2s = spot::ltl::str_psl(f2);
|
|
|
|
spot::ltl::ltl_simplifier* c = new spot::ltl::ltl_simplifier;
|
|
|
|
switch (opt)
|
|
{
|
|
case 0:
|
|
std::cout << "Test f1 < f2" << std::endl;
|
|
if (c->syntactic_implication(f1, f2))
|
|
{
|
|
std::cout << f1s << " < " << f2s << '\n';
|
|
exit_return = 1;
|
|
}
|
|
break;
|
|
|
|
case 1:
|
|
std::cout << "Test !f1 < f2" << std::endl;
|
|
if (c->syntactic_implication_neg(f1, f2, false))
|
|
{
|
|
std::cout << "!(" << f1s << ") < " << f2s << '\n';
|
|
exit_return = 1;
|
|
}
|
|
break;
|
|
|
|
case 2:
|
|
std::cout << "Test f1 < !f2" << std::endl;
|
|
if (c->syntactic_implication_neg(f1, f2, true))
|
|
{
|
|
std::cout << f1s << " < !(" << f2s << ")\n";
|
|
exit_return = 1;
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
|
|
f1.dump(std::cout) << '\n';
|
|
f2.dump(std::cout) << '\n';
|
|
|
|
delete c;
|
|
}
|
|
assert(spot::ltl::fnode::instances_check());
|
|
return exit_return;
|
|
}
|