release: 1.5.29

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

diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh
index 3bc455f88a9c4ba8360467a993eec75438eecb1b..54423b63028a4c4f6fbf7ed30916a825ad9e20d1 100644 (file)
--- a/lily/include/scm-hash.hh
+++ b/lily/include/scm-hash.hh
@@ -3,39 +3,74 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #ifndef SCM_HASH_HH
 #define SCM_HASH_HH
 
+
 #include "lily-guile.hh"
-#include "hash-table.hh"
 #include "smobs.hh"
 
+
 /**
-   auto resizing hash table. This should come from GUILE.
+   auto resizing hash table. 
+
+   1. ALWAYS USE THIS AS VIA A POINTER, i.e.
+
+   class Foo {
+    Scheme_hash_table * tab;
+   };
+
+   and NOT
+
+   class Foo {
+    Scheme_hash_table tab;
+   }
+
+
+   2. UPON DESTRUCTION, DO
+
+   scm_gc_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 Hash_table<SCM,SCM>
-{
+
+class Scheme_hash_table
+{  
 public:
-  //  bool elem_b (SCM k) const;
-  Hash_table<SCM,SCM>::try_retrieve;
-  Hash_table<SCM,SCM>::elem_b;  
+  bool try_retrieve (SCM key, SCM *val);
+  bool elem_b (SCM key) const;
+
   /**
      WARNING: putting something in assumes responsibility for cleaning
      up.  */
   void set (SCM k, SCM v);
-  SCM get (SCM k);
-  
+  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;
+private:
+  SCM hash_tab_;
+  unsigned elt_count_;
+  
+  DECLARE_SMOBS (Scheme_hash_table,foo);
 };
 
+
 #endif /* SCM_HASH_HH */