From: David Kastrup <dak@gnu.org>
Date: Mon, 14 Oct 2013 15:55:10 +0000 (+0200)
Subject: Issue 3611: Parser: remove non-closed expressions from function_arglist_nonbackup_common
X-Git-Tag: release/2.17.29-1~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=10cd53532769964795ed9a71a8d5c82d674797e0;p=lilypond.git

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

diff --git a/lily/parser.yy b/lily/parser.yy
index a99dffcf38..24d76a773e 100644
--- 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);