release: 1.3.131

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

diff --git a/lily/include/scope.hh b/lily/include/scope.hh
index f9980f2db87c0174c2286d23be252b577efbbf69..7420997a49e97806a885ce785a4fd3ca67ac25fd 100644 (file)
--- a/lily/include/scope.hh
+++ b/lily/include/scope.hh
@@ -3,23 +3,35 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #ifndef SCOPE_HH
 #define SCOPE_HH
 
-#include "dictionary.hh"
 #include "lily-proto.hh"
+#include "lily-guile.hh"
 
-class Scope : public Dictionary<Identifier*> {
-public:
-  void print () const;
-  Scope ();
+class Scheme_hash_table;
+class Scope {
+  Scheme_hash_table *id_dict_;
   Scope (Scope const &);
-  ~Scope ();
-};
+public:
+  SCM to_alist () const; 
+  bool elem_b (String ) const;
+  bool elem_b (SCM s) const;
+
+  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*);
+  
+  friend class Scope_iter;
+};
 #endif /* SCOPE_HH */