X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscm-hash.cc;h=83e937bc5890824afd286f0ec2ab9f7b78e7a6af;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=8a2094b86ee7508b246f70f70417fbf0981bb6ed;hpb=e4f07a592ebde9621dede5a47430a51b9c232eb3;p=lilypond.git

diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index 8a2094b86e..83e937bc58 100644
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -1,130 +1,152 @@
-/*   
-  scm-hash.cc --  implement Scheme_hash_table
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-#include <stdio.h>
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1999--2014 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/>.
+*/
 
 #include "scm-hash.hh"
-#include "hash-table-iter.hh"
 
+#include <cstdio>
+#include <algorithm>
+using namespace std;
+
+#include "ly-smobs.icc"
+
+/*
+  Return: number of objects.
+*/
+SCM
+copy_handle (void *closure, SCM handle)
+{
+  SCM tab = (SCM) closure;
+  scm_hashq_set_x (tab, scm_car (handle), scm_cdr (handle));
+  return tab;
+}
+
+static void
+copy_scm_hashes (SCM dest, SCM src)
+{
+  scm_internal_hash_for_each_handle ((scm_t_hash_handle_fn) &copy_handle,
+                                     dest, src);
+}
 
 Scheme_hash_table::Scheme_hash_table ()
 {
-  self_scm_ = SCM_EOL;
+  hash_tab_ = SCM_EOL;
   smobify_self ();
+  hash_tab_ = scm_c_make_hash_table (119);
 }
 
-void
-Scheme_hash_table::operator =(Scheme_hash_table const & src)
+Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
 {
-  Scm_stl_map::operator = (src);
-	
-  // we do not copy the self_scm_ field!
+  hash_tab_ = SCM_EOL;
+  smobify_self ();
+  copy (src);
 }
 
 void
-Scheme_hash_table::do_smobify_self ()
+Scheme_hash_table::copy (Scheme_hash_table const &src)
 {
+  if (&src == this)
+    return;
+
+  hash_tab_ = scm_c_make_hash_table (SCM_HASHTABLE_N_ITEMS (src.hash_tab_));
+  copy_scm_hashes (hash_tab_, src.hash_tab_);
 }
 
+Scheme_hash_table::~Scheme_hash_table ()
+{
+}
 
 SCM
 Scheme_hash_table::mark_smob (SCM s)
 {
-  /*
-    can't typecheck naively, since GC bit lives in CAR of S
-   */
-  
-  Scheme_hash_table *me = SMOB_TO_TYPE(Scheme_hash_table,s);
-
-  for (Scm_stl_map::const_iterator i= me->begin (); i != me->end(); i++)
-    {
-      scm_gc_mark ((*i).first);
-      scm_gc_mark ((*i).second);
-    }
+  Scheme_hash_table *me = (Scheme_hash_table *) SCM_CELL_WORD_1 (s);
+  scm_gc_mark (me->hash_tab_);
   return SCM_EOL;
 }
 
-
-Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
-  : Scm_stl_map (src)
-{
-  self_scm_ = SCM_EOL;
-  smobify_self ();
-}
-
 int
-Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*)
+Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state *)
 {
-  assert (SMOB_IS_TYPE_B (Scheme_hash_table, s));
-  char str[1000];
-  sprintf (str, "#<Scheme_hash_table 0x%0x ", s);
-  scm_puts (str, p);      
-  Scheme_hash_table *me = SMOB_TO_TYPE(Scheme_hash_table,s);
-  for (Scm_stl_map::const_iterator i = me->begin (); i != me->end(); i++)
-    {
-      scm_display ((*i).first, p);
-      scm_puts (" = ",p);      
-      scm_display ((*i).second, p);
-      scm_puts ("\n",p);            
-    }
-  scm_puts ("> ",p);        
+  assert (unsmob (s));
+  scm_puts ("#<Scheme_hash_table  ", p);
+  Scheme_hash_table *me = (Scheme_hash_table *) SCM_CELL_WORD_1 (s);
+  scm_display (me->hash_tab_, p);
+  scm_puts ("> ", p);
   return 1;
 }
 
 bool
 Scheme_hash_table::try_retrieve (SCM k, SCM *v)
 {
-  Scm_stl_map ::const_iterator i (find (k));
-  bool found = i != end ();
-  if (found)
-    *v = (*i).second;
-  return found;
+
+  SCM handle = scm_hashq_get_handle (hash_tab_, k);
+  if (scm_is_pair (handle))
+    {
+      *v = scm_cdr (handle);
+      return true;
+    }
+  else
+    return false;
 }
 
 bool
-Scheme_hash_table::elem_b (SCM k) const
+Scheme_hash_table::contains (SCM k) const
 {
-  Scm_stl_map::const_iterator i (find (k));
-  return i != end ();
+  return scm_is_pair (scm_hashq_get_handle (hash_tab_, k));
 }
 
 void
 Scheme_hash_table::set (SCM k, SCM v)
 {
-  (*this)[k] = v;
-  scm_unprotect_object (v);
+  assert (scm_is_symbol (k));
+  SCM handle = scm_hashq_create_handle_x (hash_tab_, k, SCM_UNDEFINED);
+  scm_set_cdr_x (handle, v);
 }
 
-// UGH. 
 SCM
-Scheme_hash_table::get (SCM k)const
+Scheme_hash_table::get (SCM k) const
 {
-  return (*(Scheme_hash_table*)this)[k]; 
+  /* SCM_UNSPECIFIED will stick out like a sore thumb, hopefully.
+  */
+  return scm_hashq_ref (hash_tab_, k, SCM_UNSPECIFIED);
 }
 
+void
+Scheme_hash_table::remove (SCM k)
+{
+  scm_hashq_remove_x (hash_tab_, k);
+}
 
-Scheme_hash_table::~Scheme_hash_table( )
+static SCM
+collect_handles (void * /* closure */,
+                 SCM key,
+                 SCM value,
+                 SCM result)
 {
-  unsmobify_self ();
+  return scm_acons (key, value, result);
 }
 
 SCM
 Scheme_hash_table::to_alist () const
 {
-  SCM l = SCM_EOL;
-  for (Scm_stl_map ::const_iterator i = begin (); i != end(); i++)
-    l = gh_cons (gh_cons ((*i).first, (*i).second), l);
-  return l;  
+  return scm_internal_hash_fold ((scm_t_hash_fold_fn) &collect_handles,
+                                 NULL, SCM_EOL, hash_tab_);
 }
 
-
-#include "ly-smobs.icc"
-IMPLEMENT_UNSMOB(Scheme_hash_table,scheme_hash);
-IMPLEMENT_SMOBS(Scheme_hash_table);
-
-
+IMPLEMENT_SMOBS (Scheme_hash_table);
+IMPLEMENT_DEFAULT_EQUAL_P (Scheme_hash_table);