#include "music-function.hh"
LY_DEFINE (ly_music_function_p, "ly:music-function?", 1, 0, 0,
- (SCM x),
- "Is @var{x} a @code{music-function}?")
+ (SCM x),
+ "Is @var{x} a @code{music-function}?")
{
return is_music_function (x) ? SCM_BOOL_T : SCM_BOOL_F;
}
-
+
LY_DEFINE (ly_music_function_extract, "ly:music-function-extract", 1, 0, 0,
- (SCM x),
- "Return the Scheme function inside@tie{}@var{x}.")
+ (SCM x),
+ "Return the Scheme function inside@tie{}@var{x}.")
{
LY_ASSERT_TYPE (is_music_function, x, 1);
-
- return SCM_CELL_OBJECT_1(x);
+
+ return get_music_function_transform (x);
}
-LY_DEFINE (ly_make_music_function, "ly:make-music-function", 2, 0, 0,
- (SCM signature, SCM func),
- "Make a function to process music, to be used for the"
- " parser. @code{func} is the function, and @code{signature}"
- " describes its arguments. @code{signature} is a list"
- " containing either @code{ly:music?} predicates or other type"
- " predicates.")
+LY_DEFINE (ly_music_function_signature, "ly:music-function-signature", 1, 0, 0,
+ (SCM x),
+ "Return the function signature inside@tie{}@var{x}.")
{
- LY_ASSERT_TYPE (ly_is_procedure, func, 1);
- return make_music_function (signature, func);
+ LY_ASSERT_TYPE (is_music_function, x, 1);
+
+ return get_music_function_signature (x);
}
+LY_DEFINE (ly_make_music_function, "ly:make-music-function", 2, 0, 0,
+ (SCM signature, SCM func),
+ "Make a function to process music, to be used for the"
+ " parser. @var{func} is the function, and @var{signature}"
+ " describes its arguments. @var{signature}'s cdr is a list"
+ " containing either @code{ly:music?} predicates or other type"
+ " predicates. Its car is the syntax function to call.")
+{
+ LY_ASSERT_TYPE (ly_is_list, signature, 1);
+ LY_ASSERT_TYPE (ly_is_procedure, func, 2);
+ int n = 0;
+ for (SCM p = signature; scm_is_pair (p); p = scm_cdr (p), ++n)
+ {
+ SCM proc = scm_car (p);
+ if (scm_is_pair (proc))
+ proc = scm_car (proc);
+ if (scm_is_false (scm_procedure_p (proc)))
+ {
+ scm_wrong_type_arg_msg ("music-function", n, p,
+ "music function predicate");
+ }
+ }
+
+ return make_music_function (signature, func);
+}