tgbaparse: Return a tgba_digraph.

* src/tgbaparse/parsedecl.hh, src/tgbaparse/public.hh,
src/tgbaparse/tgbaparse.yy: Adjust to return a tgba_digraph.
* src/priv/accmap.hh: New file to help creating acceptance
conditions from strings.
* src/priv/Makefile.am: Add accmap.hh
* src/tgba/tgbagraph.hh (tgba_digraph::named_t): New typedef.
* wrap/python/spot.i: Declare that tgba_digraph inherits from tgba.
* src/tgbatest/complementation.cc, src/tgbatest/explpro2.test,
src/tgbatest/explpro3.test, src/tgbatest/explpro4.test,
src/tgbatest/explprod.cc, src/tgbatest/explprod.test,
src/tgbatest/ltl2tgba.cc, src/tgbatest/maskacc.cc,
src/tgbatest/maskacc.test, src/tgbatest/mixprod.cc,
src/tgbatest/powerset.cc, src/tgbatest/randtgba.test,
src/tgbatest/readsave.test, src/tgbatest/tgbaread.cc,
src/tgbatest/tgbaread.test, src/tgbatest/tripprod.cc,
src/tgbatest/tripprod.test: Adjust to the change.

src/priv/Makefile.am

@@ -1,5 +1,5 @@
 ## -*- coding: utf-8 -*-
-## Copyright (C) 2013 Laboratoire de Recherche et
+## Copyright (C) 2013, 2014 Laboratoire de Recherche et
 ## Développement de l'Epita (LRDE).
 ##
 ## This file is part of Spot, a model checking library.
@@ -23,6 +23,7 @@ AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 noinst_HEADERS = \
   acccompl.hh \
   accconv.hh \
+  accmap.hh \
   bddalloc.hh \
   countstates.hh \
   freelist.hh

src/priv/accmap.hh

@@ -0,0 +1,87 @@
+// -*- coding: utf-8 -*-
+// Copyright (C) 2014  Laboratoire de Recherche et Developpement 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/>.
+
+#ifndef SPOT_PRIV_ACCMAP_HH
+# define SPOT_PRIV_ACCMAP_HH
+
+#include <bdd.h>
+#include "misc/hash.hh"
+#include "ltlast/formula.hh"
+#include "ltlenv/defaultenv.hh"
+#include "tgba/tgbagraph.hh"
+
+namespace spot
+{
+  class acc_mapper
+  {
+    bdd_dict* dict_;
+    tgba_digraph* aut_;
+    ltl::environment& env_;
+    std::unordered_map<std::string, int> map_;
+    bdd neg_;
+
+  public:
+    acc_mapper(tgba_digraph *aut,
+	       ltl::environment& env = ltl::default_environment::instance())
+      : dict_(aut->get_dict()), aut_(aut), env_(env), neg_(bddtrue)
+    {
+    }
+
+    const ltl::environment& get_env() const
+    {
+      return env_;
+    }
+
+    // Declare an acceptance name.
+    bool declare(const std::string& name)
+    {
+      auto i = map_.find(name);
+      if (i != map_.end())
+	return true;
+      const ltl::formula* f = env_.require(name);
+      if (!f)
+	return false;
+      int v = dict_->register_acceptance_variable(f, aut_);
+      f->destroy();
+      map_[name] = v;
+      neg_ &= bdd_nithvar(v);
+      return true;
+    }
+
+    // Commit all acceptance set to the automaton.
+    void commit()
+    {
+       aut_->set_acceptance_conditions(neg_);
+    }
+
+    std::pair<bool, bdd> lookup(std::string name) const
+    {
+       auto p = map_.find(name);
+       if (p == map_.end())
+	 return std::make_pair(false, bddfalse);
+       return std::make_pair(true, bdd_compose(neg_,
+					       bdd_nithvar(p->second),
+					       p->second));
+    }
+
+  };
+
+}
+
+#endif // SPOT_PRIV_ACCCONV_HH

src/tgba/tgbagraph.hh

@@ -174,10 +174,20 @@ namespace spot
       last_support_conditions_input_ = 0;
     }
 
+    // FIXME: Once we ditch GCC 4.6, we can using a template aliases
+    // (supported from GCC 4.7 onward) instead of this.
     template <typename State_Name,
 	      typename Name_Hash = std::hash<State_Name>,
 	      typename Name_Equal = std::equal_to<State_Name>>
