alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Cosmetics to please sanity checks.

Browse source 
* src/neverparse/public.hh, src/neverparse/parsedecl.hh: Fix
inclusion guards.
* src/tgba/tgbaexplicit.hh, src/tgbatest/emptchk.test,
src/tgbatest/ltl2tgba.cc: Fix trailing whitespaces.
This commit is contained in:
Alexandre Duret-Lutz 2010-11-06 17:56:27 +01:00
parent 87f69eaf18
commit 1e0f99e824
6 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ChangeLog
View file

@ -1,3 +1,12 @@
2010-11-06 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Cosmetics to please sanity checks.
* src/neverparse/public.hh, src/neverparse/parsedecl.hh: Fix
inclusion guards.
* src/tgba/tgbaexplicit.hh, src/tgbatest/emptchk.test,
src/tgbatest/ltl2tgba.cc: Fix trailing whitespaces.
2010-11-06 Alexandre Duret-Lutz <adl@lrde.epita.fr> 2010-11-06 Alexandre Duret-Lutz <adl@lrde.epita.fr>
* src/tgbatest/ltl2tgba.cc: Clock the time spent reading -P file. * src/tgbatest/ltl2tgba.cc: Clock the time spent reading -P file.
@ -29,14 +38,14 @@
single instruction for a state. single instruction for a state.
* src/neverparse/neverclaimscan.ll: Recognize "false" specifically, * src/neverparse/neverclaimscan.ll: Recognize "false" specifically,
and remove the ";" hack. and remove the ";" hack.
* src/tgba/tgbaexplicit.cc * src/tgba/tgbaexplicit.cc
(tgba_explicit_string::~tgba_explicit_string): Adjust not to (tgba_explicit_string::~tgba_explicit_string): Adjust not to
destroy a state twice. destroy a state twice.
* src/tgba/tgbaexplicit.hh * src/tgba/tgbaexplicit.hh
(tgba_explicit_string::add_state_alias): New function. (tgba_explicit_string::add_state_alias): New function.
* src/tgbatest/defs.in (SPIN, LTL2BA): New variables. * src/tgbatest/defs.in (SPIN, LTL2BA): New variables.
* src/tgbatest/neverclaimread.test: Check error messages for * src/tgbatest/neverclaimread.test: Check error messages for
syntax errors in guards. Make sure we can read the output syntax errors in guards. Make sure we can read the output
of `spin -f' and `ltl2ba -f' on a few test formulae. of `spin -f' and `ltl2ba -f' on a few test formulae.
2010-11-06 Alexandre Duret-Lutz <adl@lrde.epita.fr> 2010-11-06 Alexandre Duret-Lutz <adl@lrde.epita.fr>
@ -49,9 +58,9 @@
removed by previous patch. removed by previous patch.
* README: Adjust, and keep the file's width under 80 columns. * README: Adjust, and keep the file's width under 80 columns.
* configure.ac: Adjust. * configure.ac: Adjust.
* src/neverparse/Makefile.am, src/neverparse/fmterror.cc, * src/neverparse/Makefile.am, src/neverparse/fmterror.cc,
src/neverparse/neverclaimparse.yy, src/neverparse/neverclaimparse.yy,
src/neverparse/neverclaimscan.ll, src/neverparse/public.hh: src/neverparse/neverclaimscan.ll, src/neverparse/public.hh:
Fix copyright. Fix copyright.
* src/tgbatest/Makefile.am (check_PROGRAMS): Remove neverclaimread. * src/tgbatest/Makefile.am (check_PROGRAMS): Remove neverclaimread.
* src/tgbatest/ltl2tgba.cc: Add option -XN to read a neverclaim. * src/tgbatest/ltl2tgba.cc: Add option -XN to read a neverclaim.

9
src/neverparse/parsedecl.hh
View file

@ -1,6 +1,5 @@
// Copyright (C) 2003, 2005 Laboratoire d'Informatique de Paris 6 (LIP6), // Copyright (C) 2010 Laboratoire de Recherche et Développement de
// département Systèmes Répartis Coopératifs (SRC), Université Pierre // l'EPITA.
// et Marie Curie.
// //
// This file is part of Spot, a model checking library. // This file is part of Spot, a model checking library.
// //
@ -19,8 +18,8 @@
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA. // 02111-1307, USA.
#ifndef SPOT_NEVERCLAIMPARSE_PARSEDECL_HH #ifndef SPOT_NEVERPARSE_PARSEDECL_HH
# define SPOT_NEVERCLAIMPARSE_PARSEDECL_HH # define SPOT_NEVERPARSE_PARSEDECL_HH
#include <string> #include <string>
#include "neverclaimparse.hh" #include "neverclaimparse.hh"

4
src/neverparse/public.hh
View file

@ -18,8 +18,8 @@
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA. // 02111-1307, USA.
#ifndef SPOT_NEVERCLAIMPARSE_PUBLIC_HH #ifndef SPOT_NEVERPARSE_PUBLIC_HH
# define SPOT_NEVERCLAIMPARSE_PUBLIC_HH # define SPOT_NEVERPARSE_PUBLIC_HH
# include "tgba/tgbaexplicit.hh" # include "tgba/tgbaexplicit.hh"
// Unfortunately Bison 2.3 uses the same guards in all parsers :( // Unfortunately Bison 2.3 uses the same guards in all parsers :(

4
src/tgba/tgbaexplicit.hh
View file

@ -212,7 +212,7 @@ namespace spot
} }
return i->second; return i->second;
} }
state* state*
set_init_state(const label& state) set_init_state(const label& state)
{ {
@ -327,7 +327,7 @@ namespace spot
/// Create an alias for a state. Any reference to \a alias_name /// Create an alias for a state. Any reference to \a alias_name
/// will act as a reference to \a real_name. /// will act as a reference to \a real_name.
virtual virtual
void add_state_alias(const std::string& alias_name, void add_state_alias(const std::string& alias_name,
const std::string& real_name) const std::string& real_name)
{ {
name_state_map_[alias_name] = add_state(real_name); name_state_map_[alias_name] = add_state(real_name);

4
src/tgbatest/emptchk.test
View file

@ -54,9 +54,9 @@ expect_ce()
run 0 ../ltl2tgba -CR -eTau03_opt -f "$1" run 0 ../ltl2tgba -CR -eTau03_opt -f "$1"
run 0 ../ltl2tgba -CR -eGV04 -f "$1" run 0 ../ltl2tgba -CR -eGV04 -f "$1"
# Expect multiple accepting runs # Expect multiple accepting runs
test `../ltl2tgba -CR -e'CVWY90(repeated)' -l "$1" | test `../ltl2tgba -CR -e'CVWY90(repeated)' -l "$1" |
grep Prefix: | wc -l` -ge $2 grep Prefix: | wc -l` -ge $2
test `../ltl2tgba -CR -e'SE05(repeated)' -l "$1" | test `../ltl2tgba -CR -e'SE05(repeated)' -l "$1" |
grep Prefix: | wc -l` -ge $2 grep Prefix: | wc -l` -ge $2
} }

7
src/tgbatest/ltl2tgba.cc
View file

@ -784,15 +784,15 @@ main(int argc, char** argv)
{ {
spot::neverclaim_parse_error_list pel; spot::neverclaim_parse_error_list pel;
tm.start("parsing neverclaim"); tm.start("parsing neverclaim");
to_free = a = e = spot::neverclaim_parse(input, pel, dict, to_free = a = e = spot::neverclaim_parse(input, pel, dict,
env, debug_opt); env, debug_opt);
tm.stop("parsing neverclaim"); tm.stop("parsing neverclaim");
if (spot::format_neverclaim_parse_errors(std::cerr, input, pel)) if (spot::format_neverclaim_parse_errors(std::cerr, input, pel))
{ {
delete to_free; delete to_free;
delete dict; delete dict;
return 2; return 2;
} }
} }
e->merge_transitions(); e->merge_transitions();
} }
@ -1166,7 +1166,6 @@ main(int argc, char** argv)
else else
{ {
spot::print_tgba_run(std::cout, a, run); spot::print_tgba_run(std::cout, a, run);
if (accepting_run_replay if (accepting_run_replay
&& !spot::replay_tgba_run(std::cout, a, run, && !spot::replay_tgba_run(std::cout, a, run,
true)) true))