From 305b9fe8829350042d49ad8c56ef4f555a1e2642 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 27 Jan 2005 23:02:48 +0000 Subject: [PATCH] *** empty log message *** --- lily/break-align-interface.cc | 2 +- lily/break-substitution.cc | 2 +- lily/function-documentation.cc | 2 +- lily/grob-interface-scheme.cc | 2 +- lily/include/guile-compatibility.hh | 1 + lily/include/lily-guile.hh | 2 -- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc index 88fb549dea..f73d0735ec 100644 --- a/lily/break-align-interface.cc +++ b/lily/break-align-interface.cc @@ -75,7 +75,7 @@ Break_align_interface::ordered_elements (Grob *grob) Item *me = dynamic_cast (grob); SCM elts = me->get_property ("elements"); SCM order_vec = me->get_property ("break-align-orders"); - if (!ly_c_vector_p (order_vec) + if (!scm_is_vector (order_vec) || ly_vector_length (order_vec) < 3) return Pointer_group_interface__extract_grobs (me, (Grob*)0, "elements"); diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc index 355386bdf9..8c28b6fe8e 100644 --- a/lily/break-substitution.cc +++ b/lily/break-substitution.cc @@ -89,7 +89,7 @@ do_break_substitution (SCM src) if (unsmob_grob (src)) return substitute_grob (unsmob_grob (src)); - else if (ly_c_vector_p (src)) + else if (scm_is_vector (src)) { int len = scm_c_vector_length (src); SCM nv = scm_c_make_vector (len, SCM_UNDEFINED); diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc index f0ba20d554..5f861ab9f1 100644 --- a/lily/function-documentation.cc +++ b/lily/function-documentation.cc @@ -22,7 +22,7 @@ void ly_add_function_documentation (SCM func, if (!strlen (doc)) return ; - if (!ly_c_vector_p (doc_hash_table )) + if (!scm_is_vector (doc_hash_table )) doc_hash_table = scm_make_vector (scm_int2num (59), SCM_EOL); String s = String (" - ") + "LilyPond procedure: " + fname + " " + varlist diff --git a/lily/grob-interface-scheme.cc b/lily/grob-interface-scheme.cc index 9eccbd906e..1876236923 100644 --- a/lily/grob-interface-scheme.cc +++ b/lily/grob-interface-scheme.cc @@ -19,7 +19,7 @@ LY_DEFINE (ly_add_interface, "ly:add-interface", 3,0,0, (SCM a, SCM b, SCM c), SCM_ASSERT_TYPE (scm_is_symbol (a), a, SCM_ARG1, __FUNCTION__, "symbol"); SCM_ASSERT_TYPE (scm_is_string (b), b, SCM_ARG2, __FUNCTION__, "string"); SCM_ASSERT_TYPE (ly_c_list_p (c), c, SCM_ARG3, __FUNCTION__, "list of syms"); - if (!ly_c_vector_p (all_ifaces)) + if (!scm_is_vector (all_ifaces)) all_ifaces = scm_make_vector (scm_int2num (40), SCM_EOL); SCM entry = scm_list_n (a, b, c, SCM_UNDEFINED); diff --git a/lily/include/guile-compatibility.hh b/lily/include/guile-compatibility.hh index 35e516e896..9ac45cd419 100644 --- a/lily/include/guile-compatibility.hh +++ b/lily/include/guile-compatibility.hh @@ -35,6 +35,7 @@ inline SCM scm_caadr (SCM x) { return SCM_CAADR (x); } inline SCM scm_cadar (SCM x) { return SCM_CADAR (x); } #define scm_gc_unregister_collectable_memory(a, b, c) scm_done_free (b) #define scm_gc_register_collectable_memory(a, b, c) scm_done_malloc (b) +#define scm_is_vector(x) (SCM_VECTORP(x)) #define SCM_HASHTABLE_P(x) (SCM_VECTORP (x)) #define SCM_VECTOR_REF(v, i) (SCM_VELTS ((v))[(i)]) #define scm_from_bool(x) (x ? SCM_BOOL_T : SCM_BOOL_F) diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index f6cb2c1482..6773c5c8e7 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -67,8 +67,6 @@ 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_char_p (SCM x) { return SCM_CHARP (x); } -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_equal_p (SCM x, SCM y) { -- 2.39.5