* lily/include/lily-guile.hh: is_x -> ly_c_X_p naming.

[lilypond.git] / lily / include / lily-guile.hh

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index c2fd7033c666bea314e7c3cdc6ca302545c7a951..f9b1b2072c371a7b4c9ff68ce1018f44111d7f0d 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -191,16 +191,16 @@ inline SCM ly_assoc_front_x(SCM alist, SCM key, SCM val)
   return scm_acons(key, val, scm_assoc_remove_x (alist, key));
 }
 inline bool ly_c_pair_p (SCM x) { return SCM_NFALSEP (scm_pair_p (x)); }
-inline bool is_symbol (SCM x) { return SCM_SYMBOLP (x); }
-inline bool is_boolean (SCM x) { return SCM_BOOLP (x); }
-inline bool is_char (SCM x) { return SCM_CHARP (x); }
+inline bool ly_c_symbol_pi (SCM x) { return SCM_SYMBOLP (x); }
+inline bool ly_c_boolean_p (SCM x) { return SCM_BOOLP (x); }
+inline bool ly_c_char_p (SCM x) { return SCM_CHARP (x); }
 inline bool is_number (SCM x) { return SCM_NUMBERP (x); }
 inline bool ly_c_string_p (SCM x) { return SCM_STRINGP (x); }
-inline bool is_vector (SCM x) { return SCM_VECTORP (x); }
-inline bool is_list (SCM x) { return SCM_NFALSEP (scm_list_p (x)); }
-inline bool is_procedure (SCM x) { return SCM_NFALSEP (scm_procedure_p (x)); }
-inline bool is_eq (SCM x, SCM y) { return SCM_EQ_P (x, y); }
-inline bool is_equal (SCM x, SCM y) { 
+inline bool ly_c_vector_p (SCM x) { return SCM_VECTORP (x); }
+inline bool ly_c_list_p (SCM x) { return SCM_NFALSEP (scm_list_p (x)); }
+inline bool ly_c_procedure_p (SCM x) { return SCM_NFALSEP (scm_procedure_p (x)); }
+inline bool ly_c_eq_p (SCM x, SCM y) { return SCM_EQ_P (x, y); }
+inline bool ly_c_equal_p (SCM x, SCM y) { 
   return SCM_NFALSEP (scm_equal_p (x, y)); 
 }