X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fscm-hash.hh;h=d14997676add36b8419b022bec71513e7c539b54;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=c2169f3fdb739d726f830038011be658ddb05c07;hpb=9651bafcd832c72a8f81ade4b602199583d61f37;p=lilypond.git

diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh
index c2169f3fdb..d14997676a 100644
--- a/lily/include/scm-hash.hh
+++ b/lily/include/scm-hash.hh
@@ -1,82 +1,67 @@
-/*   
-  scm-hash.hh -- declare Scheme hasher.
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#ifndef SCM_HASH_HH
-#define SCM_HASH_HH
-
-
-#include <map>
-
-#include "lily-guile.hh"
-#include "smobs.hh"
-
-
-struct SCM_less
-{
-  bool operator () (SCM s1, SCM s2) const
-  {
-    return long (s1) < long (s2);
-  }
-};
-
-typedef std::map<SCM,SCM, SCM_less> Scm_stl_map;
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-/**
-   auto resizing hash table. 
+  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.
 
-   1. ALWAYS USE THIS AS VIA A POINTER, i.e.
+  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.
 
-   class Foo {
-    Scheme_hash_table * tab;
-   };
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-   and NOT
+#ifndef SCM_HASH_HH
+#define SCM_HASH_HH
 
-   class Foo {
-    Scheme_hash_table tab;
-   }
+#include "smobs.hh"
 
+/*
+  hash table.
 
-   2. UPON DESTRUCTION, DO
+  1. ALWAYS USE THIS AS VIA A POINTER, i.e.
 
-   scm_unprotect_object (tab->self_scm_);
+  class Foo {
+  Scheme_hash_table * tab;
+  };
 
+  and NOT
 
+  class Foo {
+  Scheme_hash_table tab;
+  }
 
 
-   TODO:
+  2. UPON DESTRUCTION, DO
 
-  - 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.
+  scm_gc_unprotect_object (tab->self_scm_);
+*/
 
-  - use GUILE hashtables iso STL.
- */
-class Scheme_hash_table :  private Scm_stl_map
+class Scheme_hash_table : public Smob<Scheme_hash_table>
 {
 public:
+  int print_smob (SCM, scm_print_state *);
+  SCM mark_smob ();
+  virtual ~Scheme_hash_table ();
   bool try_retrieve (SCM key, SCM *val);
-  bool elem_b (SCM key) const;
-
-  /**
-     WARNING: putting something in assumes responsibility for cleaning
-     up.  */
+  bool contains (SCM key) const;
   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 &);
-
   SCM to_alist () const;
-  DECLARE_SMOBS (Scheme_hash_table,foo);
+
+private:
+  SCM hash_tab_;
+  void copy (Scheme_hash_table const &src);
 };
 
 #endif /* SCM_HASH_HH */
-