X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscm-hash.cc;h=4013af327913b44da4b2dc38a0eb182d0f15a824;hb=38d7d319eabc906e82fb42002678c6d42a23b6f7;hp=08cac970949a14a460360f7035c68583e95e2c71;hpb=31a43e122332d7a8e703ff5f01286eacc4ea7a27;p=lilypond.git

diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index 08cac97094..4013af3279 100644
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -1,51 +1,69 @@
-/*   
-  scm-hash.cc --  implement Scheme_hash_table
-  
+/*
+  scm-hash.cc -- implement Scheme_hash_table
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-#include <stdio.h>
+
+  (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #include "scm-hash.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 (*)(GUILE_ELLIPSIS)) &copy_handle, dest, src);
+}
 
 Scheme_hash_table::Scheme_hash_table ()
 {
+  hash_tab_ = SCM_EOL;
   smobify_self ();
+  hash_tab_ = scm_c_make_hash_table (119);
 }
 
-
 Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
-  : Scm_stl_map (src)
 {
+  hash_tab_ = SCM_EOL;
   smobify_self ();
+  copy (src);
 }
 
 void
-Scheme_hash_table::operator = (Scheme_hash_table const & src)
+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_stl_map::operator = (src);
-	
-  // we do not copy the self_scm () field!
 }
 
 SCM
 Scheme_hash_table::mark_smob (SCM s)
 {
-  /*
-    can't typecheck naively, since GC bit lives in CAR of S
-   */
-  
-  Scheme_hash_table *me = (Scheme_hash_table*) SCM_CELL_WORD_1 (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;
 }
 
@@ -53,74 +71,68 @@ int
 Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*)
 {
   assert (unsmob (s));
-  char str[1000];
-  sprintf (str, "#<Scheme_hash_table 0x%0x ", s);
-  scm_puts (str, p);      
-  Scheme_hash_table *me = unsmob (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);        
+  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;
+Scheme_hash_table::try_retrieve (SCM k, SCM *v){
+
+  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;
+  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_stl_map::erase (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)
 {
+  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 (*)(GUILE_ELLIPSIS)) &collect_handles, NULL, SCM_EOL, hash_tab_);
 }
 
-
-
-IMPLEMENT_UNSMOB (Scheme_hash_table,scheme_hash);
 IMPLEMENT_SMOBS (Scheme_hash_table);
 IMPLEMENT_DEFAULT_EQUAL_P (Scheme_hash_table);
-
-