X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscm-hash.cc;h=5eb048f6d177694dda7bb88873b5286bc6fdbd57;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=91a4795bf875668adc8dedda23be14e446e0c143;hpb=4b975f3177880e16e759f67be4517f67109c2633;p=lilypond.git

diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index 91a4795bf8..5eb048f6d1 100644
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -1,63 +1,70 @@
 /*
-  scm-hash.cc -- implement Scheme_hash_table
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.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 <cstdio>
 #include <algorithm>
+using namespace std;
 
-#include "ly-smobs.icc"
-
-using namespace std; 
 
 /*
   Return: number of objects.
 */
-int
+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)
 {
-  int k = 0;
-  for (int i = scm_c_vector_length (src); i--;)
-    for (SCM s = scm_vector_ref (src, scm_from_int (i)); scm_is_pair (s); s = scm_cdr (s))
-      {
-	scm_hashq_set_x (dest, scm_caar (s), scm_cdar (s));
-	k++;
-      }
-  return k;
+  scm_internal_hash_for_each_handle ((scm_t_hash_handle_fn) &copy_handle,
+                                     dest, src);
 }
 
 Scheme_hash_table::Scheme_hash_table ()
 {
   hash_tab_ = SCM_EOL;
   smobify_self ();
-  hash_tab_ = scm_make_vector (scm_from_int (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)
-
+  : Smob<Scheme_hash_table> ()
 {
   hash_tab_ = SCM_EOL;
-  elt_count_ = 0;
   smobify_self ();
-
-  hash_tab_ = scm_make_vector (scm_from_int (max ((int) 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_from_int (max ((int) 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 ()
@@ -65,20 +72,17 @@ Scheme_hash_table::~Scheme_hash_table ()
 }
 
 SCM
-Scheme_hash_table::mark_smob (SCM s)
+Scheme_hash_table::mark_smob ()
 {
-  Scheme_hash_table *me = (Scheme_hash_table *) SCM_CELL_WORD_1 (s);
-  scm_gc_mark (me->hash_tab_);
+  scm_gc_mark (hash_tab_);
   return SCM_EOL;
 }
 
 int
-Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*)
+Scheme_hash_table::print_smob (SCM p, scm_print_state *)
 {
-  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_display (hash_tab_, p);
   scm_puts ("> ", p);
   return 1;
 }
@@ -86,6 +90,7 @@ Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*)
 bool
 Scheme_hash_table::try_retrieve (SCM k, SCM *v)
 {
+
   SCM handle = scm_hashq_get_handle (hash_tab_, k);
   if (scm_is_pair (handle))
     {
@@ -107,50 +112,35 @@ Scheme_hash_table::set (SCM k, SCM v)
 {
   assert (scm_is_symbol (k));
   SCM handle = scm_hashq_create_handle_x (hash_tab_, k, SCM_UNDEFINED);
-  if (scm_cdr (handle) == SCM_UNDEFINED)
-    elt_count_++;
-
   scm_set_cdr_x (handle, v);
-
-  /*
-    resize if getting too large.
-  */
-  if (elt_count_ > 2 * scm_c_vector_length (hash_tab_))
-    {
-      SCM nh = scm_make_vector (scm_from_int (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.
+  /* SCM_UNSPECIFIED will stick out like a sore thumb, hopefully.
   */
-  return scm_hashq_ref (hash_tab_, k, scm_from_int (42));
+  return scm_hashq_ref (hash_tab_, k, SCM_UNSPECIFIED);
 }
 
 void
 Scheme_hash_table::remove (SCM k)
 {
   scm_hashq_remove_x (hash_tab_, k);
-  /* Do not decrease elt_count_ as this may cause underflow.  The exact
-     value of elt_count_ is not important. */
+}
+
+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 lst = SCM_EOL;
-  for (int i = scm_c_vector_length (hash_tab_); i--;)
-    for (SCM s = scm_vector_ref (hash_tab_, scm_from_int (i)); scm_is_pair (s);
-	 s = scm_cdr (s))
-      lst = scm_acons (scm_caar (s), scm_cdar (s), lst);
-  return lst;
+  return scm_internal_hash_fold ((scm_t_hash_fold_fn) &collect_handles,
+                                 NULL, SCM_EOL, hash_tab_);
 }
-
-IMPLEMENT_SMOBS (Scheme_hash_table);
-IMPLEMENT_DEFAULT_EQUAL_P (Scheme_hash_table);