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

* src/ltlvisit/tostring.cc

Browse source 
(to_string_visitor::visit(const atomic_prop*)): Quote propositions
that start with F, G, or X.
* src/ltltest/tostring.test: Test quoted propositions.
* src/tgbaalgos/save.cc (save_bfs::process_state): Escape " and +	characters in formulae.
* src/tgbatest/readsave.test: Test for this.
This commit is contained in:
Alexandre Duret-Lutz 2004-01-06 15:45:00 +00:00
parent a7ab42e422
commit 8008deeddd
5 changed files with 43 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,5 +1,13 @@
2004-01-06 Alexandre Duret-Lutz <adl@src.lip6.fr> 2004-01-06 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/ltlvisit/tostring.cc
(to_string_visitor::visit(const atomic_prop*)): Quote propositions
that start with F, G, or X.
* src/ltltest/tostring.test: Test quoted propositions.
* src/tgbaalgos/save.cc (save_bfs::process_state): Escape " and \
characters in formulae.
* src/tgbatest/readsave.test: Test for this.
* src/tgbaalgos/reachiter.hh: Typos in comments. * src/tgbaalgos/reachiter.hh: Typos in comments.
* iface/gspn/eesrg.cc (tgba_gspn_eesrg::all_acceptance_conditions, * iface/gspn/eesrg.cc (tgba_gspn_eesrg::all_acceptance_conditions,

5
src/ltltest/tostring.test
View file

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# Copyright (C) 2003 Laboratoire d'Informatique de Paris 6 (LIP6), # Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
# département Systèmes Répartis Coopératifs (SRC), Université Pierre # département Systèmes Répartis Coopératifs (SRC), Université Pierre
# et Marie Curie. # et Marie Curie.
# #
@ -25,7 +25,7 @@
. ./defs || exit 1 . ./defs || exit 1
set -e set -e
run 0 ./tostring 'a' run 0 ./tostring 'a'
run 0 ./tostring '1' run 0 ./tostring '1'
@ -42,3 +42,4 @@ run 0 ./tostring 'b & a & a & (c | e |(f U g)| e | c) & b'
run 0 ./tostring 'a <=> b' run 0 ./tostring 'a <=> b'
run 0 ./tostring 'a & b & (c |(f U g)| e)' run 0 ./tostring 'a & b & (c |(f U g)| e)'
run 0 ./tostring 'b & a & a & (c | e |(g U g)| e | c) & b' run 0 ./tostring 'b & a & a & (c | e |(g U g)| e | c) & b'
run 0 ./tostring 'F"F1"&G"G"&X"X"'

12
src/ltlvisit/tostring.cc
View file

@ -1,4 +1,4 @@
// Copyright (C) 2003 Laboratoire d'Informatique de Paris 6 (LIP6), // Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre // département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie. // et Marie Curie.
// //
@ -47,7 +47,15 @@ namespace spot
void void
visit(const atomic_prop* ap) visit(const atomic_prop* ap)
{ {
os_ << ap->name(); std::string str = ap->name();
if (str[0] == 'F' || str[0] == 'G' || str[0] == 'X' )
{
os_ << '"' << str << '"';
}
else
{
os_ << str;
}
} }
void void

18
src/tgbaalgos/save.cc
View file

@ -78,7 +78,23 @@ namespace spot
state* dest = si->current_state(); state* dest = si->current_state();
os_ << "\"" << cur << "\", \"" os_ << "\"" << cur << "\", \""
<< automata_->format_state(dest) << "\", \""; << automata_->format_state(dest) << "\", \"";
bdd_print_formula(os_, d, si->current_condition()) << "\","; std::string s = bdd_format_formula(d, si->current_condition());
// Escape " and \ characters in s.
for (std::string::const_iterator i = s.begin();
i != s.end(); ++i)
switch (*i)
{
case '\\':
os_ << "\\\\";
break;
case '"':
os_ << "\\\"";
break;
default:
os_ << *i;
break;
}
os_ << "\",";
bdd_print_acc(os_, d, si->current_acceptance_conditions()); bdd_print_acc(os_, d, si->current_acceptance_conditions());
os_ << ";" << std::endl; os_ << ";" << std::endl;
delete dest; delete dest;

10
src/tgbatest/readsave.test
View file

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# Copyright (C) 2003 Laboratoire d'Informatique de Paris 6 (LIP6), # Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
# département Systèmes Répartis Coopératifs (SRC), Université Pierre # département Systèmes Répartis Coopératifs (SRC), Université Pierre
# et Marie Curie. # et Marie Curie.
# #
@ -25,19 +25,19 @@
set -e set -e
cat >input <<EOF cat >input <<\EOF
acc = c d; acc = c d;
s1, "s2", "a&!b", c d; s1, "s2", "a&!b", c d;
"s2", "state 3", "a", c; "s2", "state 3", "\"F\\G\"", c;
"state 3", s1,,; "state 3", s1,,;
EOF EOF
./readsave input > stdout ./readsave input > stdout
cat >expected <<EOF cat >expected <<\EOF
acc = "c" "d"; acc = "c" "d";
"s1", "s2", "(a & !b)", "c" "d"; "s1", "s2", "(a & !b)", "c" "d";
"s2", "state 3", "a", "c"; "s2", "state 3", "\"F\\G\"", "c";
"state 3", "s1", "1",; "state 3", "s1", "1",;
EOF EOF