X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscm-hash.cc;h=015fc62e02ef253bf4de9fbbf0e7f33833ae3845;hb=aa4e6cdf7c4e830a3389e237620725cea144dbde;hp=ebef9e278c4df024ce9db0c61471c3fe752ca9a4;hpb=fbb6d20e9f58d691ffe845284cbb4d8bacf9ca60;p=lilypond.git

diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index ebef9e278c..015fc62e02 100644
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -1,233 +1,156 @@
-/*   
+/*
   scm-hash.cc --  implement Scheme_hash_table
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-#include <stdio.h>
+
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
 #include "scm-hash.hh"
-#include "hash-table-iter.hh"
 
+#include <cstdio>
 
-#ifdef usestl
+#include "ly-smobs.icc"
+
+/*
+  Return: number of objects.
+ */
+int
+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 ;
+}
 
 
 Scheme_hash_table::Scheme_hash_table ()
 {
-  self_scm_ = SCM_EOL;
+  hash_tab_ = SCM_EOL;
   smobify_self ();
+  hash_tab_ = scm_make_vector (scm_int2num (119), SCM_EOL);
+  elt_count_ = 0;
 }
 
-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;
+  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_);
 }
 
 void
-Scheme_hash_table::do_smobify_self ()
+Scheme_hash_table::operator = (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_);
 }
 
+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*)
 {
-  assert (SMOB_IS_TYPE_B (Scheme_hash_table, s));
+  assert (unsmob (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);        
+  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);
   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);
-}
-
-// UGH. 
-SCM
-Scheme_hash_table::get (SCM k)const
-{
-  return (*(Scheme_hash_table*)this)[k]; 
-}
-
-
-Scheme_hash_table::~Scheme_hash_table( )
-{
-  unsmobify_self ();
-}
-
-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;  
-}
+  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);
 
-#include "ly-smobs.icc"
-IMPLEMENT_UNSMOB(Scheme_hash_table,scheme_hash);
-IMPLEMENT_SMOBS(Scheme_hash_table);
-
-#else
-Scheme_hash_table::Scheme_hash_table ()
-{
-  hash_func_ = ly_scm_hash;
-  self_scm_ = SCM_EOL;
-  smobify_self ();
-}
-
-void
-Scheme_hash_table::operator =(Scheme_hash_table const & src)
-{
-  Hash_table<SCM,SCM>::operator = (src);
-	
-  // we do not copy the self_scm_ field!
-}
-
-void
-Scheme_hash_table::do_smobify_self ()
-{
-}
-
-
-SCM
-Scheme_hash_table::mark_smob (SCM s)
-{
   /*
-    can't typecheck naively, since GC bit lives in CAR of S
-   */
-  //assert (SMOB_IS_TYPE_B (Scheme_hash_table, s));
-  
-  Scheme_hash_table *me = SMOB_TO_TYPE(Scheme_hash_table,s);
-  for (Hash_table_iter<SCM,SCM> i (*me); i.ok(); i++)
+    resize if getting too large.
+  */
+  if (elt_count_ > 2 * scm_c_vector_length (hash_tab_))
     {
-      scm_gc_mark (i.key());
-      scm_gc_mark (i.val ());
+      SCM nh = scm_make_vector (scm_int2num (3* elt_count_+1), SCM_EOL);
+      elt_count_ = copy_scm_hashes (nh, hash_tab_);
+      hash_tab_ = nh;
     }
-  return SCM_EOL;
-}
-
-
-Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
-  : Hash_table<SCM,SCM> (src)
-{
-  hash_func_ = src.hash_func_;
-  self_scm_ = SCM_EOL;
-  smobify_self ();
-}
-
-int
-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 (Hash_table_iter<SCM,SCM> i (*me); i.ok(); i++)
-    {
-      scm_display (i.key(), p);
-      scm_puts (" = ",p);      
-      scm_display (i.val (), p);
-      scm_puts ("\n",p);            
-    }
-  scm_puts ("> ",p);        
-  return 1;
-}
-
-
-void
-Scheme_hash_table::set (SCM k, SCM v)
-{
-  elem (k ) = v; 
-  scm_unprotect_object (v);
 }
 
+// UGH.
 SCM
-Scheme_hash_table::get (SCM k)const
+Scheme_hash_table::get (SCM k) const
 {
-  return const_elem (k);
+  /*
+    42 will stick out like a sore thumb, hopefully.
+   */
+  return scm_hashq_ref (hash_tab_, k, scm_from_int (42));
 }
 
-
-Scheme_hash_table::~Scheme_hash_table( )
+void
+Scheme_hash_table::remove (SCM k)
 {
-  unsmobify_self ();
+  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. */
 }
 
 SCM
 Scheme_hash_table::to_alist () const
 {
-  SCM l = SCM_EOL;
-  for (Hash_table_iter<SCM,SCM> i (*this); i.ok(); i++)
-    l = gh_cons (gh_cons (i.key (), i.val()), l);
-  return l;  
+  SCM lst = SCM_EOL;
+  for (int i = scm_c_vector_length (hash_tab_); i--;)
+    for (SCM s = scm_vector_ref (hash_tab_, scm_int2num (i)); scm_is_pair (s);
+	 s = scm_cdr (s))
+      lst = scm_acons (scm_caar (s), scm_cdar (s), lst);
+  return lst;
 }
 
-
-#include "ly-smobs.icc"
-IMPLEMENT_UNSMOB(Scheme_hash_table,scheme_hash);
-IMPLEMENT_SMOBS(Scheme_hash_table);
-#endif
+IMPLEMENT_SMOBS (Scheme_hash_table);
+IMPLEMENT_DEFAULT_EQUAL_P (Scheme_hash_table);