Merge with master

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

diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh
index a0382d0446b918f0fd9ee16c2928e17ac4a9e394..6ced1f5e216e389a39f0cfed47939a8b342f00ac 100644 (file)
--- a/lily/include/scm-hash.hh
+++ b/lily/include/scm-hash.hh
@@ -1,31 +1,60 @@
-/*   
+/*
   scm-hash.hh -- declare Scheme hasher.
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 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 "lily-guile.hh"
-#include "hash-table.hh"
 #include "smobs.hh"
 
 /**
-   auto resizing hash table. This should come from GUILE.
- */
-class Scheme_hash_table : public Hash_table<SCM,SCM>
+   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_);
+*/
+
+class Scheme_hash_table
 {
-public:  
+public:
+  bool try_retrieve (SCM key, SCM *val);
+  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 &); 
+  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 */