From acc82015cd07a2021e373a9fe43cb8c84c365146 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Tue, 2 Oct 2012 16:45:44 +0200 Subject: [PATCH] parser.yy: FRACTION does not require a closed expression before it FRACTION items can't trail any other valid expression without separating '*' or similar, so the argument list before them does not need to be of "closed" type. --- lily/parser.yy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lily/parser.yy b/lily/parser.yy index 193655cb35..d6dcf11cc4 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1177,7 +1177,7 @@ function_arglist_nonbackup_common: | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed duration_length { $$ = scm_cons ($4, $3); } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed FRACTION + | EXPECT_OPTIONAL EXPECT_SCM function_arglist FRACTION { $$ = check_scheme_arg (parser, @4, $4, $3, $2); } @@ -1319,7 +1319,7 @@ function_arglist_backup: MYBACKUP (NUMBER_IDENTIFIER, $4, @4); } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep FRACTION + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep FRACTION { if (scm_is_true (scm_call_1 ($2, $4))) { @@ -1410,7 +1410,7 @@ function_arglist_common: $$ = check_scheme_arg (parser, @3, $3, $2, $1); } - | EXPECT_SCM function_arglist_closed_optional FRACTION + | EXPECT_SCM function_arglist_optional FRACTION { $$ = check_scheme_arg (parser, @3, $3, $2, $1); @@ -1549,7 +1549,7 @@ function_arglist_closed_common: $$ = check_scheme_arg (parser, @3, $3, $2, $1); } - | EXPECT_SCM function_arglist_closed_optional FRACTION + | EXPECT_SCM function_arglist_optional FRACTION { $$ = check_scheme_arg (parser, @3, $3, $2, $1); -- 2.39.2