From: David Kastrup Date: Mon, 17 Oct 2011 08:54:31 +0000 (+0200) Subject: parser.yy: Use ##__VA_ARGS__ in MAKE_SYNTAX to allow for zero arguments. X-Git-Tag: release/2.15.15-1~37 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=011d7a30e457cf7108b54d151e314af75ec72e12;p=lilypond.git parser.yy: Use ##__VA_ARGS__ in MAKE_SYNTAX to allow for zero arguments. --- diff --git a/lily/parser.yy b/lily/parser.yy index b0a584ff91..8871ec258e 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -141,7 +141,7 @@ using namespace std; scm_apply_0 (proc, args) /* Syntactic Sugar. */ #define MAKE_SYNTAX(name, location, ...) \ - LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (PARSER->self_scm (), make_input (location), __VA_ARGS__, SCM_UNDEFINED)); + LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (PARSER->self_scm (), make_input (location), ##__VA_ARGS__, SCM_UNDEFINED)); SCM get_next_unique_context_id (); SCM get_next_unique_lyrics_context_id (); @@ -584,7 +584,7 @@ scm_function_call: ; embedded_lilypond: - { $$ = MAKE_SYNTAX ("void-music", @$, SCM_UNDEFINED); } + { $$ = MAKE_SYNTAX ("void-music", @$); } | identifier_init | music music music_list { $$ = MAKE_SYNTAX ("sequential-music", @$, @@ -1816,7 +1816,7 @@ command_element: $$ = m->unprotect (); } | E_BACKSLASH { - $$ = MAKE_SYNTAX ("voice-separator", @$, SCM_UNDEFINED); + $$ = MAKE_SYNTAX ("voice-separator", @$); } | '|' { SCM pipe = PARSER->lexer_->lookup_identifier ("pipeSymbol"); @@ -1829,7 +1829,7 @@ command_element: $$ = m->unprotect (); } else - $$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED); + $$ = MAKE_SYNTAX ("bar-check", @$); } | TIME_T fraction {