-/*
- scm-hash.hh -- declare Scheme hasher.
-
- source file of the GNU LilyPond music typesetter
-
- (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+/*
+ This file is part of LilyPond, the GNU music typesetter.
+
+ Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
+*/
#ifndef SCM_HASH_HH
#define SCM_HASH_HH
-#include "lily-guile.hh"
-#include "hash-table.hh"
-#include "smobs.hh"
+#include "small-smobs.hh"
+
+/*
+ hash table.
+
+ 1. ALWAYS USE THIS AS VIA A POINTER, i.e.
+
+ class Foo {
+ Scheme_hash_table * tab;
+ };
-/**
- auto resizing hash table. This should come from GUILE.
- */
-class Scheme_hash_table : private Hash_table<SCM,SCM>
+ and NOT
+
+ class Foo {
+ Scheme_hash_table tab;
+ }
+
+
+ 2. UPON DESTRUCTION, DO
+
+ scm_gc_unprotect_object (tab->self_scm_);
+*/
+
+class Scheme_hash_table : public Smob1<Scheme_hash_table>
{
public:
- // bool elem_b (SCM k) const;
- Hash_table<SCM,SCM>::try_retrieve;
- Hash_table<SCM,SCM>::elem_b;
- /**
- WARNING: putting something in assumes responsibility for cleaning
- up. */
+ int print_smob (SCM, scm_print_state *) const;
+ bool try_retrieve (SCM key, SCM *val);
+ bool contains (SCM key) const;
void set (SCM k, SCM v);
- SCM get (SCM k) const;
-
- Scheme_hash_table ();
- void operator = (Scheme_hash_table const &);
- Scheme_hash_table (Scheme_hash_table const &);
- virtual ~Scheme_hash_table ();
- DECLARE_SMOBS;
+ SCM get (SCM k) const;
+ void remove (SCM k);
+ void operator = (Scheme_hash_table const &);
SCM to_alist () const;
+ static SCM make_smob ();
+
+private:
+ SCM &hash_tab () const { return scm1 (); }
};
#endif /* SCM_HASH_HH */
-