release: 1.3.142

[lilypond.git] / lily / include / scm-hash.hh

diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh
index 7a903469c1dc537de3010f30c9ea62a520dae09d..5215476963749460ed3201b81440538726e9c146 100644 (file)
--- a/lily/include/scm-hash.hh
+++ b/lily/include/scm-hash.hh
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -19,18 +19,18 @@
 
 struct SCM_less
 {
-  bool operator  () (SCM s1, SCM s2) const
+  bool operator () (SCM s1, SCM s2) const
   {
-    return long(s1) < long (s2);
+    return long (s1) < long (s2);
   }
 };
 
 typedef map<SCM,SCM, SCM_less> Scm_stl_map;
 
 /**
-   auto resizing hash table. This should come from GUILE.
+   auto resizing hash table. 
 
-   ALWAYS USE THIS AS VIA A POINTER, i.e.
+   1. ALWAYS USE THIS AS VIA A POINTER, i.e.
 
    class Foo {
     Scheme_hash_table * tab;
@@ -41,6 +41,22 @@ typedef map<SCM,SCM, SCM_less> Scm_stl_map;
    class Foo {
     Scheme_hash_table tab;
    }
+
+
+   2. UPON DESTRUCTION, DO
+
+   scm_unprotect_object (tab->self_scm_);
+
+
+
+
+   TODO:
+
+  - This should come from GUILE. We're typically doing double work,
+   because KEY already is a symbol, and is looked up in a symbol
+   hashtable.
+
+  - use GUILE hashtables iso STL.
  */
 class Scheme_hash_table :  private Scm_stl_map
 {
@@ -53,13 +69,13 @@ public:
      up.  */
   void set (SCM k, SCM v);
   SCM get (SCM k) const; 
-  
+  void remove (SCM k);
   Scheme_hash_table ();
   void operator = (Scheme_hash_table const &); 
   Scheme_hash_table (Scheme_hash_table const &);
-  virtual ~Scheme_hash_table ();
-  DECLARE_SMOBS;
+
   SCM to_alist () const;
+  DECLARE_SMOBS (Scheme_hash_table,foo);
 };
 
 #endif /* SCM_HASH_HH */