patch::: 1.3.33.jcn3

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

diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index 043cb23949752bbcac2e9afdaeb1f992423a46f0..90009ffcd74905d5f4e382ae387c3de789fd9d82 100644 (file)
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -3,16 +3,20 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
+#include <stdio.h>
 
 #include "scm-hash.hh"
 #include "hash-table-iter.hh"
 
+
+#ifdef usestl
+
+
 Scheme_hash_table::Scheme_hash_table ()
 {
-  hash_func_ = ly_scm_hash;
   self_scm_ = SCM_EOL;
   smobify_self ();
 }
@@ -20,7 +24,7 @@ Scheme_hash_table::Scheme_hash_table ()
 void
 Scheme_hash_table::operator =(Scheme_hash_table const & src)
 {
-  Hash_table<SCM,SCM>::operator = (src);
+  Scm_stl_map::operator = (src);
        
   // we do not copy the self_scm_ field!
 }
@@ -30,9 +34,124 @@ 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
+   */
+  
+  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;
+}
+
+
+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));
+  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 ();
+}
+
+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;  
+}
+
+
 #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)
 {
@@ -60,9 +179,12 @@ Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
 }
 
 int
-Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*ps)
+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++)
     {
@@ -71,10 +193,23 @@ Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*ps)
       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);
+}
+
+SCM
+Scheme_hash_table::get (SCM k)const
+{
+  return const_elem (k);
+}
 
 
 Scheme_hash_table::~Scheme_hash_table( )
@@ -91,3 +226,8 @@ Scheme_hash_table::to_alist () const
   return l;  
 }
 
+
+#include "ly-smobs.icc"
+IMPLEMENT_UNSMOB(Scheme_hash_table,scheme_hash);
+IMPLEMENT_SMOBS(Scheme_hash_table);
+#endif