-/*
+/*
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 "smobs.hh"
-#include <map>
+/**
+ auto resizing hash table.
-#include "lily-guile.hh"
-#include "hash-table.hh"
-#include "smobs.hh"
+ 1. ALWAYS USE THIS AS VIA A POINTER, i.e.
-#define usestl
+ class Foo {
+ Scheme_hash_table * tab;
+ };
-struct SCM_less
-{
- bool operator () (SCM s1, SCM s2) const
- {
- return long(s1) < long (s2);
- }
-};
+ and NOT
-typedef map<SCM,SCM, SCM_less> Scm_stl_map;
+ class Foo {
+ Scheme_hash_table tab;
+ }
-/**
- auto resizing hash table. This should come from GUILE.
- */
-class Scheme_hash_table : private Scm_stl_map
+
+ 2. UPON DESTRUCTION, DO
+
+ scm_gc_unprotect_object (tab->self_scm_);
+*/
+
+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;
-
+ 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 */