* lily/kpath.cc:

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

diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index b4bd0a936f34837fccc7f0142b38a35fc54f221a..18b6edcd8e4f0edafe45f67e89d06fc8d1e9b69b 100644 (file)
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -1,9 +1,9 @@
-/*   
+/*
   scm-hash.cc --  implement Scheme_hash_table
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "scm-hash.hh"
@@ -19,7 +19,7 @@ int
 copy_scm_hashes (SCM dest, SCM src)
 {
   int k = 0;
-  for (int i = SCM_VECTOR_LENGTH (src); i--;)
+  for (int i = scm_c_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, scm_caar (s), scm_cdar (s));
@@ -45,7 +45,7 @@ Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
   elt_count_ = 0;
   smobify_self ();
 
-  hash_tab_ = scm_make_vector (scm_int2num (src.elt_count_ >? 11 ), SCM_EOL);  
+  hash_tab_ = scm_make_vector (scm_int2num (src.elt_count_ >? 11 ), SCM_EOL);
   elt_count_ = copy_scm_hashes (hash_tab_, src.hash_tab_);
 }
 
@@ -54,8 +54,8 @@ Scheme_hash_table::operator = (Scheme_hash_table const & src)
 {
   if (&src == this)
     return;
-  
-  hash_tab_ = scm_make_vector (scm_int2num (src.elt_count_ >? 11), SCM_EOL);  
+
+  hash_tab_ = scm_make_vector (scm_int2num (src.elt_count_ >? 11), SCM_EOL);
   elt_count_ = copy_scm_hashes (hash_tab_, src.hash_tab_);
 }
 
@@ -78,8 +78,8 @@ Scheme_hash_table::print_smob (SCM s, SCM p, scm_print_state*)
   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);        
+  scm_display (me->hash_tab_, p);
+  scm_puts ("> ", p);
   return 1;
 }
 
@@ -109,13 +109,13 @@ Scheme_hash_table::set (SCM k, SCM v)
   SCM handle = scm_hashq_create_handle_x (hash_tab_, k, SCM_UNDEFINED);
   if (scm_cdr (handle) == SCM_UNDEFINED)
     elt_count_++;
-  
+
   scm_set_cdr_x (handle, v);
 
   /*
     resize if getting too large.
   */
-  if (elt_count_ > 2 * SCM_VECTOR_LENGTH (hash_tab_))
+  if (elt_count_ > 2 * scm_c_vector_length (hash_tab_))
     {
       SCM nh = scm_make_vector (scm_int2num (3* elt_count_+1), SCM_EOL);
       elt_count_ = copy_scm_hashes (nh, hash_tab_);
@@ -123,7 +123,7 @@ Scheme_hash_table::set (SCM k, SCM v)
     }
 }
 
-// UGH. 
+// UGH.
 SCM
 Scheme_hash_table::get (SCM k) const
 {
@@ -145,7 +145,7 @@ SCM
 Scheme_hash_table::to_alist () const
 {
   SCM lst = SCM_EOL;
-  for (int i = SCM_VECTOR_LENGTH (hash_tab_); i--;)
+  for (int i = scm_c_vector_length (hash_tab_); i--;)
     for (SCM s = scm_vector_ref (hash_tab_, scm_int2num (i)); scm_is_pair (s);
         s = scm_cdr (s))
       lst = scm_acons (scm_caar (s), scm_cdar (s), lst);
@@ -154,5 +154,3 @@ Scheme_hash_table::to_alist () const
 
 IMPLEMENT_SMOBS (Scheme_hash_table);
 IMPLEMENT_DEFAULT_EQUAL_P (Scheme_hash_table);
-
-