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 22c630f9cf10da8ca25c202da0db2974a6728e5b..54423b63028a4c4f6fbf7ed30916a825ad9e20d1 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,22 +11,10 @@
 #define SCM_HASH_HH
 
 
-#include <map>
-
 #include "lily-guile.hh"
 #include "smobs.hh"
 
 
-struct SCM_less
-{
-  bool operator () (SCM s1, SCM s2) const
-  {
-    return long (s1) < long (s2);
-  }
-};
-
-typedef map<SCM,SCM, SCM_less> Scm_stl_map;
-
 /**
    auto resizing hash table. 
 
@@ -45,7 +33,7 @@ typedef map<SCM,SCM, SCM_less> Scm_stl_map;
 
    2. UPON DESTRUCTION, DO
 
-   scm_unprotect_object (tab->self_scm_);
+   scm_gc_unprotect_object (tab->self_scm_);
 
 
 
@@ -58,8 +46,9 @@ typedef map<SCM,SCM, SCM_less> Scm_stl_map;
 
   - use GUILE hashtables iso STL.
  */
-class Scheme_hash_table :  private Scm_stl_map
-{
+
+class Scheme_hash_table
+{  
 public:
   bool try_retrieve (SCM key, SCM *val);
   bool elem_b (SCM key) const;
@@ -69,14 +58,19 @@ 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 &);
 
   SCM to_alist () const;
+private:
+  SCM hash_tab_;
+  unsigned elt_count_;
+  
   DECLARE_SMOBS (Scheme_hash_table,foo);
 };
 
+
 #endif /* SCM_HASH_HH */