Updating lily-guile.cc.

diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index 299190b42841734b34ef8e86635bfccc4cb710b6..605bf06cfd9c803b2aa960b4be541915946a210d 100644 (file)
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -107,7 +107,7 @@ LY_DEFINE (ly_dir_p, "ly:dir?",
            " left or down, @code{1}@tie{}represents right or up, and @code{0}"
            " represents a neutral direction.")
 {
-  if (scm_is_number (s))
+  if (scm_is_integer (s))
     {
       int i = scm_to_int (s);
       return (i >= -1 && i <= 1) ? SCM_BOOL_T : SCM_BOOL_F;

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 80842438f5aead3023f53b626b43723d07675d42..160729e9052e05df00910c2b0a44f3754252881a 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -95,10 +95,10 @@ SCM ly_hash_table_keys (SCM tab);
 SCM ly_assoc_prepend_x (SCM alist, SCM key, SCM val);
 inline bool ly_is_fraction (SCM x) { return SCM_FRACTIONP (x) || scm_is_integer (x); }
 
-inline bool ly_is_list (SCM x) { return SCM_NFALSEP (scm_list_p (x)); }
+inline bool ly_is_list (SCM x) { return scm_is_true (scm_list_p (x)); }
 inline bool ly_cheap_is_list (SCM x) { return scm_is_pair (x) || x == SCM_EOL; }
-inline bool ly_is_procedure (SCM x) { return SCM_NFALSEP (scm_procedure_p (x)); }
-inline bool ly_is_port (SCM x) { return SCM_NFALSEP (scm_port_p (x)); }
+inline bool ly_is_procedure (SCM x) { return scm_is_true (scm_procedure_p (x)); }
+inline bool ly_is_port (SCM x) { return scm_is_true (scm_port_p (x)); }
 
 /*
   want to take the address of this function; scm_is_symbol() is a
@@ -108,12 +108,12 @@ inline bool ly_is_symbol (SCM x) { return scm_is_symbol (x); }
 
 inline bool ly_is_equal (SCM x, SCM y)
 {
-  return SCM_NFALSEP (scm_equal_p (x, y));
+  return scm_is_true (scm_equal_p (x, y));
 }
 
-inline bool ly_scm2bool (SCM x) { return SCM_NFALSEP (x); }
+inline bool ly_scm2bool (SCM x) { return scm_is_true (x); }
 inline char ly_scm2char (SCM x) { return (char)SCM_CHAR (x); }
-inline SCM ly_bool2scm (bool x) { return SCM_BOOL (x); }
+inline SCM ly_bool2scm (bool x) { return scm_from_bool (x); }
 
 inline SCM ly_append2 (SCM x1, SCM x2)
 {

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 040ec45dc6a9ff5ae034a0ebd1be401118890730..710fe151263ccb20f0efcfa80c796b1d9e333332 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -183,7 +183,7 @@ ly_scm_hash (SCM s)
 bool
 is_axis (SCM s)
 {
-  if (scm_is_number (s))
+  if (scm_is_integer (s))
     {
       int i = scm_to_int (s);
       return i == 0 || i == 1;
@@ -231,7 +231,8 @@ is_direction (SCM s)
 Interval
 ly_scm2interval (SCM p)
 {
-  return Interval (scm_to_double (scm_car (p)), scm_to_double (scm_cdr (p)));
+  return Interval (scm_to_double (scm_car (p)),
+                   scm_to_double (scm_cdr (p)));
 }
 
 Drul_array<Real>
@@ -326,19 +327,19 @@ ly_scm2offsets (SCM s)
   ALIST
 */
 
+// This one is used nowhere.
 bool
-alist_equal_p (SCM a, SCM b)
+ly_is_alist_equal (SCM a, SCM b)
 {
-  for (SCM s = a;
-       scm_is_pair (s); s = scm_cdr (s))
+  if (!scm_is_pair (a) || !scm_is_pair (b))
+    return false;
+  for (SCM s = a; scm_is_pair (s); s = scm_cdr (s))
     {
       SCM key = scm_caar (s);
       SCM val = scm_cdar (s);
       SCM l = scm_assoc (key, b);
 
-      if (l == SCM_BOOL_F
-          || !ly_is_equal (scm_cdr (l), val))
-
+      if (scm_is_false (l) || !ly_is_equal (scm_cdr (l), val))
         return false;
     }
   return true;