X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=8d7f82eeb7f5b7bec71a2e2d712628dab5af032a;hb=0722babbea9d5a6b26c4872cbb7ba41ba55cb7bc;hp=031e117e9022e7aff87bda04900b30f4f1a0df38;hpb=1c846b2c2348b4e0ca4a3c2e8fb267047ba2d203;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 031e117e90..8d7f82eeb7 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,41 @@ or \repeat { \repeat } \alternative */ +%nonassoc COMPOSITE +%left ADDLYRICS + + /* ADDLYRICS needs to have lower precedence than argument scanning, + * or we won't be able to tell music apart from closed_music without + * lookahead in the context of function calls. + */ + +%nonassoc DEFAULT + + /* \default is only applied after exhausting function arguments */ + +%nonassoc FUNCTION_ARGLIST + + /* expressions with units are permitted into argument lists */ + +%right PITCH_IDENTIFIER NOTENAME_PITCH TONICNAME_PITCH + UNSIGNED REAL DURATION_IDENTIFIER ':' + + /* The above are the symbols that can start optional function arguments + that are recognized in the grammar rather than by predicate + */ + +%nonassoc NUMBER_IDENTIFIER '/' + + /* Number-unit expressions, where permitted, are concatenated into + * function arguments, just like fractions and tremoli. Tremoli must + * not have higher precedence than UNSIGNED, or Lilypond will not + * join ':' with a following optional number. + */ + +%left PREC_TOP + + + %pure_parser %locations @@ -95,15 +128,44 @@ 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" #include "warn.hh" +#define MYBACKUP(Token, Value, Location) \ +do \ + if (yychar == YYEMPTY) \ + { \ + if (Token) \ + PARSER->lexer_->push_extra_token (Token, Value); \ + PARSER->lexer_->push_extra_token (BACKUP); \ + } else { \ + PARSER->parser_error \ + (Location, _("Too much lookahead")); \ + } \ +while (0) + + +#define MYREPARSE(Location, Default, Pred, Token, Value) \ +do \ + if (yychar == YYEMPTY) \ + { \ + PARSER->lexer_->push_extra_token (Token, Value); \ + if (Default != SCM_UNDEFINED) \ + PARSER->lexer_->push_extra_token (REPARSE, \ + scm_cons (Default, Pred)); \ + else \ + PARSER->lexer_->push_extra_token (REPARSE, \ + Pred); \ + } else { \ + PARSER->parser_error \ + (Location, _("Too much lookahead")); \ + } \ +while (0) + %} @@ -112,7 +174,6 @@ using namespace std; Output_def *outputdef; SCM scm; std::string *string; - Music *music; Score *score; int i; } @@ -129,7 +190,11 @@ 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)); +#define START_MAKE_SYNTAX(name, ...) \ + scm_list_n (ly_lily_module_constant (name) , ##__VA_ARGS__, SCM_UNDEFINED) +#define FINISH_MAKE_SYNTAX(start, location, ...) \ + LOWLEVEL_MAKE_SYNTAX (scm_car (start), scm_cons2 (PARSER->self_scm (), make_input (location), scm_append_x (scm_list_2 (scm_cdr (start), scm_list_n (__VA_ARGS__, SCM_UNDEFINED))))) SCM get_next_unique_context_id (); SCM get_next_unique_lyrics_context_id (); @@ -144,12 +209,14 @@ 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); SCM make_simple_markup (SCM a); +SCM try_unpack_lyrics (SCM pred, SCM arg); bool is_duration (int t); bool is_regular_identifier (SCM id); bool ly_input_procedure_p (SCM x); @@ -187,24 +254,18 @@ void set_music_properties (Music *p, SCM a); %token FIGURES "\\figures" %token GROBDESCRIPTIONS "\\grobdescriptions" %token HEADER "\\header" -%token INVALID "\\invalid" -%token KEY "\\key" +%token INVALID "\\version-error" %token LAYOUT "\\layout" %token LYRICMODE "\\lyricmode" %token LYRICS "\\lyrics" %token LYRICSTO "\\lyricsto" -%token MARK "\\mark" %token MARKUP "\\markup" -%token MARKUPLINES "\\markuplines" +%token MARKUPLIST "\\markuplist" %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,16 +274,12 @@ 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" /* Keyword token exceptions. */ -%token TIME_T "\\time" %token NEWCONTEXT "\\new" @@ -263,18 +320,24 @@ If we give names, Bison complains. %token MULTI_MEASURE_REST -%token DIGIT %token E_UNSIGNED -%token UNSIGNED +%token UNSIGNED /* Artificial tokens, for more generic function syntax */ -%token EXPECT_MARKUP; -%token EXPECT_MUSIC; -%token EXPECT_SCM; -%token EXPECT_MARKUP_LIST +%token EXPECT_MARKUP "markup?" +%token EXPECT_PITCH "ly:pitch?" +%token EXPECT_DURATION "ly:duration?" +%token EXPECT_SCM "scheme?" +%token BACKUP "(backed-up?)" +%token REPARSE "(reparsed?)" +%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 @@ -282,14 +345,19 @@ 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_ELEMENT +%token LYRIC_ELEMENT_P %token LYRIC_MARKUP_IDENTIFIER %token MARKUP_FUNCTION %token MARKUP_LIST_FUNCTION %token MARKUP_IDENTIFIER +%token MARKUPLIST_IDENTIFIER %token MUSIC_FUNCTION %token MUSIC_IDENTIFIER %token NOTENAME_PITCH @@ -297,6 +365,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 @@ -324,8 +393,14 @@ 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 music_bare +%type music_arg +%type complex_music +%type complex_music_prefix +%type mode_changed_music %type repeated_music %type sequential_music %type simple_music @@ -338,15 +413,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 @@ -356,12 +434,11 @@ 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 bare_number_closed %type unsigned_number %type bass_figure %type figured_bass_modification @@ -380,20 +457,38 @@ If we give names, Bison complains. %type direction_less_char %type duration_length %type embedded_scm +%type embedded_scm_arg +%type embedded_scm_arg_closed +%type embedded_scm_bare +%type embedded_scm_bare_arg +%type embedded_scm_closed +%type embedded_scm_chord_body +%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_backup +%type function_arglist_nonbackup +%type function_arglist_skip +%type function_arglist_bare +%type function_arglist_closed +%type function_arglist_closed_optional +%type function_arglist_common +%type function_arglist_common_lyric +%type function_arglist_closed_common +%type function_arglist_keep +%type function_arglist_closed_keep %type identifier_init +%type lilypond %type lilypond_header %type lilypond_header_body %type lyric_element +%type lyric_element_arg +%type lyric_element_music %type lyric_markup %type markup %type markup_braced_list @@ -409,9 +504,9 @@ 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_chord_body +%type music_function_chord_body_arglist %type new_chord %type new_lyrics %type number_expression @@ -427,6 +522,9 @@ If we give names, Bison complains. %type property_operation %type property_path property_path_revved %type scalar +%type scalar_closed +%type scm_function_call +%type scm_function_call_closed %type script_abbreviation %type simple_chord_elements %type simple_markup @@ -452,7 +550,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 { @@ -518,11 +627,79 @@ toplevel_expression: } ; -embedded_scm: +embedded_scm_bare: SCM_TOKEN | SCM_IDENTIFIER ; +embedded_scm_bare_arg: + embedded_scm_bare + | STRING + | STRING_IDENTIFIER + | full_markup + | full_markup_list + | context_modification + | score_block + { + $$ = $1->self_scm (); + $1->unprotect (); + } + | context_def_spec_block + | book_block + { + $$ = $1->self_scm (); + $1->unprotect (); + } + | bookpart_block + { + $$ = $1->self_scm (); + $1->unprotect (); + } + | output_def + { + $$ = $1->self_scm (); + $1->unprotect (); + } + ; + +/* The generic version may end in music, or not */ + +embedded_scm: + embedded_scm_bare + | scm_function_call + ; + +embedded_scm_arg: + embedded_scm_bare_arg + | scm_function_call + | music_arg + ; + +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: { @@ -600,7 +777,7 @@ identifier_init: else $$ = MAKE_SYNTAX ("event-chord", @$, scm_list_1 ($1)); } - | post_event { + | post_event_nofinger { $$ = $1; } | number_expression { @@ -615,8 +792,8 @@ identifier_init: | full_markup { $$ = $1; } - | DIGIT { - $$ = scm_from_int ($1); + | full_markup_list { + $$ = $1; } | context_modification { $$ = $1; @@ -727,6 +904,7 @@ book_body: | book_body lilypond_header { $$->header_ = $2; } + | book_body embedded_scm { } | book_body error { $$->paper_ = 0; $$->scores_ = SCM_EOL; @@ -779,6 +957,7 @@ bookpart_body: | bookpart_body lilypond_header { $$->header_ = $2; } + | bookpart_body embedded_scm { } | bookpart_body error { $$->paper_ = 0; $$->scores_ = SCM_EOL; @@ -908,42 +1087,25 @@ output_def_body: tempo_event: TEMPO steno_duration '=' tempo_range { - $$ = MAKE_SYNTAX ("tempo", @$, SCM_BOOL_F, $2, $4); - } - | TEMPO string steno_duration '=' tempo_range { - $$ = MAKE_SYNTAX ("tempo", @$, make_simple_markup($2), $3, $5); + $$ = MAKE_SYNTAX ("tempo", @$, SCM_EOL, $2, $4); } - | TEMPO full_markup steno_duration '=' tempo_range { + | TEMPO scalar_closed steno_duration '=' tempo_range { $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, $5); } - | TEMPO string { - $$ = MAKE_SYNTAX ("tempoText", @$, make_simple_markup($2) ); - } - | TEMPO full_markup { - $$ = MAKE_SYNTAX ("tempoText", @$, $2 ); + | TEMPO 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,61 +1114,59 @@ 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 +braced_music_list: + '{' music_list '}' + { + $$ = scm_reverse_x ($2, SCM_EOL); + } ; -alternative_music: - /* empty */ { - $$ = SCM_EOL; - } - | ALTERNATIVE '{' music_list '}' { - $$ = scm_car ($3); - } +music: simple_music + | lyric_element_music + | composite_music %prec COMPOSITE ; +music_arg: + simple_music + | composite_music %prec COMPOSITE + ; repeated_music: - REPEAT simple_string unsigned_number music alternative_music + REPEAT simple_string unsigned_number music { - $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $5); + $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, SCM_EOL); + } + | REPEAT simple_string unsigned_number music ALTERNATIVE braced_music_list + { + $$ = 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 ; @@ -1052,8 +1212,23 @@ context_mod_list: ; composite_music: - prefix_composite_music { $$ = $1; } - | grouped_music_list { $$ = $1; } + complex_music + | music_bare + ; + +/* Music that can be parsed without lookahead */ +closed_music: + music_bare + | complex_music_prefix closed_music + { + $$ = FINISH_MAKE_SYNTAX ($1, @$, $2); + } + ; + +music_bare: + mode_changed_music + | MUSIC_IDENTIFIER + | grouped_music_list ; grouped_music_list: @@ -1061,59 +1236,346 @@ grouped_music_list: | sequential_music { $$ = $1; } ; -function_scm_argument: - embedded_scm - | simple_string +/* An argument list. If a function \foo expects scm scm pitch, then the lexer expands \foo into the token sequence: + MUSIC_FUNCTION EXPECT_PITCH EXPECT_SCM EXPECT_SCM EXPECT_NO_MORE_ARGS +and this rule returns the reversed list of arguments. */ + +function_arglist_skip: + function_arglist_common + | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_skip + { + $$ = scm_cons ($1, $3); + } %prec FUNCTION_ARGLIST + | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_skip + { + $$ = scm_cons ($1, $3); + } %prec FUNCTION_ARGLIST + | EXPECT_SCM EXPECT_DURATION function_arglist_skip + { + $$ = scm_cons ($1, $3); + } %prec FUNCTION_ARGLIST ; -/* 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 { - $$ = scm_cons ($3, $2); +function_arglist_nonbackup: + 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 embedded_scm_arg_closed + { + $$ = check_scheme_arg (PARSER, @4, $1, $4, $3, $2); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number + { + $$ = check_scheme_arg (PARSER, @4, $1, $4, $3, $2); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed fraction + { + $$ = check_scheme_arg (PARSER, @4, $1, $4, $3, $2); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed post_event + { + $$ = check_scheme_arg (PARSER, @4, $1, $4, $3, $2); } ; -function_arglist_nonmusic_last: - EXPECT_MARKUP function_arglist full_markup { - $$ = scm_cons ($3, $2); + +function_arglist_keep: + function_arglist_common + | function_arglist_backup + ; + +function_arglist_closed_keep: + function_arglist_closed_common + | function_arglist_backup + ; + +function_arglist_backup: + EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep embedded_scm_arg_closed + { + if (scm_is_true (scm_call_1 ($2, $4))) + { + $$ = scm_cons ($4, $3); + } else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (SCM_IDENTIFIER, $4, @4); + } } - | EXPECT_MARKUP function_arglist simple_string { - $$ = scm_cons ($3, $2); + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep post_event + { + if (scm_is_true (scm_call_1 ($2, $4))) + { + $$ = scm_cons ($4, $3); + } else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (EVENT_IDENTIFIER, $4, @4); + } } - | EXPECT_SCM function_arglist function_scm_argument { - $$ = scm_cons ($3, $2); + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep lyric_element + { + // There is no point interpreting a lyrics string as + // an event, since we don't allow music possibly + // followed by durations or postevent into closed + // music, and we only accept closed music in optional + // arguments at the moment. If this changes, more + // complex schemes might become interesting here as + // well: see how we do this at the mandatory argument + // point. + if (scm_is_true (scm_call_1 ($2, $4))) + $$ = scm_cons ($3, $2); + else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (LYRIC_MARKUP_IDENTIFIER, $4, @4); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep UNSIGNED + { + if (scm_is_true (scm_call_1 ($2, $4))) + { + $$ = $3; + MYREPARSE (@4, $1, $2, UNSIGNED, $4); + } else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (UNSIGNED, $4, @4); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep REAL + { + if (scm_is_true (scm_call_1 ($2, $4))) + { + $$ = $3; + MYREPARSE (@4, $1, $2, REAL, $4); + } else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (REAL, $4, @4); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep NUMBER_IDENTIFIER + { + if (scm_is_true (scm_call_1 ($2, $4))) + { + $$ = scm_cons ($4, $3); + } else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (NUMBER_IDENTIFIER, $4, @4); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep FRACTION + { + if (scm_is_true (scm_call_1 ($2, $4))) + { + $$ = scm_cons ($4, $3); + } else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (FRACTION, $4, @4); + } + } + | 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_backup BACKUP + { + $$ = scm_cons ($1, $3); + MYBACKUP(0, SCM_UNDEFINED, @3); + } + | function_arglist_backup REPARSE embedded_scm_arg_closed + { + $$ = check_scheme_arg (PARSER, @3, scm_car ($2), + $3, $1, scm_cdr ($2)); + } + | function_arglist_backup REPARSE bare_number + { + $$ = check_scheme_arg (PARSER, @3, scm_car ($2), + $3, $1, scm_cdr ($2)); + } + | function_arglist_backup REPARSE fraction + { + $$ = check_scheme_arg (PARSER, @3, scm_car ($2), + $3, $1, scm_cdr ($2)); } ; -function_arglist_nonmusic: EXPECT_NO_MORE_ARGS { - $$ = SCM_EOL; +function_arglist: + function_arglist_common + | function_arglist_nonbackup + ; + +function_arglist_common: + function_arglist_bare + | EXPECT_SCM function_arglist_optional embedded_scm_arg + { + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, + $3, $2, $1); } - | EXPECT_MARKUP function_arglist_nonmusic full_markup { - $$ = scm_cons ($3, $2); + | EXPECT_SCM function_arglist_closed_optional bare_number + { + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, + $3, $2, $1); } - | EXPECT_MARKUP function_arglist_nonmusic simple_string { - $$ = scm_cons ($3, $2); + | EXPECT_SCM function_arglist_closed_optional fraction + { + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, + $3, $2, $1); } - | EXPECT_SCM function_arglist_nonmusic function_scm_argument { - $$ = scm_cons ($3, $2); + | EXPECT_SCM function_arglist_closed_optional post_event + { + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, + $3, $2, $1); + } + | function_arglist_common_lyric + ; + +function_arglist_common_lyric: + EXPECT_SCM function_arglist_optional lyric_element + { + // We check how the predicate thinks about a lyrics + // event or about a markup. If it accepts neither, we + // backup the original token. Otherwise we commit to + // taking the token. Depending on what the predicate + // is willing to accept, we interpret as a string, as + // a lyric event, or ambiguously (meaning that if + // something looking like a duration or post event + // follows, we take the event, otherwise the string). + SCM lyric_event = MAKE_SYNTAX ("lyric-event", @3, $3, + PARSER->default_duration_.smobbed_copy ()); + if (scm_is_true (scm_call_1 ($1, $3))) + if (scm_is_true (scm_call_1 ($1, lyric_event))) + { + $$ = $2; + MYREPARSE (@3, SCM_UNDEFINED, $1, LYRIC_ELEMENT_P, $3); + } else { + $$ = scm_cons ($3, $2); + } + else if (scm_is_true (scm_call_1 ($1, lyric_event))) + { + $$ = $2; + MYREPARSE (@3, SCM_UNDEFINED, $1, LYRIC_ELEMENT, $3); + } else { + // This is going to flag a syntax error, we + // know the predicate to be false. + check_scheme_arg (PARSER, @3, SCM_UNDEFINED, + $3, $2, $1); + } + } + | function_arglist_common_lyric REPARSE lyric_element_arg + { + // This should never be false + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, + $3, $1, $2); + } + ; + +function_arglist_closed: + function_arglist_closed_common + | function_arglist_nonbackup + ; + +function_arglist_closed_common: + function_arglist_bare + | EXPECT_SCM function_arglist_optional embedded_scm_arg_closed + { + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, + $3, $2, $1); + } + | EXPECT_SCM function_arglist_closed_optional bare_number_closed + { + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, + $3, $2, $1); + } + | EXPECT_SCM function_arglist_closed_optional post_event + { + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, + $3, $2, $1); + } + | EXPECT_SCM function_arglist_closed_optional FRACTION + { + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, + $3, $2, $1); + } + | EXPECT_SCM function_arglist_optional lyric_element + { + $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, + $3, $2, $1); + } + ; + +function_arglist_optional: + function_arglist_keep %prec FUNCTION_ARGLIST + | function_arglist_backup BACKUP + | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_optional + { + $$ = scm_cons ($1, $3); + } + | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_optional + { + $$ = scm_cons ($1, $3); } ; -function_arglist: EXPECT_NO_MORE_ARGS { - /* This is for 0-ary functions, so they don't need to - read a lookahead token */ +function_arglist_closed_optional: + function_arglist_closed_keep %prec FUNCTION_ARGLIST + | function_arglist_backup BACKUP + | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_closed_optional + { + $$ = scm_cons ($1, $3); + } + | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_optional + { + $$ = scm_cons ($1, $3); + } + ; + +embedded_scm_closed: + embedded_scm_bare + | scm_function_call_closed + ; + +embedded_scm_arg_closed: + embedded_scm_bare_arg + | scm_function_call_closed + | closed_music + ; + +scm_function_call_closed: + SCM_FUNCTION function_arglist_closed { + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $2); + } %prec FUNCTION_ARGLIST + ; + +function_arglist_bare: + EXPECT_NO_MORE_ARGS { $$ = SCM_EOL; } - | function_arglist_music_last - | function_arglist_nonmusic_last + | EXPECT_PITCH function_arglist_optional pitch_also_in_chords { + $$ = scm_cons ($3, $2); + } + | EXPECT_DURATION function_arglist_closed_optional duration_length { + $$ = scm_cons ($3, $2); + } + | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_skip DEFAULT { + $$ = scm_cons ($1, $3); + } + | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_skip DEFAULT { + $$ = scm_cons ($1, $3); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip DEFAULT { + $$ = scm_cons ($1, $3); + } ; -generic_prefix_music_scm: +music_function_call: MUSIC_FUNCTION function_arglist { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $2); } ; @@ -1125,37 +1587,35 @@ optional_id: } ; - -prefix_composite_music: - generic_prefix_music_scm { - $$ = run_music_function (PARSER, $1); +complex_music: + music_function_call + | repeated_music { $$ = $1; } + | re_rhythmed_music { $$ = $1; } + | complex_music_prefix music + { + $$ = FINISH_MAKE_SYNTAX ($1, @$, $2); } - | CONTEXT simple_string optional_id optional_context_mod music { + ; + +complex_music_prefix: + CONTEXT simple_string optional_id optional_context_mod { 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); + $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_F); } - | NEWCONTEXT simple_string optional_id optional_context_mod music { + | NEWCONTEXT simple_string optional_id optional_context_mod { 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); + $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_T); } + ; - | 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 { +mode_changed_music: + mode_changing_head grouped_music_list { if ($1 == ly_symbol2scm ("chords")) { $$ = MAKE_SYNTAX ("unrelativable-music", @$, $2); @@ -1171,15 +1631,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: @@ -1240,55 +1698,28 @@ 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 */ - grouped_music_list { + composite_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 { + } composite_music { PARSER->lexer_->pop_state (); $$ = scm_cons ($4, $1); } ; re_rhythmed_music: - grouped_music_list new_lyrics { + composite_music new_lyrics { $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); - } - | MUSIC_IDENTIFIER new_lyrics { - $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); - } + } %prec COMPOSITE | LYRICSTO simple_string { PARSER->lexer_->push_lyric_state (); } music { @@ -1305,10 +1736,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); } ; @@ -1416,10 +1847,7 @@ simple_music_property_def: music_property_def: simple_music_property_def { - $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons (PARSER->self_scm (), scm_cons2 (make_input (@$), SCM_BOOL_F, $1))); - } - | ONCE simple_music_property_def { - $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons (PARSER->self_scm (), scm_cons2 (make_input (@$), SCM_BOOL_T, $2))); + $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons2 (PARSER->self_scm (), make_input (@$), $1)); } ; @@ -1446,26 +1874,19 @@ simple_string: STRING { } ; -scalar: string { - $$ = $1; - } - | LYRICS_STRING { - $$ = $1; - } - | bare_number { - $$ = $1; - } - | embedded_scm { - $$ = $1; - } - | full_markup { - $$ = $1; - } - | DIGIT { - $$ = scm_from_int ($1); - } +scalar: + embedded_scm_arg + | bare_number + | lyric_element ; +scalar_closed: + embedded_scm_arg_closed + | bare_number + | lyric_element + ; + + event_chord: /* TODO: Create a special case that avoids the creation of EventChords around simple_elements that have no post_events? @@ -1565,7 +1986,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)) { @@ -1574,41 +1994,62 @@ 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_SCM music_function_chord_body_arglist 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_arg + | SCM_FUNCTION music_function_chord_body_arglist { + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $2); } + | bare_number + | fraction + | lyric_element + | chord_body_element ; 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 { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4))); - } - | music_function_identifier_musicless_prefix function_arglist_nonmusic { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); + MUSIC_FUNCTION music_function_chord_body_arglist { + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $2); } ; +// Event functions may only take closed arglists, otherwise it would +// not be clear whether a following postevent should be associated +// with the last argument of the event function or with the expression +// for which the function call acts itself as event. + 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 { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4))); + MUSIC_FUNCTION function_arglist_closed { + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $2); } - | music_function_identifier_musicless_prefix function_arglist_nonmusic { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); + ; + +event_function_event: + EVENT_FUNCTION function_arglist_closed { + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $2); } ; @@ -1616,9 +2057,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)); @@ -1630,7 +2068,7 @@ command_element: $$ = m->unprotect (); } | E_BACKSLASH { - $$ = MAKE_SYNTAX ("voice-separator", @$, SCM_UNDEFINED); + $$ = MAKE_SYNTAX ("voice-separator", @$); } | '|' { SCM pipe = PARSER->lexer_->lookup_identifier ("pipeSymbol"); @@ -1643,20 +2081,8 @@ command_element: $$ = m->unprotect (); } else - $$ = 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"); + $$ = MAKE_SYNTAX ("bar-check", @$); - $$ = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL); - } - | MARK scalar { - $$ = MAKE_SYNTAX ("make-mark-set", @$, $2); } ; @@ -1664,31 +2090,9 @@ command_event: E_TILDE { $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent", @$)->unprotect (); } - | MARK DEFAULT { - Music *m = MY_MAKE_MUSIC ("MarkEvent", @$); - $$ = m->unprotect (); - } | tempo_event { $$ = $1; } - | KEY DEFAULT { - Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$); - $$ = key->unprotect (); - } - | KEY NOTENAME_PITCH SCM_IDENTIFIER { - - Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$); - if (scm_ilength ($3) > 0) - { - key->set_property ("pitch-alist", $3); - key->set_property ("tonic", Pitch (0, 0, 0).smobbed_copy ()); - key->transpose (* unsmob_pitch ($2)); - } else { - PARSER->parser_error (@3, _ ("second argument must be pitch list")); - } - - $$ = key->unprotect (); - } ; @@ -1702,12 +2106,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)); @@ -1742,6 +2146,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", @$); @@ -1806,6 +2222,7 @@ direction_less_event: a->set_property ("tremolo-type", scm_from_int ($1)); $$ = a->unprotect (); } + | event_function_event ; direction_reqd_event: @@ -1888,6 +2305,7 @@ pitch: steno_pitch { $$ = $1; } + | PITCH_IDENTIFIER ; pitch_also_in_chords: @@ -1901,15 +2319,18 @@ gen_text_def: t->set_property ("text", $1); $$ = t->unprotect (); } - | string { + | simple_string { Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$); t->set_property ("text", make_simple_markup ($1)); $$ = t->unprotect (); } - | DIGIT { + ; + +fingering: + UNSIGNED { Music *t = MY_MAKE_MUSIC ("FingeringEvent", @$); - t->set_property ("digit", scm_from_int ($1)); + t->set_property ("digit", $1); $$ = t->unprotect (); } ; @@ -1944,13 +2365,6 @@ script_dir: | '-' { $$ = CENTER; } ; - -absolute_pitch: - steno_pitch { - $$ = $1; - } - ; - duration_length: multiplied_duration { $$ = $1; @@ -2004,7 +2418,7 @@ multiplied_duration: fraction: FRACTION { $$ = $1; } | UNSIGNED '/' UNSIGNED { - $$ = scm_cons (scm_from_int ($1), scm_from_int ($3)); + $$ = scm_cons ($1, $3); } ; @@ -2029,12 +2443,7 @@ tremolo_type: ; bass_number: - DIGIT { - $$ = scm_from_int ($1); - } - | UNSIGNED { - $$ = scm_from_int ($1); - } + UNSIGNED { $$ = $1; } | STRING { $$ = $1; } | full_markup { $$ = $1; } ; @@ -2191,15 +2600,6 @@ simple_element: ev->set_property ("duration", $2); $$ = ev->unprotect (); } - | lyric_element optional_notemode_duration { - if (!PARSER->lexer_->is_lyric_state ()) - PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics")); - - Music *levent = MY_MAKE_MUSIC ("LyricEvent", @$); - levent->set_property ("text", $1); - levent->set_property ("duration",$2); - $$= levent->unprotect (); - } ; simple_chord_elements: @@ -2227,6 +2627,42 @@ lyric_element: | LYRICS_STRING { $$ = $1; } + | LYRIC_ELEMENT_P + ; + +lyric_element_arg: + lyric_element + | lyric_element multiplied_duration post_events { + SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2); + $$ = MAKE_SYNTAX ("event-chord", @$, + scm_cons (lyric_event, + scm_reverse_x ($3, SCM_EOL))); + } + | lyric_element post_event post_events { + SCM lyric_event = + MAKE_SYNTAX ("lyric-event", @$, $1, + PARSER->default_duration_.smobbed_copy ()); + $$ = MAKE_SYNTAX ("event-chord", @$, + scm_cons2 (lyric_event, $2, + scm_reverse_x ($3, SCM_EOL))); + + } + | LYRIC_ELEMENT optional_notemode_duration post_events { + SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2); + $$ = MAKE_SYNTAX ("event-chord", @$, + scm_cons (lyric_event, + scm_reverse_x ($3, SCM_EOL))); + } + ; + + +lyric_element_music: + lyric_element optional_notemode_duration post_events { + SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2); + $$ = MAKE_SYNTAX ("event-chord", @$, + scm_cons (lyric_event, + scm_reverse_x ($3, SCM_EOL))); + } ; new_chord: @@ -2340,38 +2776,30 @@ number_factor: bare_number: - UNSIGNED { - $$ = scm_from_int ($1); - } - | REAL { - $$ = $1; - } - | NUMBER_IDENTIFIER { - $$ = $1; + bare_number_closed + | UNSIGNED NUMBER_IDENTIFIER { + $$ = scm_product ($1, $2) } | REAL NUMBER_IDENTIFIER { - $$ = scm_from_double (scm_to_double ($1) *scm_to_double ($2)); - } - | UNSIGNED NUMBER_IDENTIFIER { - $$ = scm_from_double ($1 *scm_to_double ($2)); + $$ = scm_product ($1, $2) } ; +bare_number_closed: + UNSIGNED + | REAL + | NUMBER_IDENTIFIER + ; bare_unsigned: UNSIGNED { - $$ = $1; - } - | DIGIT { - $$ = $1; + $$ = scm_to_int ($1); } ; unsigned_number: - bare_unsigned { $$ = scm_from_int ($1); } - | NUMBER_IDENTIFIER { - $$ = $1; - } + UNSIGNED + | NUMBER_IDENTIFIER ; exclamations: @@ -2401,7 +2829,10 @@ lyric_markup: ; full_markup_list: - MARKUPLINES + MARKUPLIST_IDENTIFIER { + $$ = $1; + } + | MARKUPLIST { PARSER->lexer_->push_markup_state (); } markup_list { $$ = $3; @@ -2434,7 +2865,10 @@ markup_top: ; markup_list: - markup_composed_list { + MARKUPLIST_IDENTIFIER { + $$ = $1; + } + | markup_composed_list { $$ = $1; } | markup_braced_list { @@ -2478,8 +2912,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; @@ -2612,6 +3046,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; @@ -2627,6 +3064,9 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) if (is_lyric_state ()) return LYRIC_MARKUP_IDENTIFIER; return MARKUP_IDENTIFIER; + } else if (Text_interface::is_markup_list (sid)) { + *destination = sid; + return MARKUPLIST_IDENTIFIER; } return -1; @@ -2648,25 +3088,37 @@ get_next_unique_lyrics_context_id () return scm_from_locale_string (s); } - -SCM -run_music_function (Lily_parser *parser, SCM expr) +SCM check_scheme_arg (Lily_parser *my_lily_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"); + SCM unwrap = SCM_UNDEFINED; + if (scm_is_true (scm_call_1 (pred, arg))) + return scm_cons (arg, args); + unwrap = try_unpack_lyrics (pred, arg); + if (!SCM_UNBNDP (unwrap)) + return scm_cons (unwrap, args); + if (SCM_UNBNDP (fallback)) { + args = scm_cons (SCM_BOOL_F, args); + fallback = SCM_BOOL_F; + } else { + args = scm_cons (loc_on_music (loc, fallback), args); + fallback = SCM_CDR (scm_last_pair (args)); + } + scm_set_cdr_x (scm_last_pair (args), SCM_EOL); + MAKE_SYNTAX ("argument-error", loc, scm_length (args), pred, arg); + scm_set_cdr_x (scm_last_pair (args), fallback); + return args; +} - if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr (expr), sig, args))) +SCM loc_on_music (Input loc, SCM arg) +{ + if (Music *m = unsmob_music (arg)) { - parser->error_level_ = 1; - return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("void-music"), scm_list_2 (parser->self_scm (), make_input (*loc))); + m = m->clone (); + m->set_spot (loc); + return m->unprotect (); } - - 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); + return arg; } bool @@ -2749,6 +3201,17 @@ make_chord_elements (SCM pitch, SCM dur, SCM modification_list) return scm_call_3 (chord_ctor, pitch, dur, modification_list); } +SCM +try_unpack_lyrics (SCM pred, SCM arg) +{ + if (Music *m = unsmob_music (arg)) + if (m->is_mus_type ("lyric-event")) { + SCM text = m->get_property ("text"); + if (scm_is_true (scm_call_1 (pred, text))) + return text; + } + return SCM_UNDEFINED; +} /* Todo: actually also use apply iso. call too ... */ bool @@ -2758,19 +3221,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) {