X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fscm-hash.cc;h=dd3873d3b073aa22f2c44fff7430eb0f6cb1dc26;hb=36a2ef8fd1db451ea9318743561856b4f0907ba2;hp=bc0874392ffa33ae531b014428e6ed623fcadc64;hpb=304b5f3aa7eee7b0ff8d4ba7526a1410735f6e74;p=lilypond.git

diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index bc0874392f..dd3873d3b0 100644
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -19,7 +19,7 @@ copy_scm_hashes (SCM dest, SCM src)
 {
   int k = 0;
   for (int i = SCM_VECTOR_LENGTH (src); i--;)
-    for (SCM s = scm_vector_ref (src, SCM_MAKINUM (i)); ly_pair_p (s); s = ly_cdr (s))
+    for (SCM s = scm_vector_ref (src, scm_from_int (i)); ly_c_pair_p (s); s = ly_cdr (s))
       {
 	scm_hashq_set_x (dest, ly_caar (s), ly_cdar (s));
 	k++;
@@ -32,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;
 }
 
@@ -44,7 +44,7 @@ Scheme_hash_table::Scheme_hash_table (Scheme_hash_table const &src)
   elt_count_ = 0;
   smobify_self ();
 
-  hash_tab_ = scm_make_vector (gh_int2scm (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,7 +54,7 @@ Scheme_hash_table::operator = (Scheme_hash_table const & src)
   if (&src == this)
     return;
   
-  hash_tab_ = scm_make_vector (gh_int2scm (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_);
 }
 
@@ -82,7 +82,7 @@ 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 (ly_c_pair_p (handle))
     {
       *v = ly_cdr (handle);
       return true;
@@ -95,27 +95,27 @@ Scheme_hash_table::try_retrieve (SCM k, SCM *v)
 bool
 Scheme_hash_table::contains (SCM k) const
 {
-  return ly_pair_p (scm_hashq_get_handle (hash_tab_, k));
+  return ly_c_pair_p (scm_hashq_get_handle (hash_tab_, k));
 }
 
 void
 Scheme_hash_table::set (SCM k, SCM v)
 {
-  assert (gh_symbol_p (k));
+  assert (ly_c_symbol_p (k));
   SCM handle = scm_hashq_create_handle_x (hash_tab_, k, SCM_UNDEFINED);
   if (ly_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_VECTOR_LENGTH (hash_tab_))
     {
-      SCM nh = scm_make_vector (gh_int2scm (3* elt_count_+1), SCM_EOL);
+      SCM nh = scm_make_vector (scm_int2num (3* elt_count_+1), SCM_EOL);
       elt_count_ = copy_scm_hashes (nh, hash_tab_);
       hash_tab_ = nh;
     }
@@ -123,12 +123,12 @@ Scheme_hash_table::set (SCM k, SCM v)
 
 // 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
@@ -150,7 +150,7 @@ Scheme_hash_table::to_alist () const
 {
   SCM l = SCM_EOL;
   for (int i = SCM_VECTOR_LENGTH (hash_tab_); i--;)
-    for (SCM s = scm_vector_ref (hash_tab_, gh_int2scm (i)); ly_pair_p (s); s = ly_cdr (s))
+    for (SCM s = scm_vector_ref (hash_tab_, scm_int2num (i)); ly_c_pair_p (s); s = ly_cdr (s))
       {
 	l = scm_acons (ly_caar (s), ly_cdar (s), l);
       }