-    named_graph<graph_t, State_Name, Name_Hash, Name_Equal>*
+    struct namer
+    {
+      typedef named_graph<graph_t, State_Name, Name_Hash, Name_Equal> type;
+    };
+
+    template <typename State_Name,
+	      typename Name_Hash = std::hash<State_Name>,
+	      typename Name_Equal = std::equal_to<State_Name>>
+    typename namer<State_Name, Name_Hash, Name_Equal>::type*
     create_namer()
     {
       return new named_graph<graph_t, State_Name, Name_Hash, Name_Equal>(g_);

src/tgbaparse/parsedecl.hh

@@ -1,5 +1,7 @@
 // -*- coding: utf-8 -*-
-// Copyright (C) 2003, 2005, 2013 Laboratoire d'Informatique de Paris
+// Copyright (C) 2013, 2014 Laboratoire de Recherche et
+// Développement de l'Epita.
+// Copyright (C) 2003, 2005 Laboratoire d'Informatique de Paris
 // 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
 // Université Pierre et Marie Curie.
 //
@@ -37,17 +39,4 @@ namespace spot
 }
 
 
-// Gross kludge to compile yy::Parser in another namespace (tgbayy::)
-// but still use yy::Location.  The reason is that Bison's C++
-// skeleton does not support anything close to %name-prefix at the
-// moment.  All parser are named yy::Parser which makes it somewhat
-// difficult to define multiple parsers.
-// namespace tgbayy
-// {
-//   using namespace yy;
-// }
-// #define yy tgbayy
-
-
-
 #endif // SPOT_TGBAPARSE_PARSEDECL_HH

src/tgbaparse/public.hh

@@ -1,6 +1,6 @@
 // -*- coding: utf-8 -*-
-// Copyright (C) 2009, 2012, 2013 Laboratoire de Recherche et Développement
+// Copyright (C) 2009, 2012, 2013, 2014 Laboratoire de Recherche et
-// de l'Epita.
+// Développement de l'Epita.
 // Copyright (C) 2003, 2004, 2005, 2006 Laboratoire
 // d'Informatique de Paris 6 (LIP6), département Systèmes Répartis
 // Coopératifs (SRC), Université Pierre et Marie Curie.
@@ -23,7 +23,7 @@
 #ifndef SPOT_TGBAPARSE_PUBLIC_HH
 # define SPOT_TGBAPARSE_PUBLIC_HH
 
-# include "tgba/tgbaexplicit.hh"
+# include "tgba/tgbagraph.hh"
 # include "misc/location.hh"
 # include "ltlenv/defaultenv.hh"
 # include <string>
@@ -46,7 +46,7 @@ namespace spot
     struct tgba_parse_error_list {};
 #endif
 
-  /// \brief Build a spot::tgba_explicit from a text file.
+  /// \brief Build a spot::tgba_digraph from a text file.
   /// \param filename The name of the file to parse.
   /// \param error_list A list that will be filled with
   ///        parse errors that occured during parsing.
@@ -66,7 +66,7 @@ namespace spot
   ///
   /// \warning This function is not reentrant.
   SPOT_API
