Issue 3611: Parser: remove non-closed expressions from function_arglist_nonbackup_common

diff --git a/lily/parser.yy b/lily/parser.yy
index a99dffcf3889056a2e4e01d128fd67639acc1bf4..24d76a773eb1260c6aaf36f455465698ce964593 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1266,13 +1266,7 @@ function_arglist_skip:
 
 
 function_arglist_nonbackup_common:
-       EXPECT_OPTIONAL EXPECT_PITCH function_arglist pitch_also_in_chords {
-               $$ = scm_cons ($4, $3);
-       }
-       | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed duration_length {
-               $$ = scm_cons ($4, $3);
-       }
-       | EXPECT_OPTIONAL EXPECT_SCM function_arglist FRACTION
+       EXPECT_OPTIONAL EXPECT_SCM function_arglist FRACTION
        {
                $$ = check_scheme_arg (parser, @4, $4, $3, $2);
        }
@@ -1375,6 +1369,14 @@ symbol_list_element:
 
 function_arglist_nonbackup:
        function_arglist_nonbackup_common
+       | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed duration_length
+       {
+               $$ = scm_cons ($4, $3);
+       }
+       | EXPECT_OPTIONAL EXPECT_PITCH function_arglist pitch_also_in_chords
+       {
+               $$ = scm_cons ($4, $3);
+       }
        | EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg
        {
                $$ = check_scheme_arg (parser, @4, $4, $3, $2);