From: Han-Wen Nienhuys Date: Fri, 7 Apr 2006 01:05:57 +0000 (+0000) Subject: (Generic_prefix_music_scm): append lists, not objects. X-Git-Tag: release/2.9.3~77 X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=bcaa3cce66632e4b428e11cef6cbbad3a8edaad2;p=lilypond.git (Generic_prefix_music_scm): append lists, not objects. --- diff --git a/ChangeLog b/ChangeLog index 4d2ff21e0f..64aae1bd7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-04-07 Han-Wen Nienhuys + * lily/parser.yy (Generic_prefix_music_scm): append lists, not objects. + * scm/backend-library.scm (search-gs): oops. 2006-04-06 Han-Wen Nienhuys diff --git a/lily/parser.yy b/lily/parser.yy index cb8a8fdede..e2bbcd7d4d 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1011,7 +1011,7 @@ Generic_prefix_music_scm: $$ = scm_list_3 ($1, make_input (@$), $2); } | music_function_musicless_prefix Music { - $$ = ly_append2 ($1, $2->self_scm ()); + $$ = ly_append2 ($1, scm_list_1 ($2->self_scm ())); $2->unprotect (); } | MUSIC_FUNCTION_SCM_SCM function_scm_argument function_scm_argument { diff --git a/scm/lily.scm b/scm/lily.scm index db729e6567..9ded6f526e 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -161,6 +161,7 @@ similar to chord syntax") (define (type-check-list location signature arguments) "Typecheck a list of arguments against a list of type predicates. Print a message at LOCATION if any predicate failed." + (define (recursion-helper signature arguments count) (define (helper pred? arg count) (if (not (pred? arg)) @@ -178,6 +179,7 @@ predicates. Print a message at LOCATION if any predicate failed." #t (and (helper (car signature) (car arguments) count) (recursion-helper (cdr signature) (cdr arguments) (1+ count))))) + (recursion-helper signature arguments 1)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;