X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Finclude%2Fscm-hash.hh;h=6ced1f5e216e389a39f0cfed47939a8b342f00ac;hb=4063c4f664e044181e416857e999cb07391c3e33;hp=7a903469c1dc537de3010f30c9ea62a520dae09d;hpb=ee7a5648ebcede3c2775d944dd91e8e33dfeabad;p=lilypond.git

diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh
index 7a903469c1..6ced1f5e21 100644
--- a/lily/include/scm-hash.hh
+++ b/lily/include/scm-hash.hh
@@ -1,65 +1,60 @@
-/*   
+/*
   scm-hash.hh -- declare Scheme hasher.
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #ifndef SCM_HASH_HH
 #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. 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;
+   Scheme_hash_table * tab;
    };
 
    and NOT
 
    class Foo {
-    Scheme_hash_table tab;
+   Scheme_hash_table tab;
    }
- */
-class Scheme_hash_table :  private Scm_stl_map
+
+
+   2. UPON DESTRUCTION, DO
+
+   scm_gc_unprotect_object (tab->self_scm_);
+*/
+
+class Scheme_hash_table
 {
 public:
   bool try_retrieve (SCM key, SCM *val);
-  bool elem_b (SCM key) const;
+  bool contains (SCM key) const;
 
   /**
      WARNING: putting something in assumes responsibility for cleaning
      up.  */
   void set (SCM k, SCM v);
-  SCM get (SCM k) const; 
-  
+  SCM get (SCM k) const;
+  void remove (SCM k);
   Scheme_hash_table ();
-  void operator = (Scheme_hash_table const &); 
+  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);
 };
 
 #endif /* SCM_HASH_HH */