Start the ELTL translation (LACIM).

Merge all eltlast/ files into formula.hh (except automatop.hh).

src/tgbatest/Makefile.am

@@ -25,7 +25,7 @@ LDADD = ../libspot.la
 
 # These are the most used test programs, and they are also useful
 # to run manually outside the test suite.  Always build them.
-noinst_PROGRAMS = ltl2tgba randtgba
+noinst_PROGRAMS = ltl2tgba randtgba eltl2tgba
 
 check_SCRIPTS = defs
 # Keep this sorted alphabetically.
@@ -46,6 +46,7 @@ check_PROGRAMS = \
 # Keep this sorted alphabetically.
 bddprod_SOURCES  = ltlprod.cc
 bddprod_CXXFLAGS = -DBDD_CONCRETE_PRODUCT
+eltl2tgba_SOURCES = eltl2tgba.cc
 explicit_SOURCES = explicit.cc
 expldot_SOURCES  = powerset.cc
 expldot_CXXFLAGS = -DDOTTY
@@ -85,7 +86,8 @@ TESTS = \
   emptchke.test \
   dfs.test \
   emptchkr.test \
-  spotlbtt.test
+  spotlbtt.test \
+  eltl2tgba.test
 
 EXTRA_DIST = $(TESTS)
 

src/tgbatest/eltl2tgba.cc

@@ -0,0 +1,50 @@
+// Copyright (C) 2008 Laboratoire d'Informatique de Paris 6 (LIP6),
+// département Systèmes Répartis Coopératifs (SRC), Université Pierre
+// et Marie Curie.
+//
+// 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 2 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 Spot; see the file COPYING.  If not, write to the Free
+// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+// 02111-1307, USA.
+
+#include <iostream>
+#include <cassert>
+#include "eltlparse/public.hh"
+#include "tgbaalgos/eltl2tgba_lacim.hh"
+#include "tgbaalgos/dotty.hh"
+
+int
+main(int argc, char** argv)
+{
+  spot::eltl::parse_error_list p;
+  const spot::eltl::formula* f = spot::eltl::parse(
+    argv[1], p, spot::eltl::default_environment::instance(), argc > 2);
+
+  if (spot::eltl::format_parse_errors(std::cerr, p))
+  {
+    if (f != 0)
+      std::cout << f->dump() << std::endl;
+    return 1;
+  }
+
+  assert(f != 0);
+  std::cout << f->dump() << std::endl;
+
+  spot::bdd_dict* dict = new spot::bdd_dict();
+  spot::tgba_bdd_concrete* concrete = spot::eltl_to_tgba_lacim(f, dict);
+
+  spot::dotty_reachable(std::cout, concrete);
+  delete concrete;
+}

src/tgbatest/eltl2tgba.test

@@ -0,0 +1,40 @@
+#!/bin/sh
+
+. ./defs || exit -1
+set -e
+
+check ()
+{
+  run 0 ./eltl2tgba "$1" || exit 1
+}
+
+cat >input <<EOF
+A=(
+  )
+%
+1
+EOF
+
+check input
+exit 0
+
+cat >input1 <<EOF
+X=(
+    0 1 true
+    1 2 \$0
+    accept 2
+  )
+U=(
+    0 0 \$0
+    0 1 \$1
+    accept 1
+  )
+EOF
+
+cat >input <<EOF
+include input1
+%
+X(a)
+EOF
+
+check input