22f442f758
This gets the interface of all the functions parsing formula in line with the interface of the automaton parser: both return a "parsed_*" object (parsed_formula or parsed_automaton) that contains the said object and its list of errors. Doing so avoid having to declare the parse_error_list in advance. * spot/tl/parse.hh, spot/parsetl/parsetl.yy: Do the change. * spot/parsetl/fmterror.cc: Adjust the error printer. * NEWS: Document it. * bin/common_finput.cc, bin/common_finput.hh, bin/ltlcross.cc, bin/ltldo.cc, bin/ltlfilt.cc, doc/org/tut01.org, doc/org/tut02.org, doc/org/tut10.org, doc/org/tut20.org, python/ajax/spotcgi.in, python/spot/impl.i, spot/parseaut/parseaut.yy, tests/core/checkpsl.cc, tests/core/checkta.cc, tests/core/consterm.cc, tests/core/emptchk.cc, tests/core/equalsf.cc, tests/core/ikwiad.cc, tests/core/kind.cc, tests/core/length.cc, tests/core/ltlprod.cc, tests/core/ltlrel.cc, tests/core/randtgba.cc, tests/core/readltl.cc, tests/core/reduc.cc, tests/core/safra.cc, tests/core/syntimpl.cc, tests/core/tostring.cc, tests/ltsmin/modelcheck.cc, tests/python/alarm.py, tests/python/interdep.py, tests/python/ltl2tgba.py, tests/python/ltlparse.py: Adjust all uses.
105 lines
2.6 KiB
C++
105 lines
2.6 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2008, 2009, 2010, 2011, 2012, 2014, 2015, 2016
|
|
// 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 <spot/tl/parse.hh>
|
|
#include <spot/tl/print.hh>
|
|
#include <spot/tl/simplify.hh>
|
|
#include <spot/tl/nenoform.hh>
|
|
|
|
static 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;
|
|
|
|
{
|
|
auto ftmp1 = spot::parse_infix_psl(argv[2]);
|
|
|
|
if (ftmp1.format_errors(std::cerr))
|
|
return 2;
|
|
|
|
auto ftmp2 = spot::parse_infix_psl(argv[3]);
|
|
|
|
if (ftmp2.format_errors(std::cerr))
|
|
return 2;
|
|
|
|
spot::formula f1 = spot::negative_normal_form(ftmp1.f);
|
|
spot::formula f2 = spot::negative_normal_form(ftmp2.f);
|
|
|
|
std::string f1s = spot::str_psl(f1);
|
|
std::string f2s = spot::str_psl(f2);
|
|
|
|
spot::tl_simplifier* c = new spot::tl_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::fnode::instances_check());
|
|
return exit_return;
|
|
}
|