Make sure we can multiply two tgba_explicit.

* tgba/state.hh (state::translate, state::clone, state::as_bdd):
New virtual methods.
* tgba/stataebdd.cc (state::translate, state::clone): New methods.
* tgba/stataebdd.hh (state::translate, state::clone): New methods.
* tgba/tgbabddprod.cc (state_bdd_product::clone,
tgba_bdd_product_succ_iterator::~tgba_bdd_product_succ_iterator):
New methods.
(tgba_bdd_product_succ_iterator::first): Reset right_
if any of left_ or right_ is already done (i.e., is empty).
(tgba_bdd_product_succ_iterator::done): Return true
if right_ is NULL.
(tgba_bdd_product_succ_iterator::current_state,
tgba_bdd_product::get_init_state): Work	directory with `state's.
* tgba/tgbabddprod.hh (state_bdd_product::clone,
tgba_bdd_product_succ_iterator::~tgba_bdd_product_succ_iterator):
New methods.
* tgba/tgbabddtranslateproxy.cc
(tgba_bdd_translate_proxy_succ_iterator::
tgba_bdd_translate_proxy_succ_iterator): Work on any kind of iteraator.
(tgba_bdd_translate_proxy_succ_iterator::
~tgba_bdd_translate_proxy_succ_iterator): New method.
(tgba_bdd_translate_proxy_succ_iterator::current_state,
tgba_bdd_translate_proxy::get_init_state,
tgba_bdd_translate_proxy::succ_iter): Work on `state's and
`tgba_succ_iterator's directlry.
(tgba_bdd_translate_proxy::format_state): Delegate formating
to the proxied automata.
* tgba/tgbaexplicit.cc (state_explicit::clone): New method.
* src/tgba/tgbaexplicit.cc (tgba_explicit::get_condition,
tgba_explicit::get_promise): Call ltl::destroy on existing formulae.
* tgbatest/Makefile.am (check_PROGRAMS): Add explprod.
(explprod_SOURCES): New variable.
(TESTS): Add explprod.test.
(CLEANFILES): Add input1 and input2.

src/tgbatest/Makefile.am

@@ -9,11 +9,13 @@ check_PROGRAMS = \
   tgbaread \
   ltl2tgba \
   ltlprod \
-  bddprod
+  bddprod \
+  explprod
 
 bddprod_SOURCES = ltlprod.cc
 bddprod_CXXFLAGS = -DBDD_CONCRETE_PRODUCT
 explicit_SOURCES = explicit.cc
+explprod_SOURCES = explprod.cc
 ltl2tgba_SOURCES = ltl2tgba.cc
 ltlprod_SOURCES = ltlprod.cc
 readsave_SOURCES = readsave.cc
@@ -25,8 +27,9 @@ TESTS = \
   readsave.test \
   ltl2tgba.test \
   ltlprod.test \
-  bddprod.test
+  bddprod.test \
+  explprod.test
 
 EXTRA_DIST = $(TESTS)
 
-CLEANFILES = input stdout expected
+CLEANFILES = input input1 input2 stdout expected

src/tgbatest/explicit.cc

@@ -6,10 +6,10 @@
 int
 main()
 {
-  spot::ltl::default_environment& e = 
+  spot::ltl::default_environment& e =
     spot::ltl::default_environment::instance();
   spot::tgba_explicit a;
-  
+
   typedef spot::tgba_explicit::transition trans;
 
   trans* t1 = a.create_transition("state 0", "state 1");

src/tgbatest/explprod.cc

@@ -0,0 +1,48 @@
+#include <iostream>
+#include <cassert>
+#include "tgba/ltl2tgba.hh"
+#include "tgba/tgbaexplicit.hh"
+#include "tgba/tgbabddprod.hh"
+#include "tgbaparse/public.hh"
+#include "tgbaalgos/save.hh"
+#include "ltlast/allnodes.hh"
+
+void
+syntax(char* prog)
+{
+  std::cerr << prog << " file1 file2" << std::endl;
+  exit(2);
+}
+
+int
+main(int argc, char** argv)
+{
+  int exit_code = 0;
+
+  if (argc != 3)
+    syntax(argv[0]);
+
+  spot::ltl::environment& env(spot::ltl::default_environment::instance());
+  spot::tgba_parse_error_list pel1;
+  spot::tgba_explicit* a1 = spot::tgba_parse(argv[1], pel1, env);
+  if (spot::format_tgba_parse_errors(std::cerr, pel1))
+    return 2;
+  spot::tgba_parse_error_list pel2;
+  spot::tgba_explicit* a2 = spot::tgba_parse(argv[2], pel2, env);
+  if (spot::format_tgba_parse_errors(std::cerr, pel1))
+    return 2;
+  
+  {
+    spot::tgba_bdd_product p(*a1, *a2);
+    spot::tgba_save_reachable(std::cout, p);
+  }
+
+  assert(spot::ltl::unop::instance_count() == 0);
+  assert(spot::ltl::binop::instance_count() == 0);
+  assert(spot::ltl::multop::instance_count() == 0);
+  assert(spot::ltl::atomic_prop::instance_count() != 0);
+  delete a1;
+  delete a2;
+  assert(spot::ltl::atomic_prop::instance_count() == 0);
+  return exit_code;
+}

src/tgbatest/explprod.test

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+. ./defs
+
+set -e
+
+cat >input1 <<EOF
+s1, s3, a,;
+s1, s2, b, p1;
+s2, s1, !a,;
+s2, s3, c,;
+EOF
+
+cat >input2 <<EOF
+s1, s2, b, p2;
+s2, s1, a, p3;
+EOF
+
+cat >expected <<EOF
+"s1 * s1", "s3 * s2", a b, p2;
+"s1 * s1", "s2 * s2", b, p2 p1;
+"s2 * s2", "s3 * s1", c a, p3;
+EOF
+
+./explprod input1 input2 > stdout
+
+cat stdout
+diff stdout expected
+rm input1 input2 stdout expected

src/tgbatest/readsave.cc

@@ -33,7 +33,7 @@ main(int argc, char** argv)
   spot::tgba_parse_error_list pel;
   spot::tgba_explicit* a = spot::tgba_parse(argv[filename_index],
 					    pel, env, debug);
-  
+
   exit_code =
     spot::format_tgba_parse_errors(std::cerr, pel);