release: 1.3.92

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

diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh
index bc5fbafd9178f73761260a2ce2c5de46e5a0e91d..a19ed279e777a8b415063979328fbd1cd6fe2eaf 100644 (file)
--- a/lily/include/scm-hash.hh
+++ b/lily/include/scm-hash.hh
@@ -14,10 +14,8 @@
 #include <map>
 
 #include "lily-guile.hh"
-#include "hash-table.hh"
 #include "smobs.hh"
 
-#define usestl
 
 struct SCM_less
 {
@@ -30,20 +28,40 @@ struct SCM_less
 typedef map<SCM,SCM, SCM_less> Scm_stl_map;
 
 /**
-   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_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.
+   
  */
 class Scheme_hash_table :  private Scm_stl_map
 {
 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
-
 
   /**
      WARNING: putting something in assumes responsibility for cleaning
@@ -54,9 +72,9 @@ public:
   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;
+  DECLARE_SMOBS(Scheme_hash_table,foo);
 };
 
 #endif /* SCM_HASH_HH */