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

dotty: fix combination of 's' with 'n'

Browse source 
* src/tgbaalgos/dotty.cc: Add empty label to each cluster
if both 's' and 'n' are used.
* src/tgbatest/neverclaimread.test: Test it.
This commit is contained in:
Alexandre Duret-Lutz 2015-01-04 16:04:07 +01:00
parent a5d52633bd
commit 403179087e
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/tgbaalgos/dotty.cc
View file

@ -143,6 +143,10 @@ namespace spot
for (unsigned i = 0; i < sccs; ++i) for (unsigned i = 0; i < sccs; ++i)
{ {
os_ << " subgraph cluster_" << i << " {\n"; os_ << " subgraph cluster_" << i << " {\n";
if (opt_name_)
// Reset the label, otherwise the graph label would
// be inherited by the cluster.
os_ << " label=\"\"\n";
for (auto s: si->states_of(i)) for (auto s: si->states_of(i))
process_state(s); process_state(s);
os_ << " }\n"; os_ << " }\n";

6
src/tgbatest/neverclaimread.test
View file

@ -322,17 +322,21 @@ accept_all:
skip skip
} }
EOF EOF
../../bin/autfilt --dot=sc <input >stdout 2>stderr && exit 1 ../../bin/autfilt --name=%F --dot=nsc <input >stdout 2>stderr && exit 1
cat >expected <<EOF cat >expected <<EOF
digraph G { digraph G {
rankdir=LR rankdir=LR
label="-"
labelloc="t"
node [shape="circle"] node [shape="circle"]
I [label="", style=invis, width=0] I [label="", style=invis, width=0]
I -> 0 I -> 0
subgraph cluster_0 { subgraph cluster_0 {
label=""
1 [label="1", peripheries=2] 1 [label="1", peripheries=2]
} }
subgraph cluster_1 { subgraph cluster_1 {
label=""
0 [label="0"] 0 [label="0"]
} }
0 -> 1 [label="b"] 0 -> 1 [label="b"]