release: 1.5.27

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

diff --git a/lily/include/scope.hh b/lily/include/scope.hh
index 2fef19f932f2aa53ec53761f630695501536580d..de78dd335256325dbb97cc8d31d762de0b520d02 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>
   
  */
 
@@ -14,33 +14,28 @@
 #include "lily-guile.hh"
 
 class Scheme_hash_table;
+
+/*
+ Junk this almost-void class. 
+ */
 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;  
-  void set (String, Identifier *);
-  Scope ();
+
+  bool try_retrieve (SCM key, SCM *val) const;
+  
+  SCM scm_elem (String) const;
+  SCM scm_elem (SCM) const;
+
+
+  void set (String, SCM);  
+  Scope (Scheme_hash_table*);
   
-  Scope (Scope const &);
-  ~Scope ();
   friend class Scope_iter;
 };
-#if 0
-class Scope_iter {
-  Hash_table_iter<Protected_scm,Identifier*> * iter_;
-public:
-  void operator ++(int);
-  bool ok ()const;
-  Scope_iter(Scope const&);
-  String key () const;
-  Identifier* val () const;
-  SCM scm_key () const;
-};
-
-#endif
 #endif /* SCOPE_HH */