* src/misc/optionmap.cc, src/misc/optionmap.hh (option_map): New class.

* src/misc/Makefile.am: Add it.
* src/tgbaalgos/emptiness.cc, src/tgbaalgos/emptiness.hh: Add option
facilities to the classes emptiness_check and emptiness_result
* src/tgbaalgos/magic.cc, src/tgbaalgos/magic.hh,
src/tgbaalgos/se05.cc, src/tgbaalgos/se05.hh: Compute optionnaly
accepting runs from stack.
* src/tgbatest/randtgba.cc: Make this option public.

src/misc/Makefile.am

@@ -35,6 +35,7 @@ misc_HEADERS = \
   ltstr.hh \
   minato.hh \
   modgray.hh \
+  optionmap.hh \
   random.hh \
   timer.hh \
   version.hh
@@ -47,6 +48,7 @@ libmisc_la_SOURCES = \
   freelist.cc \
   minato.cc \
   modgray.cc \
+  optionmap.cc \
   random.cc \
   timer.cc \
   version.cc

src/misc/optionmap.cc

@@ -0,0 +1,102 @@
+// Copyright (C) 2005  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 <cassert>
+#include <cstring>
+#include <iostream>
+#include "optionmap.hh"
+
+namespace spot
+{
+  namespace {
+    bool
+    to_int(const char* s, int &i)
+    {
+      char* endptr;
+      int res = strtol(s, &endptr, 10);
+      if (*endptr)
+        {
+          std::cerr << "Failed to parse `" << s << "' as an integer."
+                    << std::endl;
+          return false;
+        }
+      i = res;
+      return true;
+    }
+  };
+
+  const char* option_map::parse_options(char* options)
+  {
+      char* opt = strtok(options, "\t, ;");
+      while (opt)
+        {
+          char* equal;
+          if ((equal = strchr(opt, '=')) != 0)
+            {
+              *equal = 0;
+              int val;
+              if (!to_int(equal+1, val))
+                return opt;
+              options_[opt] = val;
+            }
+          else
+            // default value if declared
+            options_[opt] = 1;
+          opt = strtok(0, "\t, ;");
+        }
+      return 0;
+  }
+
+  int option_map::get(const char* option) const
+  {
+    std::map<std::string, int>::const_iterator it = options_.find(option);
+    if (it == options_.end())
+      // default value if not declared
+      return 0;
+    else
+      return it->second;
+  }
+
+  int option_map::operator[](const char* option) const
+  {
+    return get(option);
+  }
+
+  int option_map::set(const char* option, int val)
+  {
+    int old = get(option);
+    options_[option] = val;
+    return old;
+  }
+
+  int& option_map::operator[](const char* option)
+  {
+    return options_[option];
+  }
+
+  std::ostream& operator<<(std::ostream& os, const option_map& m)
+  {
+    for (std::map<std::string, int>::const_iterator it = m.options_.begin();
+        it != m.options_.end(); ++it)
+      os << "\"" << it->first << "\" = " << it->second << std::endl;
+    return os;
+  }
+};

src/misc/optionmap.hh

@@ -0,0 +1,74 @@
+// Copyright (C) 2005  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.
+
+#ifndef SPOT_MISC_OPTION_MAP_HH
+# define SPOT_MISC_OPTION_MAP_HH
+
+#include <string>
+#include <map>
+#include <iosfwd>
+
+namespace spot
+{
+  /// \brief Manage a map of options.
+  /// \ingroup misc_tools
+  /// Each option is defined by a string and is associated to an integer value.
+  class option_map
+  {
+  public:
+    /// \brief Add the parsed options to the map.
+    ///
+    /// \a options are separated by a space, comma, semicolon or tabulation and
+    /// can be optionnaly followed by an integer value (preceded by an equal
+    /// sign). If not specified, the default value is 1.
+    ///
+    /// \return A non-null pointer to the option for which an expected integer
+    /// value cannot be parsed.
+    const char* parse_options(char* options);
+
+    /// \brief Get the value of \a option.
+    ///
+    /// \return The value associated to \a option if it exists, 0 otherwise.
+    int get(const char* option) const;
+
+    /// \brief Get the value of \a option.
+    ///
+    /// \return The value associated to \a option if it exists, 0 otherwise.
+    int operator[](const char* option) const;
+
+    /// \brief Set the value of \a option to \a val.
+    ///
+    /// \return The current value associated to \a option if declared,
+    /// 0 otherwise.
+    int set(const char* option, int val);
+
+    /// \brief Get a reference to the current value of \a option.
+    int& operator[](const char* option);
+
+    /// \brief Print the option_map \a m.
+    friend std::ostream& operator<<(std::ostream& os, const option_map& m);
+
+  private:
+    std::map<std::string, int> options_;
+  };
+};
+
+#endif