X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=f6baa9986889d1d1db835e233bc5c45db81a404b;hb=a2d0217d78461bae6ae695a605b3e0a03409596c;hp=4b38cca61865745960294ce94be6f6bf1a42c2cb;hpb=15b68cfaf76e2eec0497f5bff38d023b76a0ed9d;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 4b38cca618..f6baa99868 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -40,13 +40,11 @@ deleting them. Let's hope that a stack overflow doesnt trigger a move of the parse stack onto the heap. */ -%left PREC_TOP -%left ADDLYRICS %left PREC_BOT +%nonassoc REPEAT +%nonassoc ALTERNATIVE -%expect 1 - -/* One shift/reduce problem +/* The above precedences tackle the shift/reduce problem 1. \repeat \repeat .. \alternative @@ -58,6 +56,22 @@ or \repeat { \repeat } \alternative */ +%right FUNCTION_ARGUMENTS + MARKUP LYRICS_STRING MARKUP_IDENTIFIER STRING STRING_IDENTIFIER + SEQUENTIAL SIMULTANEOUS DOUBLE_ANGLE_OPEN MUSIC_IDENTIFIER '{' + PITCH_IDENTIFIER NOTENAME_PITCH TONICNAME_PITCH + SCM_FUNCTION SCM_IDENTIFIER SCM_TOKEN + UNSIGNED DURATION_IDENTIFIER + CHORDMODE CHORDS DRUMMODE DRUMS FIGUREMODE FIGURES LYRICMODE LYRICS + NOTEMODE + + /* The above are the symbols that can start function arguments */ + +%left ADDLYRICS +%left PREC_TOP + + + %pure_parser %locations @@ -95,10 +109,8 @@ using namespace std; #include "main.hh" #include "misc.hh" #include "music.hh" -#include "music.hh" #include "output-def.hh" #include "paper-book.hh" -#include "program-option.hh" #include "scm-hash.hh" #include "score.hh" #include "text-interface.hh" @@ -129,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 (); @@ -144,8 +156,9 @@ 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 check_scheme_arg (Lily_parser *parser, Input loc, SCM fallback, + SCM arg, SCM args, SCM pred); +SCM loc_on_music (Input loc, SCM arg); 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 +200,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,12 +212,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" %token REST "\\rest" @@ -213,10 +223,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 +271,23 @@ 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?" +%token EXPECT_OPTIONAL "optional?" /* 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,8 +295,10 @@ 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 EVENT_FUNCTION %token FRACTION %token LYRICS_STRING %token LYRIC_MARKUP_IDENTIFIER @@ -300,6 +313,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,9 +341,11 @@ If we give names, Bison complains. /* Music */ %type composite_music %type grouped_music_list +%type braced_music_list %type closed_music %type music -%type prefix_composite_music +%type complex_music +%type mode_changed_music %type repeated_music %type sequential_music %type simple_music @@ -342,15 +358,18 @@ 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 @@ -360,10 +379,8 @@ If we give names, Bison complains. %type output_def %type paper_block -%type alternative_music -%type generic_prefix_music_scm +%type music_function_call %type music_list -%type absolute_pitch %type assignment_id %type bare_number %type unsigned_number @@ -384,17 +401,25 @@ If we give names, Bison complains. %type direction_less_char %type duration_length %type embedded_scm +%type embedded_scm_bare +%type embedded_scm_closed +%type embedded_scm_chord_body +%type embedded_scm_event +%type event_function_event %type figure_list %type figure_spec %type fraction %type full_markup %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 function_arglist_optional +%type function_arglist_keep +%type function_arglist_bare +%type function_arglist_closed +%type function_arglist_closed_optional +%type function_arglist_closed_keep %type identifier_init +%type lilypond %type lilypond_header %type lilypond_header_body %type lyric_element @@ -413,9 +438,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 @@ -431,6 +457,10 @@ If we give names, Bison complains. %type property_operation %type property_path property_path_revved %type scalar +%type scalar_bare +%type scalar_closed +%type scm_function_call +%type scm_function_call_closed %type script_abbreviation %type simple_chord_elements %type simple_markup @@ -456,7 +486,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 { @@ -522,11 +563,43 @@ toplevel_expression: } ; -embedded_scm: +embedded_scm_bare: SCM_TOKEN | SCM_IDENTIFIER ; +/* The generic version may end in music, or not */ + +embedded_scm: + embedded_scm_bare + | scm_function_call + ; + +scm_function_call: + SCM_FUNCTION function_arglist { + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $2); + } + ; + +embedded_lilypond: + /* empty */ + { + $$ = MAKE_SYNTAX ("void-music", @$); + } + | 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; + } + ; + lilypond_header_body: { @@ -604,7 +677,7 @@ identifier_init: else $$ = MAKE_SYNTAX ("event-chord", @$, scm_list_1 ($1)); } - | post_event { + | post_event_nofinger { $$ = $1; } | number_expression { @@ -622,9 +695,6 @@ identifier_init: | full_markup_list { $$ = $1; } - | DIGIT { - $$ = scm_from_int ($1); - } | context_modification { $$ = $1; } @@ -734,6 +804,7 @@ book_body: | book_body lilypond_header { $$->header_ = $2; } + | book_body embedded_scm { } | book_body error { $$->paper_ = 0; $$->scores_ = SCM_EOL; @@ -786,6 +857,7 @@ bookpart_body: | bookpart_body lilypond_header { $$->header_ = $2; } + | bookpart_body embedded_scm { } | bookpart_body error { $$->paper_ = 0; $$->scores_ = SCM_EOL; @@ -917,7 +989,7 @@ tempo_event: TEMPO steno_duration '=' tempo_range { $$ = MAKE_SYNTAX ("tempo", @$, SCM_EOL, $2, $4); } - | TEMPO scalar steno_duration '=' tempo_range { + | TEMPO scalar_closed steno_duration '=' tempo_range { $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, $5); } | TEMPO scalar { @@ -926,25 +998,14 @@ tempo_event: ; /* -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 { @@ -953,15 +1014,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 */ +braced_music_list: + '{' music_list '}' + { + $$ = scm_reverse_x ($2, SCM_EOL); } ; @@ -970,44 +1031,38 @@ music: | composite_music ; -alternative_music: - /* empty */ { - $$ = SCM_EOL; - } - | ALTERNATIVE '{' music_list '}' { - $$ = scm_car ($3); - } - ; - repeated_music: - REPEAT simple_string unsigned_number music alternative_music + REPEAT simple_string unsigned_number music + { + $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, SCM_EOL); + } + | REPEAT simple_string unsigned_number music ALTERNATIVE braced_music_list { - $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $5); + $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $6); } ; sequential_music: - SEQUENTIAL '{' music_list '}' { - $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($3)); + SEQUENTIAL braced_music_list { + $$ = MAKE_SYNTAX ("sequential-music", @$, $2); } - | '{' music_list '}' { - $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($2)); + | braced_music_list { + $$ = MAKE_SYNTAX ("sequential-music", @$, $1); } ; simultaneous_music: - SIMULTANEOUS '{' music_list '}'{ - $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($3)); + SIMULTANEOUS braced_music_list { + $$ = MAKE_SYNTAX ("simultaneous-music", @$, $2); } | 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 ; @@ -1053,13 +1108,14 @@ context_mod_list: ; composite_music: - prefix_composite_music { $$ = $1; } - | grouped_music_list { $$ = $1; } + complex_music + | closed_music ; /* Music that can't be followed by additional events or durations */ closed_music: - MUSIC_IDENTIFIER + mode_changed_music + | MUSIC_IDENTIFIER | grouped_music_list ; @@ -1068,72 +1124,177 @@ grouped_music_list: | sequential_music { $$ = $1; } ; -function_scm_argument: - embedded_scm - | simple_string - ; - /* An argument list. If a function \foo expects scm scm music, then the lexer expands \foo into the token sequence: 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: + function_arglist_bare + | EXPECT_MUSIC function_arglist_optional music + { $$ = scm_cons ($3, $2); } + | EXPECT_SCM function_arglist_optional embedded_scm + { + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, $3, $2, $1); + } ; -function_arglist_nonmusic_last: - EXPECT_NO_MORE_ARGS { - /* This is for 0-ary functions, so they don't need to - read a lookahead token */ - $$ = SCM_EOL; +function_arglist_optional: + function_arglist_keep %prec FUNCTION_ARGUMENTS + | EXPECT_OPTIONAL EXPECT_MUSIC function_arglist_optional + { + $$ = scm_cons (loc_on_music (@3, $1), $3); } - | EXPECT_MARKUP function_arglist full_markup { - $$ = scm_cons ($3, $2); + | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_optional + { + $$ = scm_cons ($1, $3); } - | EXPECT_MARKUP function_arglist simple_string { - $$ = scm_cons ($3, $2); + | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_optional + { + $$ = scm_cons ($1, $3); + } + | EXPECT_OPTIONAL EXPECT_MARKUP function_arglist_optional + { + $$ = scm_cons ($1, $3); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_optional + { + $$ = scm_cons (loc_on_music (@3, $1), $3); + } + ; + +function_arglist_keep: + EXPECT_OPTIONAL EXPECT_MARKUP function_arglist_keep full_markup { + $$ = scm_cons ($4, $3); } - | EXPECT_PITCH function_arglist pitch { - $$ = scm_cons ($3, $2); + | EXPECT_OPTIONAL EXPECT_MARKUP function_arglist_keep simple_string { + $$ = scm_cons ($4, $3); } - | EXPECT_DURATION function_arglist_nonmusic_last duration_length { - $$ = scm_cons ($3, $2); + | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_keep pitch_also_in_chords { + $$ = scm_cons ($4, $3); } - | EXPECT_SCM function_arglist function_scm_argument { + | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_keep duration_length { + $$ = scm_cons ($4, $3); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep simple_string + { + $$ = check_scheme_arg (PARSER, @4, $1, $4, $3, $2); + } + | EXPECT_OPTIONAL EXPECT_MUSIC function_arglist_keep closed_music + { + $$ = scm_cons ($4, $3); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep embedded_scm + { + $$ = check_scheme_arg (PARSER, @4, $1, $4, $3, $2); + } + | function_arglist + ; + + +function_arglist_closed: + function_arglist_bare + | EXPECT_MUSIC function_arglist_optional closed_music + { $$ = scm_cons ($3, $2); } + | EXPECT_SCM function_arglist_optional embedded_scm_closed + { + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, $3, $2, $1); + } + ; + +function_arglist_closed_optional: + function_arglist_closed_keep %prec FUNCTION_ARGUMENTS + | EXPECT_OPTIONAL EXPECT_MUSIC function_arglist_closed_optional + { + $$ = scm_cons (loc_on_music (@3, $1), $3); + } + | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_closed_optional + { + $$ = scm_cons ($1, $3); + } + | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_optional + { + $$ = scm_cons ($1, $3); + } + | EXPECT_OPTIONAL EXPECT_MARKUP function_arglist_closed_optional + { + $$ = scm_cons ($1, $3); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_optional + { + $$ = scm_cons (loc_on_music (@3, $1), $3); + } + ; + +function_arglist_closed_keep: + EXPECT_OPTIONAL EXPECT_MARKUP function_arglist_keep full_markup { + $$ = scm_cons ($4, $3); + } + | EXPECT_OPTIONAL EXPECT_MARKUP function_arglist_keep simple_string { + $$ = scm_cons ($4, $3); + } + | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_keep pitch_also_in_chords { + $$ = scm_cons ($4, $3); + } + | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_keep duration_length { + $$ = scm_cons ($4, $3); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep simple_string + { + $$ = check_scheme_arg (PARSER, @4, $1, $4, $3, $2); + } + | EXPECT_OPTIONAL EXPECT_MUSIC function_arglist_keep closed_music + { + $$ = scm_cons ($4, $3); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep embedded_scm_closed + { + $$ = check_scheme_arg (PARSER, @4, $1, $4, $3, $2); + } + | function_arglist_closed + ; + +embedded_scm_closed: + embedded_scm_bare + | scm_function_call_closed + ; + +scm_function_call_closed: + SCM_FUNCTION function_arglist_closed { + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $2); + } ; -function_arglist_nonmusic: EXPECT_NO_MORE_ARGS { +function_arglist_bare: + EXPECT_NO_MORE_ARGS { $$ = SCM_EOL; } - | EXPECT_MARKUP function_arglist_nonmusic full_markup { + | EXPECT_MARKUP function_arglist_optional full_markup { $$ = scm_cons ($3, $2); } - | EXPECT_MARKUP function_arglist_nonmusic simple_string { + | EXPECT_MARKUP function_arglist_optional 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_PITCH function_arglist_optional pitch_also_in_chords { + $$ = scm_cons ($3, $2); } - | EXPECT_SCM function_arglist_nonmusic function_scm_argument { + | EXPECT_DURATION function_arglist_closed_optional duration_length { $$ = scm_cons ($3, $2); } + | EXPECT_SCM function_arglist_optional simple_string { + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, $3, $2, $1); + } ; -function_arglist: - function_arglist_music_last - | function_arglist_nonmusic_last - ; - -generic_prefix_music_scm: +music_function_call: MUSIC_FUNCTION function_arglist { - $$ = scm_cons ($1, scm_cons (make_input (@$), scm_reverse_x ($2, SCM_EOL))); + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $2); } ; @@ -1145,37 +1306,32 @@ optional_id: } ; - -prefix_composite_music: - generic_prefix_music_scm { - $$ = run_music_function (PARSER, $1); - } +complex_music: + music_function_call | CONTEXT simple_string optional_id optional_context_mod music { Context_mod *ctxmod = unsmob_context_mod ($4); SCM mods = SCM_EOL; if (ctxmod) mods = ctxmod->get_mods (); - $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, mods, SCM_BOOL_F); + $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, mods, SCM_BOOL_F, $5); } | NEWCONTEXT simple_string optional_id optional_context_mod music { Context_mod *ctxmod = unsmob_context_mod ($4); SCM mods = SCM_EOL; if (ctxmod) mods = ctxmod->get_mods (); - $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, mods, SCM_BOOL_T); + $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, mods, SCM_BOOL_T, $5); } | TIMES fraction 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 { + | re_rhythmed_music { $$ = $1; } + ; + +mode_changed_music: + mode_changing_head grouped_music_list { if ($1 == ly_symbol2scm ("chords")) { $$ = MAKE_SYNTAX ("unrelativable-music", @$, $2); @@ -1191,15 +1347,13 @@ prefix_composite_music: SCM mods = SCM_EOL; if (ctxmod) mods = ctxmod->get_mods (); - $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, mods, SCM_BOOL_T); + $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, mods, SCM_BOOL_T, $3); if ($1 == ly_symbol2scm ("ChordNames")) { $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$); } PARSER->lexer_->pop_state (); } - | relative_music { $$ = $1; } - | re_rhythmed_music { $$ = $1; } ; mode_changing_head: @@ -1260,18 +1414,6 @@ mode_changing_head_with_context: } ; - -relative_music: - RELATIVE absolute_pitch music { - Pitch start = *unsmob_pitch ($2); - $$ = make_music_relative (start, $3, @$); - } - | RELATIVE composite_music { - Pitch middle_c (0, 0, 0); - $$ = make_music_relative (middle_c, $2, @$); - } - ; - new_lyrics: ADDLYRICS { PARSER->lexer_->push_lyric_state (); } /*cont */ @@ -1310,10 +1452,10 @@ context_change: property_path_revved: - embedded_scm { + embedded_scm_closed { $$ = scm_cons ($1, SCM_EOL); } - | property_path_revved embedded_scm { + | property_path_revved embedded_scm_closed { $$ = scm_cons ($2, $1); } ; @@ -1451,7 +1593,8 @@ simple_string: STRING { } ; -scalar: string { +scalar_bare: + string { $$ = $1; } | lyric_element { @@ -1460,17 +1603,25 @@ scalar: string { | bare_number { $$ = $1; } - | embedded_scm { + | embedded_scm_bare { $$ = $1; } | full_markup { $$ = $1; } - | DIGIT { - $$ = scm_from_int ($1); - } ; +scalar: + scalar_bare | + scm_function_call + ; + +scalar_closed: + scalar_bare | + scm_function_call_closed + ; + + event_chord: /* TODO: Create a special case that avoids the creation of EventChords around simple_elements that have no post_events? @@ -1570,7 +1721,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)) { @@ -1579,41 +1729,77 @@ chord_body_element: } $$ = n->unprotect (); } - | music_function_chord_body { - $$ = run_music_function (PARSER, $1); + | music_function_chord_body + ; + +/* 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_bare + | EXPECT_MUSIC music_function_chord_body_arglist chord_body_element { + $$ = scm_cons ($3, $2); + } + | EXPECT_SCM function_arglist_optional embedded_scm_chord_body { + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, $3, $2, $1); } ; -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."); - } +embedded_scm_chord_body: + embedded_scm_bare + | SCM_FUNCTION music_function_chord_body_arglist { + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $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 { + $$ = MAKE_SYNTAX ("music-function", @$, + $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_bare + | EXPECT_MUSIC music_function_event_arglist post_event { + $$ = scm_cons ($3, $2); + } + | EXPECT_SCM function_arglist_optional embedded_scm_event { + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, $3, $2, $1); + } + ; + +embedded_scm_event: + embedded_scm_bare + | SCM_FUNCTION music_function_event_arglist { + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $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 music_function_event_arglist { + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $2); } - | music_function_identifier_musicless_prefix function_arglist_nonmusic { - $$ = scm_cons ($1, scm_cons (make_input (@$), scm_reverse_x ($2, SCM_EOL))); + ; + +event_function_event: + EVENT_FUNCTION music_function_event_arglist { + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $2); } ; @@ -1621,9 +1807,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)); @@ -1635,7 +1818,7 @@ command_element: $$ = m->unprotect (); } | E_BACKSLASH { - $$ = MAKE_SYNTAX ("voice-separator", @$, SCM_UNDEFINED); + $$ = MAKE_SYNTAX ("voice-separator", @$); } | '|' { SCM pipe = PARSER->lexer_->lookup_identifier ("pipeSymbol"); @@ -1648,13 +1831,9 @@ command_element: $$ = m->unprotect (); } else - $$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED); + $$ = MAKE_SYNTAX ("bar-check", @$); } - | PARTIAL duration_length { - $$ = MAKE_SYNTAX ("partial", @$, $2); - } - | TIME_T fraction { SCM proc = ly_lily_module_constant ("make-time-signature-set"); @@ -1707,12 +1886,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)); @@ -1747,6 +1926,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", @$); @@ -1811,6 +2002,7 @@ direction_less_event: a->set_property ("tremolo-type", scm_from_int ($1)); $$ = a->unprotect (); } + | event_function_event ; direction_reqd_event: @@ -1893,6 +2085,7 @@ pitch: steno_pitch { $$ = $1; } + | PITCH_IDENTIFIER ; pitch_also_in_chords: @@ -1912,7 +2105,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 (); @@ -1949,13 +2145,6 @@ script_dir: | '-' { $$ = CENTER; } ; - -absolute_pitch: - steno_pitch { - $$ = $1; - } - ; - duration_length: multiplied_duration { $$ = $1; @@ -2034,10 +2223,7 @@ tremolo_type: ; bass_number: - DIGIT { - $$ = scm_from_int ($1); - } - | UNSIGNED { + UNSIGNED { $$ = scm_from_int ($1); } | STRING { $$ = $1; } @@ -2367,9 +2553,6 @@ bare_unsigned: UNSIGNED { $$ = $1; } - | DIGIT { - $$ = $1; - } ; unsigned_number: @@ -2489,8 +2672,8 @@ 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 { - $$ = scm_cons ($3, $2); + | EXPECT_SCM markup_command_list_arguments embedded_scm_closed { + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, $3, $2, $1); } | EXPECT_NO_MORE_ARGS { $$ = SCM_EOL; @@ -2623,6 +2806,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; @@ -2663,24 +2849,34 @@ get_next_unique_lyrics_context_id () } -SCM -run_music_function (Lily_parser *parser, SCM expr) +SCM check_scheme_arg (Lily_parser *parser, Input loc, SCM fallback, + SCM arg, SCM args, SCM pred) { - 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))) + SCM type_check_arg = ly_lily_module_constant ("type-check-arg"); + if (scm_is_false (scm_call_4 (type_check_arg, make_input (loc), + arg, args, pred))) { + if (SCM_UNBNDP (fallback)) + fallback = SCM_BOOL_F; + else + fallback = loc_on_music (loc, fallback); + parser->error_level_ = 1; - return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("void-music"), scm_list_2 (parser->self_scm (), make_input (*loc))); + + return scm_cons (fallback, args); } + return scm_cons (arg, args); +} - SCM syntax_args = scm_list_4 (parser->self_scm (), make_input (*loc), func, args); - return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("music-function"), syntax_args); +SCM loc_on_music (Input loc, SCM arg) +{ + if (Music *m = unsmob_music (arg)) + { + m = m->clone (); + m->set_spot (loc); + return m->unprotect (); + } + return arg; } bool @@ -2772,19 +2968,6 @@ ly_input_procedure_p (SCM x) || (scm_is_pair (x) && ly_is_procedure (scm_car (x))); } -SCM -make_music_relative (Pitch start, SCM music, Input loc) -{ - Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic", loc); - relative->set_property ("element", music); - - Music *m = unsmob_music (music); - Pitch last = m->to_relative_octave (start); - if (lily_1_8_relative) - m->set_property ("last-pitch", last.smobbed_copy ()); - return relative->unprotect (); -} - int yylex (YYSTYPE *s, YYLTYPE *loc, void *v) {