X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=02c99e2f42e8f4eb7cf3283a764369ccac3770d7;hb=5670dc898dbedc105b5ff0719959317850ef443d;hp=9185ccb19319b2c84ef434c51339954e85e1ccb9;hpb=dd0a506adc8f19f3799f9d0a1ee1e6aed664ecd8;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 9185ccb193..02c99e2f42 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -145,7 +145,7 @@ SCM get_next_unique_lyrics_context_id (); static Music *make_music_with_input (SCM name, Input where); SCM make_music_relative (Pitch start, SCM music, Input loc); -SCM run_music_function (Lily_parser *, SCM expr); +SCM run_music_function (Lily_parser *parser, Input loc, SCM func, SCM args); SCM get_first_context_id (SCM type, Music *m); SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list); SCM make_chord_step (int step, Rational alter); @@ -187,7 +187,7 @@ void set_music_properties (Music *p, SCM a); %token FIGURES "\\figures" %token GROBDESCRIPTIONS "\\grobdescriptions" %token HEADER "\\header" -%token INVALID "\\invalid" +%token INVALID "\\version-error" %token KEY "\\key" %token LAYOUT "\\layout" %token LYRICMODE "\\lyricmode" @@ -199,11 +199,9 @@ void set_music_properties (Music *p, SCM a); %token MIDI "\\midi" %token NAME "\\name" %token NOTEMODE "\\notemode" -%token OCTAVE "\\octave" %token ONCE "\\once" %token OVERRIDE "\\override" %token PAPER "\\paper" -%token PARTIAL "\\partial" %token RELATIVE "\\relative" %token REMOVE "\\remove" %token REPEAT "\\repeat" @@ -213,10 +211,8 @@ void set_music_properties (Music *p, SCM a); %token SEQUENTIAL "\\sequential" %token SET "\\set" %token SIMULTANEOUS "\\simultaneous" -%token SKIP "\\skip" %token TEMPO "\\tempo" %token TIMES "\\times" -%token TRANSPOSE "\\transpose" %token TYPE "\\type" %token UNSET "\\unset" %token WITH "\\with" @@ -263,20 +259,22 @@ If we give names, Bison complains. %token MULTI_MEASURE_REST -%token DIGIT %token E_UNSIGNED %token UNSIGNED /* Artificial tokens, for more generic function syntax */ -%token EXPECT_MARKUP; -%token EXPECT_MUSIC; -%token EXPECT_PITCH; -%token EXPECT_DURATION; -%token EXPECT_SCM; -%token EXPECT_MARKUP_LIST +%token EXPECT_MARKUP "markup?" +%token EXPECT_MUSIC "ly:music?" +%token EXPECT_PITCH "ly:pitch?" +%token EXPECT_DURATION "ly:duration?" +%token EXPECT_SCM "scheme?" +%token EXPECT_MARKUP_LIST "markup-list?" /* After the last argument. */ %token EXPECT_NO_MORE_ARGS; +/* An artificial token for parsing embedded Lilypond */ +%token EMBEDDED_LILY "#{" + %token BOOK_IDENTIFIER %token CHORDMODIFIER_PITCH %token CHORD_MODIFIER @@ -284,6 +282,7 @@ If we give names, Bison complains. %token CONTEXT_DEF_IDENTIFIER %token CONTEXT_MOD_IDENTIFIER %token DRUM_PITCH +%token PITCH_IDENTIFIER %token DURATION_IDENTIFIER %token EVENT_IDENTIFIER %token FRACTION @@ -300,6 +299,7 @@ If we give names, Bison complains. %token OUTPUT_DEF_IDENTIFIER %token REAL %token RESTNAME +%token SCM_FUNCTION %token SCM_IDENTIFIER %token SCM_TOKEN %token SCORE_IDENTIFIER @@ -327,6 +327,8 @@ If we give names, Bison complains. /* Music */ %type composite_music %type grouped_music_list +%type closed_music +%type open_music %type music %type prefix_composite_music %type repeated_music @@ -341,15 +343,19 @@ If we give names, Bison complains. %type context_change %type direction_less_event %type direction_reqd_event +%type embedded_lilypond %type event_chord +%type fingering %type gen_text_def %type music_property_def %type note_chord_element %type post_event +%type post_event_nofinger %type re_rhythmed_music %type relative_music %type simple_element %type simple_music_property_def +%type start_symbol %type string_number_event %type tempo_event @@ -382,6 +388,7 @@ If we give names, Bison complains. %type context_prop_spec %type direction_less_char %type duration_length +%type closed_embedded_scm %type embedded_scm %type figure_list %type figure_spec @@ -390,10 +397,11 @@ If we give names, Bison complains. %type full_markup_list %type function_scm_argument %type function_arglist -%type function_arglist_music_last %type function_arglist_nonmusic_last -%type function_arglist_nonmusic +%type closed_function_arglist +%type open_function_arglist %type identifier_init +%type lilypond %type lilypond_header %type lilypond_header_body %type lyric_element @@ -404,6 +412,7 @@ If we give names, Bison complains. %type markup_composed_list %type markup_command_list %type markup_command_list_arguments +%type closed_markup_command_list_arguments %type markup_command_basic_arguments %type markup_head_1_item %type markup_head_1_list @@ -412,9 +421,10 @@ If we give names, Bison complains. %type mode_changing_head %type mode_changing_head_with_context %type multiplied_duration -%type music_function_identifier_musicless_prefix %type music_function_event +%type music_function_event_arglist %type music_function_chord_body +%type music_function_chord_body_arglist %type new_chord %type new_lyrics %type number_expression @@ -430,6 +440,9 @@ If we give names, Bison complains. %type property_operation %type property_path property_path_revved %type scalar +%type closed_scalar +%type open_scm_function_call +%type closed_scm_function_call %type script_abbreviation %type simple_chord_elements %type simple_markup @@ -455,7 +468,18 @@ prec levels in different prods */ %% -lilypond: /* empty */ +start_symbol: + lilypond + | EMBEDDED_LILY { + SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames"); + PARSER->lexer_->push_note_state (alist_to_hashq (nn)); + } embedded_lilypond { + PARSER->lexer_->pop_state (); + PARSER->lexer_->set_identifier (ly_symbol2scm ("parseStringResult"), $3); + } + ; + +lilypond: /* empty */ { } | lilypond toplevel_expression { } | lilypond assignment { @@ -521,9 +545,46 @@ toplevel_expression: } ; -embedded_scm: +closed_embedded_scm: SCM_TOKEN | SCM_IDENTIFIER + | closed_scm_function_call + ; + +embedded_scm: + closed_embedded_scm + | open_scm_function_call + ; + +closed_scm_function_call: + SCM_FUNCTION closed_function_arglist + { + $$ = run_music_function (PARSER, @$, + $1, $2); + } + ; + +open_scm_function_call: + SCM_FUNCTION open_function_arglist + { + $$ = run_music_function (PARSER, @$, + $1, $2); + } + ; + +embedded_lilypond: + { $$ = MAKE_SYNTAX ("void-music", @$, SCM_UNDEFINED); } + | identifier_init + | music music music_list { + $$ = MAKE_SYNTAX ("sequential-music", @$, + scm_cons2 ($1, $2, scm_reverse_x ($3, SCM_EOL))); + } + | error { + PARSER->error_level_ = 1; + } + | INVALID embedded_lilypond { + PARSER->error_level_ = 1; + } ; @@ -603,7 +664,7 @@ identifier_init: else $$ = MAKE_SYNTAX ("event-chord", @$, scm_list_1 ($1)); } - | post_event { + | post_event_nofinger { $$ = $1; } | number_expression { @@ -621,9 +682,6 @@ identifier_init: | full_markup_list { $$ = $1; } - | DIGIT { - $$ = scm_from_int ($1); - } | context_modification { $$ = $1; } @@ -916,34 +974,23 @@ tempo_event: TEMPO steno_duration '=' tempo_range { $$ = MAKE_SYNTAX ("tempo", @$, SCM_EOL, $2, $4); } - | TEMPO scalar steno_duration '=' tempo_range { + | TEMPO closed_scalar steno_duration '=' tempo_range { $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, $5); } - | TEMPO scalar { + | TEMPO closed_scalar { $$ = MAKE_SYNTAX ("tempo", @$, $2); } ; /* -The representation of a list is the - - (LIST . LAST-CONS) - - to have efficient append. */ +The representation of a list is reversed to have efficient append. */ music_list: /* empty */ { - $$ = scm_cons (SCM_EOL, SCM_EOL); + $$ = SCM_EOL; } | music_list music { - SCM s = $$; - SCM c = scm_cons ($2, SCM_EOL); - - if (scm_is_pair (scm_cdr (s))) - scm_set_cdr_x (scm_cdr (s), c); /* append */ - else - scm_set_car_x (s, c); /* set first cons */ - scm_set_cdr_x (s, c); /* remember last cell */ + $$ = scm_cons ($2, $1); } | music_list embedded_scm { @@ -952,21 +999,15 @@ music_list: Music *m = MY_MAKE_MUSIC("Music", @$); // ugh. code dup m->set_property ("error-found", SCM_BOOL_T); - SCM s = $$; - SCM c = scm_cons (m->self_scm (), SCM_EOL); + $$ = scm_cons (m->self_scm (), $1); m->unprotect (); /* UGH */ - - if (scm_is_pair (scm_cdr (s))) - scm_set_cdr_x (scm_cdr (s), c); /* append */ - else - scm_set_car_x (s, c); /* set first cons */ - scm_set_cdr_x (s, c); /* remember last cell */ } ; music: simple_music | composite_music + | MUSIC_IDENTIFIER ; alternative_music: @@ -974,7 +1015,7 @@ alternative_music: $$ = SCM_EOL; } | ALTERNATIVE '{' music_list '}' { - $$ = scm_car ($3); + $$ = scm_reverse_x ($3, SCM_EOL); } ; @@ -988,25 +1029,24 @@ repeated_music: sequential_music: SEQUENTIAL '{' music_list '}' { - $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($3)); + $$ = MAKE_SYNTAX ("sequential-music", @$, scm_reverse_x ($3, SCM_EOL)); } | '{' music_list '}' { - $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($2)); + $$ = MAKE_SYNTAX ("sequential-music", @$, scm_reverse_x ($2, SCM_EOL)); } ; simultaneous_music: SIMULTANEOUS '{' music_list '}'{ - $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($3)); + $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_reverse_x ($3, SCM_EOL)); } | DOUBLE_ANGLE_OPEN music_list DOUBLE_ANGLE_CLOSE { - $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($2)); + $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_reverse_x ($2, SCM_EOL)); } ; simple_music: event_chord - | MUSIC_IDENTIFIER | music_property_def | context_change ; @@ -1056,13 +1096,25 @@ composite_music: | grouped_music_list { $$ = $1; } ; +/* Music that can't be followed by additional events or durations */ +closed_music: + MUSIC_IDENTIFIER + | grouped_music_list + ; + +/* Music that potentially accepts additional events or durations */ +open_music: + simple_music + | prefix_composite_music + ; + grouped_music_list: simultaneous_music { $$ = $1; } | sequential_music { $$ = $1; } ; function_scm_argument: - embedded_scm + closed_embedded_scm | simple_string ; @@ -1070,10 +1122,29 @@ function_scm_argument: MUSIC_FUNCTION EXPECT_MUSIC EXPECT_SCM EXPECT_SCM EXPECT_NO_MORE_ARGS and this rule returns the reversed list of arguments. */ -function_arglist_music_last: - EXPECT_MUSIC function_arglist music { + +function_arglist: + closed_function_arglist + | open_function_arglist + ; + +open_function_arglist: + EXPECT_MUSIC function_arglist open_music { $$ = scm_cons ($3, $2); } + | EXPECT_SCM function_arglist open_scm_function_call { + $$ = scm_cons ($3, $2); + } + ; + +/* a closed argument list is one that does not end in a music + expression that could still take a duration or event */ + +closed_function_arglist: + function_arglist_nonmusic_last + | EXPECT_MUSIC function_arglist closed_music { + $$ = scm_cons ($3, $2); + } ; function_arglist_nonmusic_last: @@ -1088,10 +1159,10 @@ function_arglist_nonmusic_last: | EXPECT_MARKUP function_arglist simple_string { $$ = scm_cons ($3, $2); } - | EXPECT_PITCH function_arglist pitch { + | EXPECT_PITCH function_arglist pitch_also_in_chords { $$ = scm_cons ($3, $2); } - | EXPECT_DURATION function_arglist_nonmusic_last duration_length { + | EXPECT_DURATION closed_function_arglist duration_length { $$ = scm_cons ($3, $2); } | EXPECT_SCM function_arglist function_scm_argument { @@ -1099,34 +1170,10 @@ function_arglist_nonmusic_last: } ; -function_arglist_nonmusic: EXPECT_NO_MORE_ARGS { - $$ = SCM_EOL; - } - | EXPECT_MARKUP function_arglist_nonmusic full_markup { - $$ = scm_cons ($3, $2); - } - | EXPECT_MARKUP function_arglist_nonmusic simple_string { - $$ = scm_cons ($3, $2); - } - | EXPECT_PITCH function_arglist_nonmusic pitch { - $$ = scm_cons ($3, $2); - } - | EXPECT_DURATION function_arglist_nonmusic duration_length { - $$ = scm_cons ($3, $2); - } - | EXPECT_SCM function_arglist_nonmusic function_scm_argument { - $$ = scm_cons ($3, $2); - } - ; - -function_arglist: - function_arglist_music_last - | function_arglist_nonmusic_last - ; - generic_prefix_music_scm: MUSIC_FUNCTION function_arglist { - $$ = scm_cons ($1, scm_cons (make_input (@$), scm_reverse_x ($2, SCM_EOL))); + $$ = run_music_function (PARSER, @$, + $1, $2); } ; @@ -1140,9 +1187,7 @@ optional_id: prefix_composite_music: - generic_prefix_music_scm { - $$ = run_music_function (PARSER, $1); - } + generic_prefix_music_scm | CONTEXT simple_string optional_id optional_context_mod music { Context_mod *ctxmod = unsmob_context_mod ($4); SCM mods = SCM_EOL; @@ -1162,12 +1207,6 @@ prefix_composite_music: $$ = MAKE_SYNTAX ("time-scaled-music", @$, $2, $3); } | repeated_music { $$ = $1; } - | TRANSPOSE pitch_also_in_chords pitch_also_in_chords music { - Pitch from = *unsmob_pitch ($2); - Pitch to = *unsmob_pitch ($3); - SCM pitch = pitch_interval (from, to).smobbed_copy (); - $$ = MAKE_SYNTAX ("transpose-music", @$, pitch, $4); - } | mode_changing_head grouped_music_list { if ($1 == ly_symbol2scm ("chords")) { @@ -1268,38 +1307,23 @@ relative_music: new_lyrics: ADDLYRICS { PARSER->lexer_->push_lyric_state (); } /*cont */ - grouped_music_list { + closed_music { /* Can also use music at the expensive of two S/Rs similar to \repeat \alternative */ PARSER->lexer_->pop_state (); $$ = scm_cons ($3, SCM_EOL); } - | ADDLYRICS { - PARSER->lexer_->push_lyric_state (); } - MUSIC_IDENTIFIER { - PARSER->lexer_->pop_state (); - $$ = scm_cons ($3, SCM_EOL); - } - | new_lyrics ADDLYRICS { - PARSER->lexer_->push_lyric_state (); - } grouped_music_list { - PARSER->lexer_->pop_state (); - $$ = scm_cons ($4, $1); - } | new_lyrics ADDLYRICS { PARSER->lexer_->push_lyric_state (); - } MUSIC_IDENTIFIER { + } closed_music { PARSER->lexer_->pop_state (); $$ = scm_cons ($4, $1); } ; re_rhythmed_music: - grouped_music_list new_lyrics { - $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); - } - | MUSIC_IDENTIFIER new_lyrics { + closed_music new_lyrics { $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); } | LYRICSTO simple_string { @@ -1318,10 +1342,10 @@ context_change: property_path_revved: - embedded_scm { + closed_embedded_scm { $$ = scm_cons ($1, SCM_EOL); } - | property_path_revved embedded_scm { + | property_path_revved closed_embedded_scm { $$ = scm_cons ($2, $1); } ; @@ -1459,7 +1483,7 @@ simple_string: STRING { } ; -scalar: string { +closed_scalar: string { $$ = $1; } | lyric_element { @@ -1468,15 +1492,16 @@ scalar: string { | bare_number { $$ = $1; } - | embedded_scm { + | closed_embedded_scm { $$ = $1; } | full_markup { $$ = $1; } - | DIGIT { - $$ = scm_from_int ($1); - } + ; + +scalar: closed_scalar + | open_scm_function_call ; event_chord: @@ -1578,7 +1603,6 @@ chord_body_element: } | DRUM_PITCH post_events { Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); - n->set_property ("duration", $2); n->set_property ("drum-type", $1); if (scm_is_pair ($2)) { @@ -1587,41 +1611,48 @@ chord_body_element: } $$ = n->unprotect (); } - | music_function_chord_body { - $$ = run_music_function (PARSER, $1); - } + | music_function_chord_body ; -music_function_identifier_musicless_prefix: MUSIC_FUNCTION { - SCM sig = scm_object_property (yylval.scm, ly_symbol2scm ("music-function-signature")); - if (scm_is_pair (sig) && to_boolean (scm_memq (ly_music_p_proc, scm_cdr (scm_reverse (sig))))) - { - PARSER->parser_error (@$, "Music function applied to event may not have a Music argument, except as the last argument."); - } +/* We can't accept a music argument, not even a closed one, + * immediately before chord_body_elements, otherwise a function \fun + * with a signature of two music arguments can't be sorted out + * properly in a construct like + * <\fun { c } \fun { c } c> + * The second call could be interpreted either as a chord constituent + * or a music expression. + */ + +music_function_chord_body_arglist: + function_arglist_nonmusic_last + | EXPECT_MUSIC music_function_chord_body_arglist chord_body_element { + $$ = scm_cons ($3, $2); } ; music_function_chord_body: - /* We could allow chord functions to have multiple music arguments, - but it's more consistent with music_function_event if we - prohibit it here too */ - music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic chord_body_element { - $$ = scm_cons ($1, scm_cons (make_input (@$), scm_reverse_x ($3, scm_list_1 ($4)))); + MUSIC_FUNCTION music_function_chord_body_arglist { + $$ = run_music_function (PARSER, @$, + $1, $2); } - | music_function_identifier_musicless_prefix function_arglist_nonmusic { - $$ = scm_cons ($1, scm_cons (make_input (@$), scm_reverse_x ($2, SCM_EOL))); + ; + +/* We could accept a closed music argument before the post events + * indicated by a trailing argument list. For symmetry with chord + * bodies and in order to avoid too tricky and complex behavior, we + * refrain from doing so. + */ +music_function_event_arglist: + function_arglist_nonmusic_last + | EXPECT_MUSIC music_function_event_arglist post_event { + $$ = scm_cons ($3, $2); } ; music_function_event: - /* Post-events can only have the last argument as music, without this - restriction we get a shift/reduce conflict from e.g. - c8-\partcombine c8 -. */ - music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic post_event { - $$ = scm_cons ($1, scm_cons (make_input (@$), scm_reverse_x ($3, scm_list_1 ($4)))); - } - | music_function_identifier_musicless_prefix function_arglist_nonmusic { - $$ = scm_cons ($1, scm_cons (make_input (@$), scm_reverse_x ($2, SCM_EOL))); + MUSIC_FUNCTION music_function_event_arglist { + $$ = run_music_function (PARSER, @$, + $1, $2); } ; @@ -1629,9 +1660,6 @@ command_element: command_event { $$ = $1; } - | SKIP duration_length { - $$ = MAKE_SYNTAX ("skip-music", @$, $2); - } | E_BRACKET_OPEN { Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$); m->set_property ("span-direction", scm_from_int (START)); @@ -1659,10 +1687,6 @@ command_element: $$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED); } - | PARTIAL duration_length { - $$ = MAKE_SYNTAX ("partial", @$, $2); - } - | TIME_T fraction { SCM proc = ly_lily_module_constant ("make-time-signature-set"); @@ -1715,12 +1739,12 @@ post_events: } ; -post_event: +post_event_nofinger: direction_less_event { $$ = $1; } | script_dir music_function_event { - $$ = run_music_function (PARSER, $2); + $$ = $2; if ($1) { unsmob_music ($$)->set_property ("direction", scm_from_int ($1)); @@ -1755,6 +1779,18 @@ post_event: | string_number_event ; +post_event: + post_event_nofinger + | script_dir fingering { + if ($1) + { + Music *m = unsmob_music ($2); + m->set_property ("direction", scm_from_int ($1)); + } + $$ = $2; + } + ; + string_number_event: E_UNSIGNED { Music *s = MY_MAKE_MUSIC ("StringNumberEvent", @$); @@ -1901,6 +1937,7 @@ pitch: steno_pitch { $$ = $1; } + | PITCH_IDENTIFIER ; pitch_also_in_chords: @@ -1920,7 +1957,10 @@ gen_text_def: make_simple_markup ($1)); $$ = t->unprotect (); } - | DIGIT { + ; + +fingering: + UNSIGNED { Music *t = MY_MAKE_MUSIC ("FingeringEvent", @$); t->set_property ("digit", scm_from_int ($1)); $$ = t->unprotect (); @@ -1959,7 +1999,7 @@ script_dir: absolute_pitch: - steno_pitch { + pitch { $$ = $1; } ; @@ -2042,10 +2082,7 @@ tremolo_type: ; bass_number: - DIGIT { - $$ = scm_from_int ($1); - } - | UNSIGNED { + UNSIGNED { $$ = scm_from_int ($1); } | STRING { $$ = $1; } @@ -2375,9 +2412,6 @@ bare_unsigned: UNSIGNED { $$ = $1; } - | DIGIT { - $$ = $1; - } ; unsigned_number: @@ -2488,7 +2522,7 @@ markup_braced_list_body: ; markup_command_list: - MARKUP_LIST_FUNCTION markup_command_list_arguments { + MARKUP_LIST_FUNCTION closed_markup_command_list_arguments { $$ = scm_cons ($1, scm_reverse_x($2, SCM_EOL)); } ; @@ -2497,7 +2531,7 @@ markup_command_basic_arguments: EXPECT_MARKUP_LIST markup_command_list_arguments markup_list { $$ = scm_cons ($3, $2); } - | EXPECT_SCM markup_command_list_arguments embedded_scm { + | EXPECT_SCM markup_command_list_arguments closed_embedded_scm { $$ = scm_cons ($3, $2); } | EXPECT_NO_MORE_ARGS { @@ -2505,13 +2539,21 @@ markup_command_basic_arguments: } ; -markup_command_list_arguments: +closed_markup_command_list_arguments: markup_command_basic_arguments { $$ = $1; } | EXPECT_MARKUP markup_command_list_arguments markup { $$ = scm_cons ($3, $2); } ; +markup_command_list_arguments: + closed_markup_command_list_arguments + | EXPECT_SCM markup_command_list_arguments open_scm_function_call + { + $$ = scm_cons ($3, $2); + } + ; + markup_head_1_item: MARKUP_FUNCTION EXPECT_MARKUP markup_command_list_arguments { $$ = scm_cons ($1, scm_reverse_x ($3, SCM_EOL)); @@ -2631,6 +2673,9 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) mus->unprotect (); return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER; + } else if (unsmob_pitch (sid)) { + *destination = unsmob_pitch (sid)->smobbed_copy (); + return PITCH_IDENTIFIER; } else if (unsmob_duration (sid)) { *destination = unsmob_duration (sid)->smobbed_copy (); return DURATION_IDENTIFIER; @@ -2672,22 +2717,21 @@ get_next_unique_lyrics_context_id () SCM -run_music_function (Lily_parser *parser, SCM expr) +run_music_function (Lily_parser *parser, Input loc, SCM func, SCM args) { - SCM func = scm_car (expr); - Input *loc = unsmob_input (scm_cadr (expr)); - SCM args = scm_cddr (expr); SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature")); SCM type_check_proc = ly_lily_module_constant ("type-check-list"); - if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr (expr), sig, args))) + args = scm_reverse_x (args, SCM_EOL); + + if (!to_boolean (scm_call_3 (type_check_proc, make_input (loc), scm_cdr (sig), args))) { parser->error_level_ = 1; - return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("void-music"), scm_list_2 (parser->self_scm (), make_input (*loc))); + return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("void-music"), scm_list_2 (parser->self_scm (), make_input (loc))); } - SCM syntax_args = scm_list_4 (parser->self_scm (), make_input (*loc), func, args); + SCM syntax_args = scm_list_5 (parser->self_scm (), make_input (loc), scm_car (sig), func, args); return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("music-function"), syntax_args); }