(LY_DEFINE): add ly:stencil-origin

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

diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index 7eeb67188b0be14174725b23465942b5fe43bc3d..7497d699d4f2734202cab2ff5bccadcb672dce6d 100644 (file)
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include <stdio.h>
@@ -11,14 +11,20 @@
 #include "scm-hash.hh"
 #include "ly-smobs.icc"
 
-void
+/*
+  Return: number of objects.
+ */
+int
 copy_scm_hashes (SCM dest, SCM src)
 {
-  for (int i = SCM_SYMBOL_LENGTH (src); i--;)
-    for (SCM s = scm_vector_ref (src, SCM_MAKINUM (i)); ly_pair_p(s); s = ly_cdr (s))
+  int k = 0;
+  for (int i = SCM_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, ly_caar (s), ly_cdar (s));
+       scm_hashq_set_x (dest, scm_caar (s), scm_cdar (s));
+       k++;
       }
+  return k ;
 }
 
 
@@ -26,7 +32,7 @@ Scheme_hash_table::Scheme_hash_table ()
 {
   hash_tab_ = SCM_EOL;
   smobify_self ();
-  hash_tab_ = scm_make_vector (gh_int2scm (119), SCM_EOL);
+  hash_tab_ = scm_make_vector (scm_int2num (119), SCM_EOL);
   elt_count_ = 0;
 }
 
@@ -35,11 +41,11 @@ Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
 
 {
   hash_tab_ = SCM_EOL;
-  elt_count_ = src.elt_count_;
+  elt_count_ = 0;
   smobify_self ();
 
-  hash_tab_ = scm_make_vector (gh_int2scm (src.elt_count_ >? 11 ), SCM_EOL);  
-  copy_scm_hashes (hash_tab_, src.hash_tab_);
+  hash_tab_ = scm_make_vector (scm_int2num (src.elt_count_ >? 11 ), SCM_EOL);  
+  elt_count_ = copy_scm_hashes (hash_tab_, src.hash_tab_);
 }
 
 void
@@ -48,9 +54,8 @@ Scheme_hash_table::operator = (Scheme_hash_table const & src)
   if (&src == this)
     return;
   
-  elt_count_ = src.elt_count_;
-  hash_tab_ = scm_make_vector (gh_int2scm (src.elt_count_ >? 11), SCM_EOL);  
-  copy_scm_hashes (hash_tab_, src.hash_tab_);
+  hash_tab_ = scm_make_vector (scm_int2num (src.elt_count_ >? 11), SCM_EOL);  
+  elt_count_ = copy_scm_hashes (hash_tab_, src.hash_tab_);
 }
 
 SCM
@@ -66,20 +71,20 @@ Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*)
 {
   assert (unsmob (s));
   char str[1000];
-  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;
+  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 handle = scm_hashq_get_handle (hash_tab_, k);
-  if (ly_pair_p (handle))
+  if (scm_is_pair (handle))
     {
-      *v = ly_cdr (handle);
+      *v = scm_cdr (handle);
       return true;
     }
   else
@@ -88,50 +93,52 @@ Scheme_hash_table::try_retrieve (SCM k, SCM *v)
 }
 
 bool
-Scheme_hash_table::elem_b (SCM k) const
+Scheme_hash_table::contains (SCM k) const
 {
-  return ly_pair_p (scm_hashq_get_handle (hash_tab_, k));
+  return scm_is_pair (scm_hashq_get_handle (hash_tab_, k));
 }
 
 void
 Scheme_hash_table::set (SCM k, SCM v)
 {
-  assert (gh_symbol_p (k));
+  assert (scm_is_symbol (k));
   SCM handle = scm_hashq_create_handle_x (hash_tab_, k, SCM_UNDEFINED);
-  if (ly_cdr (handle) == SCM_UNDEFINED)
+  if (scm_cdr (handle) == SCM_UNDEFINED)
     {
       elt_count_++;
     }
   
-  gh_set_cdr_x (handle, v);
+  scm_set_cdr_x (handle, v);
 
   /*
     resize if getting too large.
   */
-  if (elt_count_ > 2 * SCM_SYMBOL_LENGTH (hash_tab_))
+  if (elt_count_ > 2 * SCM_VECTOR_LENGTH (hash_tab_))
     {
-      SCM nh = scm_make_vector (gh_int2scm (3* elt_count_+1), SCM_EOL);
-      copy_scm_hashes (nh, hash_tab_);
+      SCM nh = scm_make_vector (scm_int2num (3* elt_count_+1), SCM_EOL);
+      elt_count_ = copy_scm_hashes (nh, hash_tab_);
       hash_tab_ = nh;
     }
-  
 }
 
 // UGH. 
 SCM
-Scheme_hash_table::get (SCM k)const
+Scheme_hash_table::get (SCM k) const
 {
   /*
     42 will stick out like a sore thumb, hopefully.
    */
-  return scm_hashq_ref (hash_tab_, k, SCM_MAKINUM(42));
+  return scm_hashq_ref (hash_tab_, k, scm_from_int (42));
 }
 
 void
 Scheme_hash_table::remove (SCM k)
 {
   scm_hashq_remove_x (hash_tab_, k);
-  elt_count_ --;
+  /*
+    don't decrease elt_count_ , as this may cause underflow. The exact
+    value of elt_count_ is not important.
+   */
 }
 
 Scheme_hash_table::~Scheme_hash_table ()
@@ -142,10 +149,10 @@ SCM
 Scheme_hash_table::to_alist () const
 {
   SCM l = SCM_EOL;
-  for (int i = SCM_SYMBOL_LENGTH (hash_tab_); i--;)
-    for (SCM s = scm_vector_ref (hash_tab_, gh_int2scm (i)); ly_pair_p(s); s = ly_cdr (s))
+  for (int i = SCM_VECTOR_LENGTH (hash_tab_); i--;)
+    for (SCM s = scm_vector_ref (hash_tab_, scm_int2num (i)); scm_is_pair (s); s = scm_cdr (s))
       {
-       l = scm_acons (ly_caar (s), ly_cdar (s), l);
+       l = scm_acons (scm_caar (s), scm_cdar (s), l);
       }
   return l;  
 }
@@ -153,7 +160,7 @@ Scheme_hash_table::to_alist () const
 
 
 
-IMPLEMENT_UNSMOB (Scheme_hash_table,scheme_hash);
+
 IMPLEMENT_SMOBS (Scheme_hash_table);
 IMPLEMENT_DEFAULT_EQUAL_P (Scheme_hash_table);