2003 -> 2004

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

diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh
index bc5fbafd9178f73761260a2ce2c5de46e5a0e91d..c5c2769e67ac646531bb748053d5ef71790a79c6 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,53 +11,56 @@
 #define SCM_HASH_HH
 
 
-#include <map>
-
 #include "lily-guile.hh"
-#include "hash-table.hh"
 #include "smobs.hh"
 
-#define usestl
 
-struct SCM_less
-{
-  bool operator  () (SCM s1, SCM s2) const
-  {
-    return long(s1) < long (s2);
-  }
-};
+/**
+   auto resizing hash table. 
 
-typedef map<SCM,SCM, SCM_less> Scm_stl_map;
+   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_);
 
-/**
-   auto resizing hash table. This should come from GUILE.
  */
-class Scheme_hash_table :  private Scm_stl_map
-{
+
+class Scheme_hash_table
+{  
 public:
-#ifndef usestl 
-  //  bool elem_b (SCM k) const;
-  Hash_table<SCM,SCM>::try_retrieve;
-  Hash_table<SCM,SCM>::elem_b;  
-#else
   bool try_retrieve (SCM key, SCM *val);
-  bool elem_b (SCM key) const;
-#endif
-
+  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; 
-  
+  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 */