X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscm-hash.cc;h=ed3345b5acff86c055ef72b404c48e4be8f4c4a9;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=dd3873d3b073aa22f2c44fff7430eb0f6cb1dc26;hpb=c4905a1f5b840d2b9f625e79a340e2a3a23dba08;p=lilypond.git

diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index dd3873d3b0..ed3345b5ac 100644
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -1,67 +1,68 @@
-/*   
-  scm-hash.cc --  implement Scheme_hash_table
-  
+/*
+  scm-hash.cc -- implement Scheme_hash_table
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-#include <stdio.h>
+
+  (c) 1999--2008 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.
- */
-int
-copy_scm_hashes (SCM dest, SCM src)
+*/
+SCM
+copy_handle (void *closure, SCM handle)
 {
-  int k = 0;
-  for (int i = SCM_VECTOR_LENGTH (src); i--;)
-    for (SCM s = scm_vector_ref (src, scm_from_int (i)); ly_c_pair_p (s); s = ly_cdr (s))
-      {
-	scm_hashq_set_x (dest, ly_caar (s), ly_cdar (s));
-	k++;
-      }
-  return k ;
+  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_make_vector (scm_int2num (119), SCM_EOL);
-  elt_count_ = 0;
+  hash_tab_ = scm_c_make_hash_table (119);
 }
 
-
 Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
-
 {
   hash_tab_ = SCM_EOL;
-  elt_count_ = 0;
   smobify_self ();
-
-  hash_tab_ = scm_make_vector (scm_int2num (src.elt_count_ >? 11 ), SCM_EOL);  
-  elt_count_ = copy_scm_hashes (hash_tab_, src.hash_tab_);
+  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_make_vector (scm_int2num (src.elt_count_ >? 11), SCM_EOL);  
-  elt_count_ = copy_scm_hashes (hash_tab_, src.hash_tab_);
+
+  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)
 {
-  Scheme_hash_table *me = (Scheme_hash_table*) SCM_CELL_WORD_1 (s);
+  Scheme_hash_table *me = (Scheme_hash_table *) SCM_CELL_WORD_1 (s);
   scm_gc_mark (me->hash_tab_);
   return SCM_EOL;
 }
@@ -70,98 +71,66 @@ 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%0lx ", SCM_UNPACK (s));
-  Scheme_hash_table *me = (Scheme_hash_table*) SCM_CELL_WORD_1 (s);
-  scm_display (me->hash_tab_, 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)
-{
+Scheme_hash_table::try_retrieve (SCM k, SCM *v){
+
   SCM handle = scm_hashq_get_handle (hash_tab_, k);
-  if (ly_c_pair_p (handle))
+  if (scm_is_pair (handle))
     {
-      *v = ly_cdr (handle);
+      *v = scm_cdr (handle);
       return true;
     }
   else
     return false;
-
 }
 
 bool
 Scheme_hash_table::contains (SCM k) const
 {
-  return ly_c_pair_p (scm_hashq_get_handle (hash_tab_, k));
+  return scm_is_pair (scm_hashq_get_handle (hash_tab_, k));
 }
 
 void
 Scheme_hash_table::set (SCM k, SCM v)
 {
-  assert (ly_c_symbol_p (k));
+  assert (scm_is_symbol (k));
   SCM handle = scm_hashq_create_handle_x (hash_tab_, k, SCM_UNDEFINED);
-  if (ly_cdr (handle) == SCM_UNDEFINED)
-    {
-      elt_count_++;
-    }
-  
   scm_set_cdr_x (handle, v);
-
-  /*
-    resize if getting too large.
-  */
-  if (elt_count_ > 2 * SCM_VECTOR_LENGTH (hash_tab_))
-    {
-      SCM nh = scm_make_vector (scm_int2num (3* elt_count_+1), SCM_EOL);
-      elt_count_ = copy_scm_hashes (nh, hash_tab_);
-      hash_tab_ = nh;
-    }
 }
 
-// UGH. 
 SCM
 Scheme_hash_table::get (SCM k) const
 {
-  /*
-    42 will stick out like a sore thumb, hopefully.
-   */
-  return scm_hashq_ref (hash_tab_, k, scm_from_int (42));
+  /* 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);
-  /*
-    don't decrease elt_count_ , as this may cause underflow. The exact
-    value of elt_count_ is not important.
-   */
 }
 
-Scheme_hash_table::~Scheme_hash_table ()
+static SCM
+collect_handles (void *closure, SCM key, SCM value, SCM result)
 {
+  (void) closure;
+  return scm_acons(key, value, result);
 }
 
 SCM
 Scheme_hash_table::to_alist () const
 {
-  SCM l = SCM_EOL;
-  for (int i = SCM_VECTOR_LENGTH (hash_tab_); i--;)
-    for (SCM s = scm_vector_ref (hash_tab_, scm_int2num (i)); ly_c_pair_p (s); s = ly_cdr (s))
-      {
-	l = scm_acons (ly_caar (s), ly_cdar (s), l);
-      }
-  return l;  
+  return scm_internal_hash_fold ((SCM (*)(GUILE_ELLIPSIS)) &collect_handles, NULL, SCM_EOL, hash_tab_);
 }
 
-
-
-
-
 IMPLEMENT_SMOBS (Scheme_hash_table);
 IMPLEMENT_DEFAULT_EQUAL_P (Scheme_hash_table);
-
-