From 5c2efacf079a69d97da4466dd1179530759bc114 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Mon, 4 Aug 2014 09:55:17 +0200 Subject: [PATCH] Refactor grammar, folding re_rhythmed_music into composite_music --- lily/parser.yy | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/lily/parser.yy b/lily/parser.yy index 89c4a0036a..e523c2da48 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1421,14 +1421,28 @@ context_prefix: } ; +new_lyrics: + ADDLYRICS lyric_mode_music { + $$ = scm_list_1 ($2); + } + | new_lyrics ADDLYRICS lyric_mode_music { + $$ = scm_cons ($3, $1); + } + ; + composite_music: music_function_call | repeated_music { $$ = $1; } - | re_rhythmed_music { $$ = $1; } | context_prefix music { $$ = FINISH_MAKE_SYNTAX ($1, @$, $2); } + | composite_music new_lyrics { + $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); + } %prec COMPOSITE + | LYRICSTO simple_string lyric_mode_music { + $$ = MAKE_SYNTAX ("lyric-combine", @$, $2, $3); + } | music_bare ; @@ -2245,24 +2259,6 @@ mode_changing_head_with_context: } ; -new_lyrics: - ADDLYRICS lyric_mode_music { - $$ = scm_list_1 ($2); - } - | new_lyrics ADDLYRICS lyric_mode_music { - $$ = scm_cons ($3, $1); - } - ; - -re_rhythmed_music: - composite_music new_lyrics { - $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); - } %prec COMPOSITE - | LYRICSTO simple_string lyric_mode_music { - $$ = MAKE_SYNTAX ("lyric-combine", @$, $2, $3); - } - ; - context_change: CHANGE symbol '=' simple_string { $$ = MAKE_SYNTAX ("context-change", @$, $2, $4); -- 2.39.2