release: 1.3.131

[lilypond.git] / lily / scm-hash.cc

diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index 83357769fa3c9d26f730e11e34d1bdf1226abb70..cd8841a5ea9f9bb4ae480a2822d88596ad3473f1 100644 (file)
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -3,110 +3,119 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include <stdio.h>
 
 #include "scm-hash.hh"
-#include "hash-table-iter.hh"
+#include "ly-smobs.icc"
+
 
 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::Scheme_hash_table (Scheme_hash_table const &src)
+  : Scm_stl_map (src)
 {
-  Hash_table<SCM,SCM>::operator = (src);
-       
-  // we do not copy the self_scm_ field!
+  smobify_self ();
 }
 
 void
-Scheme_hash_table::do_smobify_self ()
+Scheme_hash_table::operator =(Scheme_hash_table const & src)
 {
+  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
    */
-  //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++)
+  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.key());
-      scm_gc_mark (i.val ());
+      scm_gc_mark ((*i).first);
+      scm_gc_mark ((*i).second);
     }
   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));
+  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 (Hash_table_iter<SCM,SCM> i (*me); i.ok(); i++)
+  Scheme_hash_table *me = unsmob(s);
+  for (Scm_stl_map::const_iterator i = me->begin (); i != me->end(); i++)
     {
-      scm_display (i.key(), p);
+      scm_display ((*i).first, p);
       scm_puts (" = ",p);      
-      scm_display (i.val (), 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 ();
+}
 
 void
 Scheme_hash_table::set (SCM k, SCM v)
 {
-  elem (k ) = v; 
-  scm_unprotect_object (v);
+  (*this)[k] = v;
 }
 
+// UGH. 
 SCM
 Scheme_hash_table::get (SCM k)const
 {
-  return const_elem (k);
+  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 (Hash_table_iter<SCM,SCM> i (*this); i.ok(); i++)
-    l = gh_cons (gh_cons (i.key (), i.val()), l);
+  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);
+IMPLEMENT_DEFAULT_EQUAL_P(Scheme_hash_table);
+
+