never: use state-names as comments

* src/tgbaalgos/neverclaim.cc: Here.
* src/hoaparse/hoaparse.yy: Use set_acceptance_conditions() to set
the number of acceptance sets.  Otherwise, the single_acc_set property
is not set.
* src/tgbaalgos/postproc.cc: When expecting a BA or a monitor, do not do
anything if the input is already a BA or a monitor.
* src/tgbatest/hoaparse.test: Add a test case.
* src/tgbatest/readsave.test: Adjust.
This commit is contained in:
Alexandre Duret-Lutz 2015-01-25 13:02:28 +01:00
parent c44b158716
commit e5294aac21
5 changed files with 55 additions and 17 deletions

View file

@ -1283,3 +1283,34 @@ State: 2 "G((F(a) && F((b) && (c))) && F((d) || (e)))"
[0&1&2&3 | 0&1&2&4] 2 {0 1 2}
--END--
EOF
# name states can be output as comments in never claim
cat >input <<EOF
HOA: v1
name: "a U b"
States: 2
Start: 1
AP: 2 "a" "b"
acc-name: Buchi
Acceptance: 1 Inf(0)
properties: trans-labels explicit-labels state-acc deterministic
--BODY--
State: 0 "s0" {0}
[t] 0
State: 1 "s1"
[1] 0
[0&!1] 1
--END--
EOF
expectok input --spin=c <<EOF
never { /* a U b */
T0_init: /* s1 */
if
:: ((b)) -> goto accept_all
:: ((a) && (!(b))) -> goto T0_init
fi;
accept_all: /* s0 */
skip
}
EOF

View file

@ -315,18 +315,18 @@ digraph G {
I -> 3
subgraph cluster_0 {
label=""
1 [label="s1"]
1 [label="s1", peripheries=2]
}
subgraph cluster_1 {
label=""
0 [label="s0"]
0 [label="s0", peripheries=2]
}
subgraph cluster_2 {
label=""
3 [label="s3"]
}
0 -> 0 [label="b\n{0}"]
1 -> 1 [label="a\n{0}"]
0 -> 0 [label="b"]
1 -> 1 [label="a"]
2 [label="s2"]
2 -> 0 [label="b"]
3 -> 1 [label="a"]