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

diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index ebef9e278c..d3a8d7f9bd 100644
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -1,233 +1,138 @@
-/*   
-  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>
+/*
+  scm-hash.cc -- implement Scheme_hash_table
 
-#include "scm-hash.hh"
-#include "hash-table-iter.hh"
+  source file of the GNU LilyPond music typesetter
 
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-#ifdef usestl
+#include "scm-hash.hh"
 
+#include <cstdio>
+#include <algorithm>
+using namespace std;
 
-Scheme_hash_table::Scheme_hash_table ()
-{
-  self_scm_ = SCM_EOL;
-  smobify_self ();
-}
+#include "ly-smobs.icc"
 
-void
-Scheme_hash_table::operator =(Scheme_hash_table const & src)
+/*
+  Return: number of objects.
+*/
+SCM
+copy_handle (void *closure, SCM handle)
 {
-  Scm_stl_map::operator = (src);
-	
-  // we do not copy the self_scm_ field!
+  SCM tab = (SCM) closure;
+  scm_hashq_set_x (tab, scm_car (handle), scm_cdr (handle));
+  return tab;
 }
 
-void
-Scheme_hash_table::do_smobify_self ()
+static void
+copy_scm_hashes (SCM dest, SCM src)
 {
+  scm_internal_hash_for_each_handle (  (SCM (*)(GUILE_ELLIPSIS)) &copy_handle, dest, src);
 }
 
-
-SCM
-Scheme_hash_table::mark_smob (SCM s)
+Scheme_hash_table::Scheme_hash_table ()
 {
-  /*
-    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);
-    }
-  return SCM_EOL;
+  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)
 {
-  self_scm_ = SCM_EOL;
+  hash_tab_ = 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 (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);        
-  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;
-}
-
-bool
-Scheme_hash_table::elem_b (SCM k) const
-{
-  Scm_stl_map::const_iterator i (find (k));
-  return i != end ();
+  copy (src);
 }
 
 void
-Scheme_hash_table::set (SCM k, SCM v)
+Scheme_hash_table::copy (Scheme_hash_table const &src)
 {
-  (*this)[k] = v;
-  scm_unprotect_object (v);
-}
+  if (&src == this)
+    return;
 
-// UGH. 
-SCM
-Scheme_hash_table::get (SCM k)const
-{
-  return (*(Scheme_hash_table*)this)[k]; 
+  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( )
+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;  
-}
-
-
-#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)
+Scheme_hash_table::mark_smob (SCM s)
 {
-  Hash_table<SCM,SCM>::operator = (src);
-	
-  // we do not copy the self_scm_ field!
+  Scheme_hash_table *me = (Scheme_hash_table *) SCM_CELL_WORD_1 (s);
+  scm_gc_mark (me->hash_tab_);
+  return SCM_EOL;
 }
 
-void
-Scheme_hash_table::do_smobify_self ()
+int
+Scheme_hash_table::print_smob (SCM s, 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_puts ("> ", p);
+  return 1;
 }
 
+bool
+Scheme_hash_table::try_retrieve (SCM k, SCM *v){
 
-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++)
+  SCM handle = scm_hashq_get_handle (hash_tab_, k);
+  if (scm_is_pair (handle))
     {
-      scm_gc_mark (i.key());
-      scm_gc_mark (i.val ());
+      *v = scm_cdr (handle);
+      return true;
     }
-  return SCM_EOL;
+  else
+    return false;
 }
 
-
-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*)
+bool
+Scheme_hash_table::contains (SCM k) const
 {
-  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;
+  return scm_is_pair (scm_hashq_get_handle (hash_tab_, k));
 }
 
-
 void
 Scheme_hash_table::set (SCM k, SCM v)
 {
-  elem (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);
 }
 
 SCM
-Scheme_hash_table::get (SCM k)const
+Scheme_hash_table::get (SCM k) const
 {
-  return const_elem (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 (Hash_table_iter<SCM,SCM> i (*this); i.ok(); i++)
-    l = gh_cons (gh_cons (i.key (), i.val()), l);
-  return l;  
+  return scm_internal_hash_fold ((SCM (*)(GUILE_ELLIPSIS)) &collect_handles, NULL, SCM_EOL, hash_tab_);
 }
 
-
-#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);