-  tgba_explicit_string* tgba_parse(const std::string& filename,
+  tgba_digraph* tgba_parse(const std::string& filename,
 			   tgba_parse_error_list& error_list,
 			   bdd_dict* dict,
 			   ltl::environment& env

src/tgbaparse/tgbaparse.yy

@@ -32,25 +32,29 @@
 {
 #include <string>
 #include "public.hh"
+#include "priv/accmap.hh"
+#include "tgba/formula2bdd.hh"
 
 /* Cache parsed formulae.  Labels on arcs are frequently identical and
    it would be a waste of time to parse them to formula* over and
    over, and to register all their atomic_propositions in the
    bdd_dict.  Keep the bdd result around so we can reuse it.  */
   typedef std::map<std::string, bdd> formula_cache;
+  typedef typename spot::tgba_digraph::namer<std::string>::type named_tgba_t;
 }
 
 %parse-param {spot::tgba_parse_error_list& error_list}
 %parse-param {spot::ltl::environment& parse_environment}
-%parse-param {spot::ltl::environment& parse_envacc}
+%parse-param {spot::acc_mapper& acc_map}
-%parse-param {spot::tgba_explicit_string*& result}
+%parse-param {spot::tgba_digraph*& result}
+%parse-param {named_tgba_t*& namer}
 %parse-param {formula_cache& fcache}
 %union
 {
   int token;
   std::string* str;
   const spot::ltl::formula* f;
-  std::list<const spot::ltl::formula*>* list;
+  bdd* acc;
 }
 
 %code
@@ -72,28 +76,25 @@ typedef std::pair<bool, spot::ltl::formula*> pair;
 %token <str> IDENT
 %type <str> strident string
 %type <str> condition
-%type <list> acc_list
+%type <acc> acc_list
 %token ACC_DEF
 
 %destructor { delete $$; } <str>
-%destructor {
+%destructor { delete $$; } <acc>
-  for (std::list<const spot::ltl::formula*>::iterator i = $$->begin();
-       i != $$->end(); ++i)
-    (*i)->destroy();
-  delete $$;
-  } <list>
 
 %printer { debug_stream() << *$$; } <str>
+%printer { debug_stream() << *$$; } <acc>
 
 %%
 tgba: acceptance_decl lines
       | acceptance_decl
-      { result->add_state("0"); }
+      { namer->new_state("0"); }
       | lines
       |
-      { result->add_state("0"); };
+      { namer->new_state("0"); };
 
 acceptance_decl: ACC_DEF acc_decl ';'
+      { acc_map.commit(); }
 
 /* At least one line.  */
 lines: line
@@ -102,8 +103,7 @@ lines: line
 
 line: strident ',' strident ',' condition ',' acc_list ';'
        {
-	 spot::state_explicit_string::transition* t
+	 bdd cond = bddtrue;
-	   = result->create_transition(*$1, *$3);
 	 if ($5)
 	   {
 	     formula_cache::const_iterator i = fcache.find(*$5);
@@ -113,35 +113,34 @@ line: strident ',' strident ',' condition ',' acc_list ';'
 		 const formula* f =
 		   spot::ltl::parse_boolean(*$5, pel, parse_environment,
 					    debug_level());
-		 for (parse_error_list::iterator i = pel.begin();
+		 for (auto& j: pel)
-		      i != pel.end(); ++i)
 		   {
 		     // Adjust the diagnostic to the current position.
 		     spot::location here = @5;
-		     here.end.line = here.begin.line + i->first.end.line - 1;
+		     here.end.line = here.begin.line + j.first.end.line - 1;
-		     here.end.column =
+		     here.end.column = here.begin.column + j.first.end.column;
-		       here.begin.column + i->first.end.column;
+		     here.begin.line += j.first.begin.line - 1;
-		     here.begin.line += i->first.begin.line - 1;
+		     here.begin.column += j.first.begin.column;
-		     here.begin.column += i->first.begin.column;
+		     error_list.emplace_back(here, j.second);
-		     error_list.emplace_back(here, i->second);
 		   }
 		 if (f)
-		   result->add_condition(t, f);
+		   {
-		 else
+		     cond = formula_to_bdd(f, result->get_dict(), result);
-		   result->add_conditions(t, bddfalse);
+		     f->destroy();
-		 fcache[*$5] = t->condition;
+		   }
+		 fcache[*$5] = cond;
 	       }
 	     else
 	       {
-		 t->condition = i->second;
+		 cond = i->second;
 	       }
-	     delete $5;
 	   }
-	 std::list<const formula*>::iterator i;
+	 unsigned s = namer->new_state(*$1);
-	 for (i = $7->begin(); i != $7->end(); ++i)
+	 unsigned d = namer->new_state(*$3);
-	   result->add_acceptance_condition(t, *i);
+	 namer->graph().new_transition(s, d, cond, *$7);
 	 delete $1;
 	 delete $3;
+	 delete $5;
 	 delete $7;
        }
        ;
@@ -167,26 +166,21 @@ condition:
 
 acc_list:
        {
-	 $$ = new std::list<const formula*>;
+	 $$ = new bdd(bddfalse);
        }
        | acc_list strident
        {
-	 if (*$2 == "true")
+	 if (*$2 != "" && *$2 != "false")
 	   {
-	     $1->push_back(constant::true_instance());
+	     auto p = acc_map.lookup(*$2);
-	   }
+	     if (! p.first)
-	 else if (*$2 != "" && *$2 != "false")
-	   {
-	     const formula* f = parse_envacc.require(*$2);
-	     if (! result->has_acceptance_condition(f))
 	       {
 		 error_list.emplace_back(@2,
 			 "undeclared acceptance condition `" + *$2 + "'");
-		 f->destroy();
 		 // $2 will be destroyed on error recovery.
 		 YYERROR;
 	       }
-	     $1->push_back(f);
+	     *$1 |= p.second;
 	   }
 	 delete $2;
 	 $$ = $1;
@@ -197,18 +191,16 @@ acc_list:
 acc_decl:
        | acc_decl strident
        {
-	 const formula* f = parse_envacc.require(*$2);
+	 if (! acc_map.declare(*$2))
-	 if (! f)
 	   {
 	     std::string s = "acceptance condition `";
 	     s += *$2;
 	     s += "' unknown in environment `";
-	     s += parse_envacc.name();
+	     s += acc_map.get_env().name();
 	     s += "'";
 	     error_list.emplace_back(@2, s);
 	     YYERROR;
 	   }
-	 result->declare_acceptance_condition(f);
 	 delete $2;
        }
        ;
@@ -224,7 +216,7 @@ tgbayy::parser::error(const location_type& location,
 
 namespace spot
 {
-  tgba_explicit_string*
+  tgba_digraph*
   tgba_parse(const std::string& name,
 	     tgba_parse_error_list& error_list,
 	     bdd_dict* dict,
@@ -239,13 +231,25 @@ namespace spot
 	return 0;
       }
     formula_cache fcache;
-    tgba_explicit_string* result = new tgba_explicit_string(dict);
+    tgba_digraph* result = new tgba_digraph(dict);
-    tgbayy::parser parser(error_list, env, envacc, result, fcache);
+    auto* namer = result->create_namer<std::string>();
+    spot::acc_mapper acc_map(result, envacc);
+    tgbayy::parser parser(error_list, env, acc_map, result, namer, fcache);
     parser.set_debug_level(debug);
     parser.parse();
     tgbayyclose();
+
+    if (namer)			// No fatal error
+      {
+	delete namer;
 	return result;
       }
+    else			// Fatal error
+      {
+	delete result;
+	return nullptr;
+      }
+  }
 }
 
 // Local Variables:

src/tgbatest/complementation.cc

@@ -130,7 +130,7 @@ int main(int argc, char* argv[])
   {
     spot::ltl::environment& env(spot::ltl::default_environment::instance());
     spot::tgba_parse_error_list pel;
-    spot::tgba_explicit_string* a = spot::tgba_parse(file, pel, dict, env);
+    spot::tgba* a = spot::tgba_parse(file, pel, dict, env);
     if (spot::format_tgba_parse_errors(std::cerr, file, pel))
       return 2;
 

src/tgbatest/explpro2.test

@@ -1,9 +1,10 @@
 #!/bin/sh
-# Copyright (C) 2013 Laboratoire de Recherche et Développement de
+# -*- coding: utf-8 -*-
-# l'Epita (LRDE).
+# Copyright (C) 2013, 2014 Laboratoire de Recherche et Développement
+# de l'Epita (LRDE).
 # Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 Laboratoire
-# d'Informatique de Paris 6 (LIP6), département Systèmes Répartis
+# d'Informatique de Paris 6 (LIP6), département Systèmes Répartis
-# Coopératifs (SRC), Université Pierre et Marie Curie.
+# Coopératifs (SRC), Université Pierre et Marie Curie.
 #
 # This file is part of Spot, a model checking library.
 #
@@ -39,8 +40,8 @@ EOF
 
 cat >expected <<'EOF'
 acc = "p2$1" "p3" "p2" "p1";
-"s1 * s1", "s2 * s2", "!a & b", "p2$1" "p1";
+"0 * 0", "1 * 1", "!a & b", "p2$1" "p1";
-"s1 * s1", "s3 * s3", "a & !b", "p3" "p2";
+"0 * 0", "2 * 2", "a & !b", "p3" "p2";
 EOF
 
 run 0 ../explprod input1 input2 | tee stdout

src/tgbatest/explpro3.test

@@ -1,8 +1,9 @@
 #!/bin/sh
-# Copyright (C) 2009 Laboratoire de Recherche et Développement
+# -*- coding: utf-8 -*-
+# Copyright (C) 2009, 2014 Laboratoire de Recherche et Développement
 # de l'Epita (LRDE).
 # Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
-# département Systèmes Répartis Coopératifs (SRC), Université Pierre
+# département Systèmes Répartis Coopératifs (SRC), Université Pierre
 # et Marie Curie.
 #
 # This file is part of Spot, a model checking library.
@@ -39,8 +40,8 @@ EOF
 
 cat >expected <<EOF
 acc = "p2" "p3";
-"s1 * s1", "s2 * s2", "!a & b", "p2";
+"0 * 0", "1 * 1", "!a & b", "p2";
-"s1 * s1", "s3 * s3", "a & !b", "p3";
+"0 * 0", "2 * 2", "a & !b", "p3";
 EOF
 
 run 0 ../explprod input1 input2 |

src/tgbatest/explpro4.test

@@ -1,8 +1,9 @@
 #!/bin/sh
-# Copyright (C) 2009 Laboratoire de Recherche et Développement
+# -*- coding: utf-8 -*-
+# Copyright (C) 2009, 2014 Laboratoire de Recherche et Développement
 # de l'Epita (LRDE).
 # Copyright (C) 2006 Laboratoire d'Informatique de Paris 6 (LIP6),
-# département Systèmes Répartis Coopératifs (SRC), Université Pierre
+# département Systèmes Répartis Coopératifs (SRC), Université Pierre
 # et Marie Curie.
 #
 # This file is part of Spot, a model checking library.
@@ -39,8 +40,8 @@ EOF
 
 cat >expected <<'EOF'
 acc = "p1$1" "p1";
-"s1 * s1", "s1 * s1", "a", "p1";
+"0 * 0", "0 * 0", "a", "p1";
-"s1 * s1", "s1 * s1", "!a", "p1$1";
+"0 * 0", "0 * 0", "!a", "p1$1";
 EOF
 
 run 0 ../explprod input1 input2 > stdout

src/tgbatest/explprod.cc

@@ -1,7 +1,8 @@
-// Copyright (C) 2008 Laboratoire de Recherche et Développement
+// -*- coding: utf-8 -*-
+// Copyright (C) 2008, 2014 Laboratoire de Recherche et Développement
 // de l'Epita (LRDE).
 // Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
-// département Systèmes Répartis Coopératifs (SRC), Université Pierre
+// département Systèmes Répartis Coopératifs (SRC), Université Pierre
 // et Marie Curie.
 //
 // This file is part of Spot, a model checking library.
@@ -47,11 +48,11 @@ main(int argc, char** argv)
 
   spot::ltl::environment& env(spot::ltl::default_environment::instance());
   spot::tgba_parse_error_list pel1;
-  spot::tgba_explicit_string* a1 = spot::tgba_parse(argv[1], pel1, dict, env);
+  spot::tgba* a1 = spot::tgba_parse(argv[1], pel1, dict, env);
   if (spot::format_tgba_parse_errors(std::cerr, argv[1], pel1))
     return 2;
   spot::tgba_parse_error_list pel2;
-  spot::tgba_explicit_string* a2 = spot::tgba_parse(argv[2], pel2, dict, env);
+  spot::tgba* a2 = spot::tgba_parse(argv[2], pel2, dict, env);
   if (spot::format_tgba_parse_errors(std::cerr, argv[2], pel2))
     return 2;
 

src/tgbatest/explprod.test

@@ -1,9 +1,10 @@
 #!/bin/sh
-# Copyright (C) 2008, 2009, 2013 Laboratoire de Recherche et
+# -*- coding: utf-8 -*-
-# Développement de l'Epita (LRDE).
+# Copyright (C) 2008, 2009, 2013, 2014 Laboratoire de Recherche et
+# Développement de l'Epita (LRDE).
 # Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de
-# Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
+# Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
-# Université Pierre et Marie Curie.
+# Université Pierre et Marie Curie.
 #
 # This file is part of Spot, a model checking library.
 #
@@ -41,9 +42,9 @@ EOF
 
 cat >expected <<EOF
 acc = "p3" "p2" "p1";
-"s1 * s1", "s3 * s2", "a & b", "p2" "p1";
+"0 * 0", "1 * 1", "a & b", "p2" "p1";
-"s1 * s1", "s2 * s2", "b", "p2" "p1";
+"0 * 0", "2 * 1", "b", "p2" "p1";
-"s2 * s2", "s3 * s1", "a & c", "p3" "p1";
+"2 * 1", "1 * 0", "a & c", "p3" "p1";
 EOF
 
 run 0 ../explprod input1 input2 | tee stdout

src/tgbatest/ltl2tgba.cc

@@ -676,7 +676,7 @@ main(int argc, char** argv)
 	  tm.start("reading -P's argument");
 
 	  spot::tgba_parse_error_list pel;
-	  spot::tgba_explicit_string* s;
+	  spot::tgba_digraph* s;
 	  s = spot::tgba_parse(argv[formula_index] + 2,
 			       pel, dict, env, env, debug_opt);
 	  if (spot::format_tgba_parse_errors(std::cerr,
@@ -1096,6 +1096,7 @@ main(int argc, char** argv)
 	    {
 	    case ReadSpot:
 		{
+		  spot::tgba_digraph* e;
 		  spot::tgba_parse_error_list pel;
 		  tm.start("parsing automaton");
 		  to_free = a = e = spot::tgba_parse(input, pel, dict,
@@ -1107,6 +1108,7 @@ main(int argc, char** argv)
 		      delete dict;
 		      return 2;
 		    }
+		  e->merge_transitions();
 		}
 	      break;
 	    case ReadNeverclaim:

src/tgbatest/maskacc.cc

@@ -1,3 +1,4 @@
+// -*- coding: utf-8 -*-
 // Copyright (C) 2014 Laboratoire de Recherche et Développement
 // de l'Epita (LRDE).
 //
@@ -43,7 +44,7 @@ main(int argc, char** argv)
 
   spot::ltl::environment& env(spot::ltl::default_environment::instance());
   spot::tgba_parse_error_list pel;
-  spot::tgba_explicit_string* aut = spot::tgba_parse(argv[1], pel, dict, env);
+  spot::tgba* aut = spot::tgba_parse(argv[1], pel, dict, env);
   if (spot::format_tgba_parse_errors(std::cerr, argv[1], pel))
     return 2;
 

src/tgbatest/maskacc.test

@@ -35,15 +35,15 @@ EOF
 
 cat >expect1 <<EOF
 acc = "B" "A";
-"s1", "s3", "b", "B";
+"0", "2", "b", "B";
-"s3", "s2", "b",;
+"2", "1", "b",;
-"s2", "s3", "a",;
+"1", "2", "a",;
-"s2", "s4", "a", "B";
+"1", "3", "a", "B";
 acc = "B" "A";
-"s1", "s2", "a", "A";
+"0", "1", "a", "A";
-"s2", "s3", "a",;
+"1", "2", "a",;
-"s3", "s2", "b",;
+"2", "1", "b",;
-"s3", "s4", "b", "A";
+"2", "3", "b", "A";
 EOF
 
 run 0 ../maskacc input1 | tee stdout

src/tgbatest/mixprod.cc

@@ -1,5 +1,5 @@
 // -*- coding: utf-8 -*-
-// Copyright (C) 2008, 2009, 2012 Laboratoire de Recherche et
+// Copyright (C) 2008, 2009, 2012, 2014 Laboratoire de Recherche et
 // Développement de l'Epita (LRDE).
 // Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris
 // 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
@@ -56,7 +56,7 @@ main(int argc, char** argv)
     return 2;
 
   spot::tgba_parse_error_list pel2;
-  spot::tgba_explicit_string* a2 = spot::tgba_parse(argv[2], pel2, dict, env);
+  spot::tgba* a2 = spot::tgba_parse(argv[2], pel2, dict, env);
   if (spot::format_tgba_parse_errors(std::cerr, argv[2], pel2))
     return 2;
 

src/tgbatest/powerset.cc

@@ -1,8 +1,9 @@
-// Copyright (C) 2008 Laboratoire de Recherche et Développement
+// -*- coding: utf-8 -*-
+// Copyright (C) 2008, 2014 Laboratoire de Recherche et Développement
 // de l'Epita (LRDE).
 // Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris
-// 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
+// 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
-// Université Pierre et Marie Curie.
+// Université Pierre et Marie Curie.
 //
 // This file is part of Spot, a model checking library.
 //
@@ -48,7 +49,7 @@ main(int argc, char** argv)
 
   spot::ltl::environment& env(spot::ltl::default_environment::instance());
   spot::tgba_parse_error_list pel;
-  spot::tgba_explicit_string* a = spot::tgba_parse(argv[1], pel, dict, env);
+  spot::tgba* a = spot::tgba_parse(argv[1], pel, dict, env);
   if (spot::format_tgba_parse_errors(std::cerr, argv[1], pel))
     return 2;
 

src/tgbatest/randtgba.test

@@ -1,5 +1,7 @@
 #!/bin/sh
-# Copyright (C) 2010  Laboratoire de Recherche et Development de l'EPITA.
+# -*- coding: utf-8 -*-
+# Copyright (C) 2010, 2014 Laboratoire de Recherche et Development de
+# l'EPITA.
 #
 # This file is part of Spot, a model checking library.
 #
@@ -23,7 +25,7 @@ set -e
 for n in 10 20 30 40 50 60 70 80 90 100 200 500 1000; do
   # Make sure graph generated by randtgba have successors for each
   # of their $n nodes.
-  r=`../randtgba -n $n a b c | sed -n 's/^"S\([0-9]*\)".*/\1/p' |
+  r=`../randtgba -n $n a b c | sed -n 's/^"\([0-9]*\)".*/\1/p' |
      sort -u | wc -l`
   if test "$r" -eq "$n"; then :; else
      echo "test failed for n=$n"

src/tgbatest/readsave.test

@@ -1,8 +1,9 @@
 #!/bin/sh
-# Copyright (C) 2009, 2010, 2012 Laboratoire de Recherche et Développement
+# -*- coding: utf-8 -*-
-# de l'Epita (LRDE).
+# Copyright (C) 2009, 2010, 2012, 2014 Laboratoire de Recherche et
+# Développement de l'Epita (LRDE).
 # Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
-# département Systèmes Répartis Coopératifs (SRC), Université Pierre
+# département Systèmes Répartis Coopératifs (SRC), Université Pierre
 # et Marie Curie.
 #
 # This file is part of Spot, a model checking library.
@@ -36,9 +37,9 @@ EOF
 
 cat >expected <<\EOF
 acc = "c" "d";
-"s1", "s2", "a & !b", "c" "d";
+"0", "1", "a & !b", "c" "d";
-"s2", "state 3", "\"F\\G\"", "c";
+"1", "2", "\"F\\G\"", "c";
-"state 3", "s1", "1",;
+"2", "0", "1",;
 EOF
 
 # Sort out some possible inversions in the output.
@@ -71,10 +72,10 @@ EOF
 
 cat >expected <<\EOF
 acc = "c";
-"s1", "s2", "a", "c";
+"0", "1", "a", "c";
-"s1", "s2", "!b",;
+"0", "1", "!b",;
-"s2", "s1", "!b",;
+"1", "0", "!b",;
-"s2", "s1", "a", "c";
+"1", "0", "a", "c";
 EOF
 
 run 0 ../ltl2tgba -b -X input > stdout
@@ -85,13 +86,18 @@ run 0 ../randtgba -t 1 -n 20 -d 0.2 a b -a 2 0.1 >input
 sed 's/"b & a"/"a \& b"/g;s/"a1" "a0"/"a0" "a1"/g' input > tmp_ &&
   mv tmp_ input
 cat input
+# the first read-write can renumber the states
 run 0 ../ltl2tgba -b -X input > stdout
 sed 's/"b & a"/"a \& b"/g;s/"a1" "a0"/"a0" "a1"/g' stdout > tmp_ &&
 mv tmp_ stdout
+test `wc -l < input` = `wc -l < stdout`
+# But this second shout output the same as the first
+run 0 ../ltl2tgba -b -X input > stdout2
+sed 's/"b & a"/"a \& b"/g;s/"a1" "a0"/"a0" "a1"/g' stdout2 > tmp_ &&
+mv tmp_ stdout2
+diff stdout stdout2
 
-diff input stdout
+rm -f input stdout stdout2
-
-rm -f input stdout
 
 
 # Check the position of syntax errors in the diagnostics:

src/tgbatest/tgbaread.cc

@@ -1,8 +1,9 @@
-// Copyright (C) 2008 Laboratoire de Recherche et Développement
+// -*- coding: utf-8 -*-
+// Copyright (C) 2008, 2014 Laboratoire de Recherche et Développement
 // de l'Epita (LRDE).
 // Copyright (C) 2003, 2004, 2006 Laboratoire d'Informatique de
-// Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
+// Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
-// Université Pierre et Marie Curie.
+// Université Pierre et Marie Curie.
 //
 // This file is part of Spot, a model checking library.
 //
@@ -56,7 +57,7 @@ main(int argc, char** argv)
 
   spot::ltl::environment& env(spot::ltl::default_environment::instance());
   spot::tgba_parse_error_list pel;
-  spot::tgba_explicit_string* a = spot::tgba_parse(argv[filename_index],
+  spot::tgba* a = spot::tgba_parse(argv[filename_index],
 				   pel, dict, env, env, debug);
 
   if (spot::format_tgba_parse_errors(std::cerr, argv[filename_index], pel))

src/tgbatest/tgbaread.test

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2009 Laboratoire de Recherche et Développement
+# Copyright (C) 2009, 2014 Laboratoire de Recherche et Développement
 # de l'Epita (LRDE).
 # Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
 # département Systèmes Répartis Coopératifs (SRC), Université Pierre
@@ -38,11 +38,11 @@ cat >expected <<EOF
 digraph G {
   0 [label="", style=invis, height=0]
   0 -> 1
-  1 [label="s1"]
+  1 [label="0"]
   1 -> 2 [label="a & !b\n{Acc[d], Acc[c]}"]
-  2 [label="s2"]
+  2 [label="1"]
   2 -> 3 [label="a\n{Acc[c]}"]
-  3 [label="state 3"]
+  3 [label="2"]
   3 -> 1 [label="1\n"]
 }
 EOF

src/tgbatest/tripprod.cc

@@ -1,8 +1,9 @@
-// Copyright (C) 2008 Laboratoire de Recherche et Développement
+// -*- coding: utf-8 -*-
+// Copyright (C) 2008, 2014 Laboratoire de Recherche et Développement
 // de l'Epita (LRDE).
 // Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris
-// 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
+// 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
-// Université Pierre et Marie Curie.
+// Université Pierre et Marie Curie.
 //
 // This file is part of Spot, a model checking library.
 //
@@ -47,15 +48,15 @@ main(int argc, char** argv)
 
   spot::ltl::environment& env(spot::ltl::default_environment::instance());
   spot::tgba_parse_error_list pel1;
-  spot::tgba_explicit_string* a1 = spot::tgba_parse(argv[1], pel1, dict, env);
+  spot::tgba* a1 = spot::tgba_parse(argv[1], pel1, dict, env);
   if (spot::format_tgba_parse_errors(std::cerr, argv[1], pel1))
     return 2;
   spot::tgba_parse_error_list pel2;
-  spot::tgba_explicit_string* a2 = spot::tgba_parse(argv[2], pel2, dict, env);
+  spot::tgba* a2 = spot::tgba_parse(argv[2], pel2, dict, env);
   if (spot::format_tgba_parse_errors(std::cerr, argv[2], pel2))
     return 2;
   spot::tgba_parse_error_list pel3;
-  spot::tgba_explicit_string* a3 = spot::tgba_parse(argv[3], pel3, dict, env);
+  spot::tgba* a3 = spot::tgba_parse(argv[3], pel3, dict, env);
   if (spot::format_tgba_parse_errors(std::cerr, argv[3], pel3))
     return 2;
 

src/tgbatest/tripprod.test

@@ -1,6 +1,6 @@
 #!/bin/sh
-# Copyright (C) 2008, 2009, 2013 Laboratoire de Recherche et Développement
+# Copyright (C) 2008, 2009, 2013, 2014 Laboratoire de Recherche et
-# de l'Epita (LRDE).
+# Développement de l'Epita (LRDE).
 # Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de
 # Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
 # Université Pierre et Marie Curie.
@@ -49,12 +49,12 @@ EOF
 
 cat >expected <<EOF
 acc = "p4" "p3" "p2" "p1";
-"s1 * s1 * s1", "s3 * s2 * s2", "a & b", "p2" "p1";
+"0 * 0 * 0", "1 * 1 * 1", "a & b", "p2" "p1";
-"s1 * s1 * s1", "s2 * s2 * s2", "a & b", "p2" "p1";
+"0 * 0 * 0", "2 * 1 * 1", "a & b", "p2" "p1";
-"s1 * s1 * s1", "s3 * s2 * s3", "a & b", "p2" "p1";
+"0 * 0 * 0", "1 * 1 * 2", "a & b", "p2" "p1";
-"s1 * s1 * s1", "s2 * s2 * s3", "b", "p2" "p1";
+"0 * 0 * 0", "2 * 1 * 2", "b", "p2" "p1";
-"s2 * s2 * s2", "s3 * s1 * s3", "a & c", "p4" "p3";
+"2 * 1 * 1", "1 * 0 * 2", "a & c", "p4" "p3";
-"s2 * s2 * s3", "s3 * s1 * s2", "a & c", "p4" "p3";
+"2 * 1 * 2", "1 * 0 * 1", "a & c", "p4" "p3";
 EOF
 
 run 0 ../tripprod input1 input2 input3 | tee stdout

wrap/python/spot.i

@@ -233,6 +233,14 @@ using namespace spot;
 %include "tgba/tgbaproduct.hh"
 %include "tgba/tgbatba.hh"
 
+// We won't parse tgba_digraph, so just pretend it is a subclass of tgba.
+%nodefaultctor spot::tgba_digraph;
+namespace spot {
+  class tgba_digraph: public tgba
+  {
+  };
+}
+
 %template(explicit_graph__string_tgba)
   spot::explicit_graph<state_explicit_string, tgba>;
 %template(explicit_graph__number_tgba)