Add a parser for automata in LBTT's format.

* src/tgbaalgos/lbtt.hh, src/tgbaalgos/lbtt.cc (lbtt_parse):
New function.
* src/tgba/tgbaexplicit.hh (get_acceptance_condition): Make it public.
* src/tgbatest/ltl2tgba.cc: Add a -XL option to read LBTT file.
* src/tgbatest/lbttparse.test: New file.
* src/tgbatest/Makefile.am: Add it.

src/tgbatest/Makefile.am

@@ -93,6 +93,7 @@ TESTS = \
   degendet.test \
   degenid.test \
   kv.test \
+  lbttparse.test \
   scc.test \
   sccsimpl.test \
   obligation.test \

src/tgbatest/lbttparse.test

@@ -0,0 +1,41 @@
+#!/bin/sh
+# -*- coding: utf-8 -*-
+# Copyright (C) 2012 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
+
+for f in 'p0 U p1 U p2' 'Gp00 | Gp13 | Gp42' '{(1;1)*}[]->p1'
+do
+  # Make sure Spot can read the LBTT it produces
+  run 0 ../ltl2tgba -t "$f" > out
+  s=`wc -l < out`
+  run 0 ../ltl2tgba -t -XL out > out2
+  s2=`wc -l < out2`
+  test "$s" -eq "$s2"
+
+  # The LBTT output use 2 lines par state, one line per transition,
+  # and one extra line for header.
+  run 0 ../ltl2tgba -ks "$f" > size
+  st=`cat size | sed -n 's/states: //p'`
+  tr=`cat size | sed -n 's/transitions: //p'`
+  l=`expr $st \* 2 + $tr + 1`
+  test "$s" -eq "$l"
+done

src/tgbatest/ltl2tgba.cc

@@ -118,6 +118,8 @@ syntax(char* prog)
 	    << std::endl
 	    << "  -X    do not compute an automaton, read it from a file"
 	    << std::endl
+	    << "  -XL   do not compute an automaton, read it from an"
+	    << " LBTT file" << std::endl
 	    << "  -XN   do not compute an automaton, read it from a"
 	    << " neverclaim file" << std::endl
 	    << "  -Pfile  multiply the formula automaton with the TGBA read"
@@ -334,6 +336,7 @@ main(int argc, char** argv)
   bool accepting_run_replay = false;
   bool from_file = false;
   bool read_neverclaim = false;
+  bool read_lbtt = false;
   bool scc_filter = false;
   bool simpltl = false;
   spot::ltl::ltl_simplifier_options redopt(false, false, false, false,
@@ -782,6 +785,11 @@ main(int argc, char** argv)
 	  from_file = true;
 	  read_neverclaim = true;
 	}
+      else if (!strcmp(argv[formula_index], "-XL"))
+	{
+	  from_file = true;
+	  read_lbtt = true;
+	}
       else if (!strcmp(argv[formula_index], "-y"))
 	{
 	  translation = TransFM;
@@ -887,8 +895,8 @@ main(int argc, char** argv)
 
       if (from_file)
 	{
-	  spot::tgba_explicit_string* e;
-	  if (!read_neverclaim)
+	  spot::tgba_explicit_string* e = 0;
+	  if (!read_neverclaim && !read_lbtt)
 	    {
 	      spot::tgba_parse_error_list pel;
 	      tm.start("parsing automaton");
@@ -902,7 +910,7 @@ main(int argc, char** argv)
 		  return 2;
 		}
 	    }
-	  else
+	  else if (read_neverclaim)
 	    {
 	      spot::neverclaim_parse_error_list pel;
 	      tm.start("parsing neverclaim");
@@ -917,7 +925,30 @@ main(int argc, char** argv)
 		}
 	      assume_sba = true;
 	    }
-	  e->merge_transitions();
+	  else
+	    {
+	      std::string error;
+	      std::fstream f(input.c_str());
+	      if (!f)
+		{
+		  std::cerr << "cannot open " << input << std::endl;
+		  delete dict;
+		  return 2;
+		}
+	      tm.start("parsing lbtt");
+	      to_free = a =
+		const_cast<spot::tgba*>(spot::lbtt_parse(f, error, dict,
+							 env, env));
+	      tm.stop("parsing lbtt");
+	      if (!to_free)
+		{
+		  std::cerr << error << std::endl;
+		  delete dict;
+		  return 2;
+		}
+	    }
+	  if (e)
+	    e->merge_transitions();
 	}
       else
 	{