release: 1.3.131

[lilypond.git] / lily / include / scope.hh

diff --git a/lily/include/scope.hh b/lily/include/scope.hh
index f1f4d8a1dc6619659161a5c57d7825c0a1ef76d1..7420997a49e97806a885ce785a4fd3ca67ac25fd 100644 (file)
--- a/lily/include/scope.hh
+++ b/lily/include/scope.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -16,22 +16,21 @@
 class Scheme_hash_table;
 class Scope {
   Scheme_hash_table *id_dict_;
+  Scope (Scope const &);
 public:
   SCM to_alist () const; 
   bool elem_b (String ) const;
   bool elem_b (SCM s) const;
-  Identifier *elem (String) const;
-  Identifier *elem (SCM) const;
 
+  bool try_retrieve (SCM key, SCM *val) const;
+  
   SCM scm_elem (String) const;
   SCM scm_elem (SCM) const;
 
-  void set (String, Identifier *);
+
   void set (String, SCM);  
-  Scope ();
+  Scope (Scheme_hash_table*);
   
-  Scope (Scope const &);
-  ~Scope ();
   friend class Scope_iter;
 };
 #endif /* SCOPE_HH */