release: 1.4.8

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

diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index 08f90c5aa067c4e256c68e3da9510b5bca2e11d0..09750b51ace1107df9f900dc8a8b317c0bcbfb73 100644 (file)
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -3,35 +3,35 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2000 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 "ly-smobs.icc"
 
 
 Scheme_hash_table::Scheme_hash_table ()
 {
-  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)
 {
-  Scm_stl_map::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)
 {
@@ -39,9 +39,9 @@ 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);
+  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++)
+  for (Scm_stl_map::const_iterator i= me->begin (); i != me->end (); i++)
     {
       scm_gc_mark ((*i).first);
       scm_gc_mark ((*i).second);
@@ -49,23 +49,15 @@ Scheme_hash_table::mark_smob (SCM s)
   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);
+  sprintf (str, "#<Scheme_hash_table 0x%0x ", SCM_UNPACK (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++)
+  Scheme_hash_table *me = unsmob (s);
+  for (Scm_stl_map::const_iterator i = me->begin (); i != me->end (); i++)
     {
       scm_display ((*i).first, p);
       scm_puts (" = ",p);      
@@ -96,35 +88,39 @@ Scheme_hash_table::elem_b (SCM k) const
 void
 Scheme_hash_table::set (SCM k, SCM v)
 {
-  (*this)[k] = v;
-  scm_unprotect_object (v);
+ (*this)[k] = v;
 }
 
 // UGH. 
 SCM
 Scheme_hash_table::get (SCM k)const
 {
-  return (*(Scheme_hash_table*)this)[k]; 
+  return (* (Scheme_hash_table*)this)[k]; 
 }
 
+void
+Scheme_hash_table::remove (SCM k)
+{
+  Scm_stl_map::erase (k);
+}
 
-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++)
+  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_UNSMOB (Scheme_hash_table,scheme_hash);
+IMPLEMENT_SMOBS (Scheme_hash_table);
+IMPLEMENT_DEFAULT_EQUAL_P (Scheme_hash_table);