Merge branch 'master' into next

Conflicts:
	src/ltlvisit/simplify.cc
	src/tgbatest/Makefile.am

src/tgbatest/Makefile.am

@@ -99,6 +99,7 @@ TESTS = \
   ltl2neverclaim.test \
   ltl2neverclaim-lbtt.test \
   ltl2ta.test \
+  ltl2ta2.test \
   ltlprod.test \
   bddprod.test \
   explprod.test \
@@ -110,6 +111,7 @@ TESTS = \
   dupexp.test \
   degendet.test \
   degenid.test \
+  degenlskip.test \
   kv.test \
   lbttparse.test \
   scc.test \

src/tgbatest/degenlskip.test

@@ -0,0 +1,70 @@
+#!/bin/sh
+# -*- coding: utf-8 -*-
+# Copyright (C) 2013, 2014 Laboratoire de Recherche et Développement
+# de l'Epita (LRDE).
+#
+# 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/>.
+
+. ./defs
+
+set -e
+
+# Make sure degen-skip=0 and degen-skip=1 produce the expected
+# automata for 'GFa & GFb'
+
+../../bin/ltl2tgba -B 'GFa & GFb' > out1
+../../bin/ltl2tgba -B -x degen-lskip=1 'GFa & GFb' > out2
+../../bin/ltl2tgba -B -x degen-lskip=0 'GFa & GFb' > out3
+
+diff out1 out2
+cmp out2 out3 && exit 1
+
+cat <<EOF >expected2
+digraph G {
+  0 [label="", style=invis, height=0]
+  0 -> 1
+  1 [label="0", peripheries=2]
+  1 -> 1 [label="a & b\n{Acc[1]}"]
+  1 -> 2 [label="!a & b\n{Acc[1]}"]
+  1 -> 3 [label="!b\n{Acc[1]}"]
+  2 [label="1"]
+  2 -> 1 [label="a\n"]
+  2 -> 2 [label="!a\n"]
+  3 [label="2"]
+  3 -> 1 [label="a & b\n"]
+  3 -> 2 [label="!a & b\n"]
+  3 -> 3 [label="!b\n"]
+}
+EOF
+
+
+cat <<EOF >expected3
+digraph G {
+  0 [label="", style=invis, height=0]
+  0 -> 1
+  1 [label="0", peripheries=2]
+  1 -> 2 [label="1\n{Acc[1]}"]
+  2 [label="1"]
+  2 -> 3 [label="b\n"]
+  2 -> 2 [label="!b\n"]
+  3 [label="2"]
+  3 -> 1 [label="a\n"]
+  3 -> 3 [label="!a\n"]
+}
+EOF
+
+diff out2 expected2
+diff out3 expected3

src/tgbatest/ltl2ta2.test

@@ -0,0 +1,27 @@
+#!/bin/sh
+# Copyright (C) 2014 Laboratoire de Recherche et Développement de
+# l'Epita (LRDE).
+#
+# 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/>.
+
+
+. ./defs
+
+set -e
+
+# This used to trigger an assert because of BA simulation not
+# returning an instance of spot::sba.
+run 0 ../../bin/ltl2tgta --ta 'G(F(a U b) U (c M d))'

src/tgbatest/ltlcross2.test

@@ -38,6 +38,7 @@ ltl2tgba=../../bin/ltl2tgba
 "$ltl2tgba --lbtt -x comp-susp,!skel-wdba --lbtt --small %f >%T" \
 "$ltl2tgba --lbtt -x comp-susp,early-susp --lbtt --small %f >%T" \
 "$ltl2tgba --lbtt -x comp-susp,!skel-wdba,!skel-simul --lbtt --small %f >%T" \
+"$ltl2tgba --lbtt --ba -x degen-skip=0 --lbtt %f >%T" \
 "$ltl2tgba --lbtt --ba --high %f > %T" \
 "$ltl2tgba --lbtt -BDC %f > %T" \
 "$ltl2tgba --lbtt -BC %f > %T" \