* iface/gspn/common.cc, iface/gspn/common.hh: Remove the

class gspn_environment, and move it to ...
* src/ltlenv/declenv.cc, src/ltlenv/declenv.hh: .. this new file
as class declarative_environment.
* src/ltlenv/Makefile.am (ltlenv_HEADERS): Add declenv.hh.
(libltlenv_la_SOURCES): Add declenv.cc.
* iface/gspn/dottygspn.cc, iface/gspn/dottyssp.cc,
iface/gspn/gspn.cc, iface/gspn/gspn.hh, iface/gspn/ltlgspn.cc,
iface/gspn/ssp.cc, iface/gspn/ssp.hh: Adjust references
to declarative_environment.

src/ltlenv/Makefile.am

@@ -1,4 +1,4 @@
-## Copyright (C) 2003  Laboratoire d'Informatique de Paris 6 (LIP6),
+## Copyright (C) 2003, 2004  Laboratoire d'Informatique de Paris 6 (LIP6),
 ## département Systèmes Répartis Coopératifs (SRC), Université Pierre
 ## et Marie Curie.
 ##
@@ -25,9 +25,11 @@ AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 ltlenvdir = $(pkgincludedir)/ltlenv
 
 ltlenv_HEADERS = \
+  declenv.hh \
   defaultenv.hh \
   environment.hh
 
 noinst_LTLIBRARIES = libltlenv.la
 libltlenv_la_SOURCES = \
-  defaultenv.cc
+  declenv.cc \
+  defaultenv.cc

src/ltlenv/declenv.cc

@@ -0,0 +1,71 @@
+// Copyright (C) 2004  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 "declenv.hh"
+
+namespace spot
+{
+  namespace ltl
+  {
+
+    declarative_environment::declarative_environment()
+    {
+    }
+
+    declarative_environment::~declarative_environment()
+    {
+      for (prop_map::iterator i = props_.begin(); i != props_.end(); ++i)
+	ltl::destroy(i->second);
+    }
+
+    bool
+    declarative_environment::declare(const std::string& prop_str)
+    {
+      if (props_.find(prop_str) != props_.end())
+	return false;
+      props_[prop_str] = ltl::atomic_prop::instance(prop_str, *this);
+      return true;
+    }
+
+    ltl::formula*
+    declarative_environment::require(const std::string& prop_str)
+    {
+      prop_map::iterator i = props_.find(prop_str);
+      if (i == props_.end())
+	return 0;
+      // It's an atomic_prop, so we do not have to use the clone() visitor.
+      return i->second->ref();
+    }
+
+    const std::string&
+    declarative_environment::name()
+    {
+      static std::string name("declarative environment");
+      return name;
+    }
+
+    const declarative_environment::prop_map&
+    declarative_environment::get_prop_map() const
+    {
+      return props_;
+    }
+  }
+}

src/ltlenv/declenv.hh

@@ -0,0 +1,66 @@
+// Copyright (C) 2004  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_LTLENV_DECLENV_HH
+# define SPOT_LTLENV_DECLENV_HH
+
+# include "environment.hh"
+# include <string>
+# include <map>
+# include "ltlvisit/destroy.hh"
+# include "ltlast/atomic_prop.hh"
+
+namespace spot
+{
+  namespace ltl
+  {
+
+    /// \brief A declarative environment.
+    ///
+    /// This environment recognizes all atomic propositions
+    /// that have been previously declared.  It will reject other.
+    class declarative_environment : public environment
+    {
+    public:
+      declarative_environment();
+      ~declarative_environment();
+
+      /// Declare an atomic proposition.  Return false iff the
+      /// proposition was already declared.
+      bool declare(const std::string& prop_str);
+
+      virtual ltl::formula* require(const std::string& prop_str);
+
+      /// Get the name of the environment.
+      virtual const std::string& name();
+
+      typedef std::map<const std::string, ltl::atomic_prop*> prop_map;
+
+      /// Get the map of atomic proposition known to this environment.
+      const prop_map& get_prop_map() const;
+
+    private:
+      prop_map props_;
+    };
+  }
+}
+
+#endif // SPOT_LTLENV_DECLENV_HH