From dd0a506adc8f19f3799f9d0a1ee1e6aed664ecd8 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Sun, 24 Jul 2011 16:04:51 +0200 Subject: [PATCH] parser.yy: avoid overuse of ly_append2. Pity there is no scm_cons_star_3. --- lily/parser.yy | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lily/parser.yy b/lily/parser.yy index 38f4eb4f23..9185ccb193 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1126,7 +1126,7 @@ function_arglist: generic_prefix_music_scm: MUSIC_FUNCTION function_arglist { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); + $$ = scm_cons ($1, scm_cons (make_input (@$), scm_reverse_x ($2, SCM_EOL))); } ; @@ -1606,10 +1606,10 @@ music_function_chord_body: but it's more consistent with music_function_event if we prohibit it here too */ music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic chord_body_element { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4))); + $$ = scm_cons ($1, scm_cons (make_input (@$), scm_reverse_x ($3, scm_list_1 ($4)))); } | music_function_identifier_musicless_prefix function_arglist_nonmusic { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); + $$ = scm_cons ($1, scm_cons (make_input (@$), scm_reverse_x ($2, SCM_EOL))); } ; @@ -1618,10 +1618,10 @@ music_function_event: restriction we get a shift/reduce conflict from e.g. c8-\partcombine c8 -. */ music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic post_event { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4))); + $$ = scm_cons ($1, scm_cons (make_input (@$), scm_reverse_x ($3, scm_list_1 ($4)))); } | music_function_identifier_musicless_prefix function_arglist_nonmusic { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); + $$ = scm_cons ($1, scm_cons (make_input (@$), scm_reverse_x ($2, SCM_EOL))); } ; -- 2.39.5