X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=f81dc69e9b56faa2e82b4052f86448b492c1a347;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=a99dffcf3889056a2e4e01d128fd67639acc1bf4;hpb=25ca54b640c067e2286a1d7ba47f24a1b4dc070e;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index a99dffcf38..f81dc69e9b 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -2,7 +2,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2012 Han-Wen Nienhuys + Copyright (C) 1997--2015 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -37,17 +37,15 @@ #define YYLLOC_DEFAULT(Current,Rhs,N) \ ((Current).set_location ((Rhs)[1], (Rhs)[N])) -#define YYPRINT(file, type, value) \ - do { \ - if (scm_is_eq (value, SCM_UNSPECIFIED)) \ - break; \ - char *p = scm_to_locale_string \ - (scm_simple_format (SCM_BOOL_F, \ - scm_from_locale_string ("~S"), \ - scm_list_1 (value))); \ - fputs (p, file); \ - free (p); \ - } while (0) +#define YYPRINT(file, type, value) \ + do { \ + if (scm_is_eq (value, SCM_UNSPECIFIED)) \ + break; \ + SCM s = Display::value_to_lily_string (value); \ + char *p = scm_to_locale_string (s); \ + fputs (p, file); \ + free (p); \ + } while (0) %} @@ -80,33 +78,17 @@ or %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. - */ +%right ':' UNSIGNED REAL E_UNSIGNED EVENT_IDENTIFIER EVENT_FUNCTION '^' '_' + HYPHEN EXTENDER DURATION_IDENTIFIER '!' -%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 + /* The above are needed for collecting tremoli and other items (that + could otherwise be interpreted as belonging to the next function + argument) greedily, and together with the next rule will serve to + join numbers and units greedily instead of allowing them into + separate function arguments */ -%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. - */ +%nonassoc NUMBER_IDENTIFIER %left PREC_TOP @@ -137,6 +119,7 @@ FIXME: using namespace std; #include "book.hh" +#include "context.hh" #include "context-def.hh" #include "context-mod.hh" #include "dimensions.hh" @@ -146,6 +129,7 @@ using namespace std; #include "lily-guile.hh" #include "lily-lexer.hh" #include "lily-parser.hh" +#include "ly-module.hh" #include "main.hh" #include "misc.hh" #include "music.hh" @@ -155,6 +139,7 @@ using namespace std; #include "score.hh" #include "text-interface.hh" #include "warn.hh" +#include "lily-imports.hh" void Lily_parser::parser_error (Input const *i, Lily_parser *parser, SCM *, const string &s) @@ -162,32 +147,36 @@ Lily_parser::parser_error (Input const *i, Lily_parser *parser, SCM *, const str parser->parser_error (*i, s); } +// The following are somewhat precarious constructs as they may change +// the value of the lookahead token. That implies that the lookahead +// token must not yet have made an impact on the state stack other +// than causing the reduction of the current rule, or switching the +// lookahead token while Bison is mulling it over will cause trouble. + #define MYBACKUP(Token, Value, Location) \ -do \ - if (yychar == YYEMPTY) \ - { \ + do { \ + if (yychar != YYEMPTY) \ + parser->lexer_->push_extra_token \ + (yylloc, yychar, yylval); \ 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) + parser->lexer_->push_extra_token \ + (Location, Token, Value); \ + parser->lexer_->push_extra_token (Location, BACKUP); \ + yychar = YYEMPTY; \ + } while (0) #define MYREPARSE(Location, Pred, Token, Value) \ -do \ - if (yychar == YYEMPTY) \ - { \ - parser->lexer_->push_extra_token (Token, Value); \ - parser->lexer_->push_extra_token (REPARSE, \ - Pred); \ - } else { \ - parser->parser_error \ - (Location, _("Too much lookahead")); \ - } \ -while (0) + do { \ + if (yychar != YYEMPTY) \ + parser->lexer_->push_extra_token \ + (yylloc, yychar, yylval); \ + parser->lexer_->push_extra_token \ + (Location, Token, Value); \ + parser->lexer_->push_extra_token \ + (Location, REPARSE, Pred); \ + yychar = YYEMPTY; \ + } while (0) %} @@ -199,18 +188,30 @@ while (0) parser->lexer_->override_input (spot)) /* ES TODO: -- Don't use lily module, create a new module instead. - delay application of the function */ -#define LOWLEVEL_MAKE_SYNTAX(proc, args) \ - scm_apply_0 (proc, args) + +#define LOWLEVEL_MAKE_SYNTAX(location, proc, ...) \ + with_location \ + (parser->lexer_->override_input (location).smobbed_copy (), \ + proc, \ + ##__VA_ARGS__) + /* Syntactic Sugar. */ #define MAKE_SYNTAX(name, location, ...) \ - LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (parser->self_scm (), make_input (parser->lexer_->override_input (location)), ##__VA_ARGS__, SCM_UNDEFINED)) + LOWLEVEL_MAKE_SYNTAX (location, Syntax::name, ##__VA_ARGS__) + #define START_MAKE_SYNTAX(name, ...) \ - scm_list_n (ly_lily_module_constant (name) , ##__VA_ARGS__, SCM_UNDEFINED) + scm_list_n (Syntax::name, ##__VA_ARGS__, SCM_UNDEFINED) + #define FINISH_MAKE_SYNTAX(start, location, ...) \ - LOWLEVEL_MAKE_SYNTAX (scm_car (start), scm_cons2 (parser->self_scm (), make_input (parser->lexer_->override_input (location)), scm_append_x (scm_list_2 (scm_cdr (start), scm_list_n (__VA_ARGS__, SCM_UNDEFINED))))) + LOWLEVEL_MAKE_SYNTAX \ + (location, \ + Guile_user::apply, \ + scm_car (start), \ + 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 (); @@ -228,12 +229,14 @@ static Music *make_music_with_input (SCM name, Input where); SCM check_scheme_arg (Lily_parser *parser, Input loc, SCM arg, SCM args, SCM pred, SCM disp = SCM_UNDEFINED); SCM make_music_from_simple (Lily_parser *parser, Input loc, SCM pitch); -SCM loc_on_music (Input loc, SCM arg); +SCM loc_on_copy (Lily_parser *parser, Input loc, SCM arg); SCM make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list); SCM make_chord_step (SCM step, Rational alter); SCM make_simple_markup (SCM a); -bool is_duration (int t); +SCM make_duration (SCM t, int dots = 0, SCM factor = SCM_UNDEFINED); bool is_regular_identifier (SCM id, bool multiple=false); +SCM make_reverse_key_list (SCM keys); +SCM try_word_variants (SCM pred, SCM str); SCM try_string_variants (SCM pred, SCM str); int yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser); @@ -265,6 +268,7 @@ int yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser); %token DESCRIPTION "\\description" %token DRUMMODE "\\drummode" %token DRUMS "\\drums" +%token ETC "\\etc" %token FIGUREMODE "\\figuremode" %token FIGURES "\\figures" %token HEADER "\\header" @@ -285,6 +289,7 @@ int yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser); %token REST "\\rest" %token REVERT "\\revert" %token SCORE "\\score" +%token SCORELINES "\\score-lines" %token SEQUENTIAL "\\sequential" %token SET "\\set" %token SIMULTANEOUS "\\simultaneous" @@ -321,7 +326,6 @@ If we give names, Bison complains. %token FIGURE_SPACE "_" %token HYPHEN "--" -%token CHORDMODIFIERS %token MULTI_MEASURE_REST @@ -330,8 +334,6 @@ If we give names, Bison complains. /* Artificial tokens, for more generic function syntax */ %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?)" @@ -344,17 +346,16 @@ If we give names, Bison complains. %token EMBEDDED_LILY "#{" %token BOOK_IDENTIFIER -%token CHORDMODIFIER_PITCH %token CHORD_MODIFIER %token CHORD_REPETITION -%token CONTEXT_DEF_IDENTIFIER -%token CONTEXT_MOD_IDENTIFIER %token DRUM_PITCH -%token PITCH_IDENTIFIER + /* Artificial token for durations in argument lists */ +%token DURATION_ARG %token DURATION_IDENTIFIER %token EVENT_IDENTIFIER %token EVENT_FUNCTION %token FRACTION +%token LOOKUP_IDENTIFIER %token LYRIC_ELEMENT %token MARKUP_FUNCTION %token MARKUP_LIST_FUNCTION @@ -364,7 +365,7 @@ If we give names, Bison complains. %token MUSIC_IDENTIFIER %token NOTENAME_PITCH %token NUMBER_IDENTIFIER -%token OUTPUT_DEF_IDENTIFIER +%token PITCH_IDENTIFIER %token REAL %token RESTNAME %token SCM_ARG @@ -374,6 +375,7 @@ If we give names, Bison complains. %token STRING %token SYMBOL_LIST %token TONICNAME_PITCH +%token SYMBOL %left '-' '+' @@ -387,8 +389,7 @@ prec levels in different prods */ start_symbol: lilypond | EMBEDDED_LILY { - SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (nn); + parser->lexer_->push_note_state (Lily::pitchnames); } embedded_lilypond { parser->lexer_->pop_state (); *retval = $3; @@ -410,38 +411,43 @@ lilypond: /* empty */ { $$ = SCM_UNSPECIFIED; } toplevel_expression: - { - parser->lexer_->add_scope (get_header (parser)); - } lilypond_header { - parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $2); + header_block { + parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1); } | book_block { SCM proc = parser->lexer_->lookup_identifier ("toplevel-book-handler"); - scm_call_2 (proc, parser->self_scm (), $1); + scm_call_1 (proc, $1); } | bookpart_block { SCM proc = parser->lexer_->lookup_identifier ("toplevel-bookpart-handler"); - scm_call_2 (proc, parser->self_scm (), $1); + scm_call_1 (proc, $1); + } + | BOOK_IDENTIFIER { + SCM proc = parser->lexer_->lookup_identifier + (unsmob($1)->paper_ + ? "toplevel-book-handler" + : "toplevel-bookpart-handler"); + scm_call_1 (proc, $1); } | score_block { SCM proc = parser->lexer_->lookup_identifier ("toplevel-score-handler"); - scm_call_2 (proc, parser->self_scm (), $1); + scm_call_1 (proc, $1); } | composite_music { SCM proc = parser->lexer_->lookup_identifier ("toplevel-music-handler"); - scm_call_2 (proc, parser->self_scm (), $1); + scm_call_1 (proc, $1); } | full_markup { SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler"); - scm_call_2 (proc, parser->self_scm (), scm_list_1 ($1)); + scm_call_1 (proc, scm_list_1 ($1)); } | full_markup_list { SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler"); - scm_call_2 (proc, parser->self_scm (), $1); + scm_call_1 (proc, $1); } | SCM_TOKEN { // Evaluate and ignore #xxx, as opposed to \xxx - parser->lexer_->eval_scm_token ($1); + parser->lexer_->eval_scm_token ($1, @1); } | embedded_scm_active { @@ -453,29 +459,59 @@ toplevel_expression: if (scm_is_pair (out)) { SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler"); - scm_call_2 (proc, parser->self_scm (), out); + scm_call_1 (proc, out); + } else if (unsmob ($1)) + { + SCM proc = parser->lexer_->lookup_identifier ("toplevel-score-handler"); + scm_call_1 (proc, $1); + } else if (Output_def * od = unsmob ($1)) { + SCM id = SCM_EOL; + + if (to_boolean (od->c_variable ("is-paper"))) + id = ly_symbol2scm ("$defaultpaper"); + else if (to_boolean (od->c_variable ("is-midi"))) + id = ly_symbol2scm ("$defaultmidi"); + else if (to_boolean (od->c_variable ("is-layout"))) + id = ly_symbol2scm ("$defaultlayout"); + + parser->lexer_->set_identifier (id, $1); + } else if (ly_is_module ($1)) + { + SCM module = get_header (parser); + ly_module_copy (module, $1); + parser->lexer_->set_identifier + (ly_symbol2scm ("$defaultheader"), module); } else if (!scm_is_eq ($1, SCM_UNSPECIFIED)) parser->parser_error (@1, _("bad expression type")); } | output_def { SCM id = SCM_EOL; - Output_def * od = unsmob_output_def ($1); + Output_def * od = unsmob ($1); - if (od->c_variable ("is-paper") == SCM_BOOL_T) + if (to_boolean (od->c_variable ("is-paper"))) id = ly_symbol2scm ("$defaultpaper"); - else if (od->c_variable ("is-midi") == SCM_BOOL_T) + else if (to_boolean (od->c_variable ("is-midi"))) id = ly_symbol2scm ("$defaultmidi"); - else if (od->c_variable ("is-layout") == SCM_BOOL_T) + else if (to_boolean (od->c_variable ("is-layout"))) id = ly_symbol2scm ("$defaultlayout"); parser->lexer_->set_identifier (id, $1); } ; +lookup: + LOOKUP_IDENTIFIER + | LOOKUP_IDENTIFIER '.' symbol_list_rev + { + $$ = loc_on_copy (parser, @$, + nested_property ($1, scm_reverse_x ($3, SCM_EOL))); + } + ; + embedded_scm_bare: SCM_TOKEN { - $$ = parser->lexer_->eval_scm_token ($1); + $$ = parser->lexer_->eval_scm_token ($1, @1); } | SCM_IDENTIFIER ; @@ -483,21 +519,26 @@ embedded_scm_bare: embedded_scm_active: SCM_IDENTIFIER | scm_function_call + | lookup ; embedded_scm_bare_arg: SCM_ARG | SCM_TOKEN { - $$ = parser->lexer_->eval_scm_token ($1); + $$ = parser->lexer_->eval_scm_token ($1, @1); } + | FRACTION + | partial_markup | full_markup_list | context_modification + | header_block | score_block | context_def_spec_block | book_block | bookpart_block | output_def + | lookup ; /* The generic version may end in music, or not */ @@ -505,18 +546,40 @@ embedded_scm_bare_arg: embedded_scm: embedded_scm_bare | scm_function_call + | lookup ; +/* embedded_scm_arg is _not_ casting pitches to music by default, this + * has to be done by the function itself. Note that this may cause + * the results of scm_function_call or embedded_scm_bare_arg to be + * turned into music from pitches as well. Note that this creates a + * distinctly awkward situation for calculated drum pitches. Those + * are at the current point of time rejected as music constituents as + * they can't be distinguished from "proper" symbols. + */ + embedded_scm_arg: embedded_scm_bare_arg | scm_function_call - | music_arg + | music_assign ; scm_function_call: SCM_FUNCTION function_arglist { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); + $$ = MAKE_SYNTAX (music_function, @$, + $1, $2); + } + ; + +embedded_lilypond_number: + '-' embedded_lilypond_number + { + $$ = scm_difference ($2, SCM_UNDEFINED); + } + | bare_number_common + | UNSIGNED NUMBER_IDENTIFIER + { + $$ = scm_product ($1, $2); } ; @@ -527,16 +590,40 @@ embedded_lilypond: // for empty rules, and the only token in the whole // production, EMBEDDED_LILY, is synthetic and also // contains no source location. - $$ = MAKE_SYNTAX ("void-music", @$); + $$ = MAKE_SYNTAX (void_music, @$); + } + | identifier_init_nonumber + | embedded_lilypond_number + | post_event post_events + { + $$ = scm_reverse_x ($2, SCM_EOL); + if (Music *m = unsmob ($1)) + { + if (m->is_mus_type ("post-event-wrapper")) + $$ = scm_append + (scm_list_2 (m->get_property ("elements"), + $$)); + else + $$ = scm_cons ($1, $$); + } + if (scm_is_pair ($$) + && scm_is_null (scm_cdr ($$))) + $$ = scm_car ($$); + else + { + Music * m = MY_MAKE_MUSIC ("PostEvents", @$); + m->set_property ("elements", $$); + $$ = m->unprotect (); + } } - | identifier_init + | multiplied_duration | music_embedded music_embedded music_list { $3 = scm_reverse_x ($3, SCM_EOL); - if (unsmob_music ($2)) + if (unsmob ($2)) $3 = scm_cons ($2, $3); - if (unsmob_music ($1)) + if (unsmob ($1)) $3 = scm_cons ($1, $3); - $$ = MAKE_SYNTAX ("sequential-music", @$, $3); + $$ = MAKE_SYNTAX (sequential_music, @$, $3); } | error { parser->error_level_ = 1; @@ -554,8 +641,15 @@ lilypond_header_body: | lilypond_header_body assignment { } - | lilypond_header_body embedded_scm { - + | lilypond_header_body SCM_TOKEN { + // Evaluate and ignore #xxx, as opposed to \xxx + parser->lexer_->eval_scm_token ($2, @2); + } + | lilypond_header_body embedded_scm_active { + if (ly_is_module ($2)) + ly_module_copy (scm_current_module (), $2); + else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) + parser->parser_error (@2, _("bad expression type")); } ; @@ -565,11 +659,20 @@ lilypond_header: } ; +header_block: + { + parser->lexer_->add_scope (get_header (parser)); + } lilypond_header { + $$ = $2; + } + ; + /* DECLARATIONS */ assignment_id: - STRING { $$ = $1; } + STRING + | SYMBOL ; assignment: @@ -577,25 +680,34 @@ assignment: parser->lexer_->set_identifier ($1, $3); $$ = SCM_UNSPECIFIED; } - | assignment_id property_path '=' identifier_init { - SCM path = scm_cons (scm_string_to_symbol ($1), $2); - parser->lexer_->set_identifier (path, $4); + | assignment_id '.' property_path '=' identifier_init { + SCM path = scm_cons (scm_string_to_symbol ($1), $3); + parser->lexer_->set_identifier (path, $5); + $$ = SCM_UNSPECIFIED; + } + | assignment_id ',' property_path '=' identifier_init { + SCM path = scm_cons (scm_string_to_symbol ($1), $3); + parser->lexer_->set_identifier (path, $5); $$ = SCM_UNSPECIFIED; } ; identifier_init: - score_block - | book_block - | bookpart_block - | output_def - | context_def_spec_block - | music_assign + identifier_init_nonumber + | number_expression + | symbol_list_part_bare '.' property_path + { + $$ = scm_reverse_x ($1, $3); + } + | symbol_list_part_bare ',' property_path + { + $$ = scm_reverse_x ($1, $3); + } | post_event_nofinger post_events { $$ = scm_reverse_x ($2, SCM_EOL); - if (Music *m = unsmob_music ($1)) + if (Music *m = unsmob ($1)) { if (m->is_mus_type ("post-event-wrapper")) $$ = scm_append @@ -614,19 +726,120 @@ identifier_init: $$ = m->unprotect (); } } - | number_expression + ; + +identifier_init_nonumber: + header_block + | score_block + | book_block + | bookpart_block + | output_def + | context_def_spec_block + | music_assign + | pitch_or_music | FRACTION | string - | embedded_scm + | embedded_scm + | partial_markup | full_markup_list | context_modification + | partial_function ETC + { + $$ = MAKE_SYNTAX (partial_music_function, @$, + scm_reverse_x ($1, SCM_EOL)); + } + ; + +// Partial functions +partial_function: + MUSIC_FUNCTION function_arglist_partial + { + $$ = scm_acons ($1, $2, SCM_EOL); + } + | EVENT_FUNCTION function_arglist_partial + { + $$ = scm_acons ($1, $2, SCM_EOL); + } + | SCM_FUNCTION function_arglist_partial + { + $$ = scm_acons ($1, $2, SCM_EOL); + } + | OVERRIDE grob_prop_path '=' + { + if (SCM_UNBNDP ($2)) + $$ = scm_list_1 (SCM_BOOL_F); + else + $$ = scm_cons + (scm_list_3 (Syntax::property_override_function, + scm_cdr ($2), scm_car ($2)), + SCM_EOL); + } + | SET context_prop_spec '=' + { + if (SCM_UNBNDP ($2)) + $$ = scm_list_1 (SCM_BOOL_F); + else + $$ = scm_cons + (scm_list_3 (Syntax::property_set_function, + scm_cadr ($2), scm_car ($2)), + SCM_EOL); + } + | MUSIC_FUNCTION EXPECT_SCM function_arglist_optional partial_function + { + $$ = scm_acons ($1, $3, $4); + } + | EVENT_FUNCTION EXPECT_SCM function_arglist_optional partial_function + { + $$ = scm_acons ($1, $3, $4); + } + | SCM_FUNCTION EXPECT_SCM function_arglist_optional partial_function + { + $$ = scm_acons ($1, $3, $4); + } + | OVERRIDE grob_prop_path '=' partial_function + { + if (SCM_UNBNDP ($2)) + $$ = scm_list_1 (SCM_BOOL_F); + else + $$ = scm_cons + (scm_list_3 (Syntax::property_override_function, + scm_cdr ($2), scm_car ($2)), + $4); + } + | SET context_prop_spec '=' partial_function + { + if (SCM_UNBNDP ($2)) + $$ = scm_list_1 (SCM_BOOL_F); + else + $$ = scm_cons + (scm_list_3 (Syntax::property_set_function, + scm_cadr ($2), scm_car ($2)), + $4); + } + | MUSIC_FUNCTION EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup partial_function + { + $$ = scm_acons ($1, $4, $5); + } + | EVENT_FUNCTION EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup partial_function + { + $$ = scm_acons ($1, $4, $5); + } + | SCM_FUNCTION EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup partial_function + { + $$ = scm_acons ($1, $4, $5); + } ; context_def_spec_block: CONTEXT '{' context_def_spec_body '}' - { + { $$ = $3; - unsmob_context_def ($$)->origin ()->set_spot (@$); + Context_def *td = unsmob ($$); + if (!td) { + $$ = Context_def::make_scm (); + td = unsmob ($$); + } + td->origin ()->set_spot (@$); } ; @@ -634,8 +847,7 @@ context_mod_arg: embedded_scm | { - SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (nn); + parser->lexer_->push_note_state (Lily::pitchnames); } composite_music { @@ -644,47 +856,54 @@ context_mod_arg: } ; -context_mod_embedded: - context_mod_arg - { - if (unsmob_music ($1)) { - SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler"); - $1 = scm_call_2 (proc, parser->self_scm (), $1); - } - if (unsmob_context_mod ($1)) - $$ = $1; - else { - parser->parser_error (@1, _ ("not a context mod")); - $$ = Context_mod ().smobbed_copy (); - } - } - ; - context_def_spec_body: /**/ { - $$ = Context_def::make_scm (); - } - | CONTEXT_DEF_IDENTIFIER { - $$ = $1; + $$ = SCM_UNSPECIFIED; } | context_def_spec_body context_mod { - if (!SCM_UNBNDP ($2)) - unsmob_context_def ($$)->add_context_mod ($2); + if (!SCM_UNBNDP ($2)) { + Context_def *td = unsmob ($$); + if (!td) { + $$ = Context_def::make_scm (); + td = unsmob ($$); + } + unsmob ($$)->add_context_mod ($2); + } } | context_def_spec_body context_modification { - Context_def *td = unsmob_context_def ($$); - SCM new_mods = unsmob_context_mod ($2)->get_mods (); + Context_def *td = unsmob ($$); + if (!td) { + $$ = Context_def::make_scm (); + td = unsmob ($$); + } + SCM new_mods = unsmob ($2)->get_mods (); for (SCM m = new_mods; scm_is_pair (m); m = scm_cdr (m)) { td->add_context_mod (scm_car (m)); } } - | context_def_spec_body context_mod_embedded { - Context_def *td = unsmob_context_def ($$); - SCM new_mods = unsmob_context_mod ($2)->get_mods (); - for (SCM m = new_mods; scm_is_pair (m); m = scm_cdr (m)) { - td->add_context_mod (scm_car (m)); - } + | context_def_spec_body context_mod_arg { + Context_def *td = unsmob ($1); + if (scm_is_eq ($2, SCM_UNSPECIFIED)) + ; + else if (!td && unsmob ($2)) + $$ = $2; + else { + if (!td) { + $$ = Context_def::make_scm (); + td = unsmob ($$); + } + if (unsmob ($2)) { + SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler"); + $2 = scm_call_1 (proc, $2); + } + if (Context_mod *cm = unsmob ($2)) { + for (SCM m = cm->get_mods (); scm_is_pair (m); m = scm_cdr (m)) { + td->add_context_mod (scm_car (m)); + } + } else + parser->parser_error (@2, _ ("not a context mod")); + } } ; @@ -693,7 +912,7 @@ context_def_spec_body: book_block: BOOK '{' book_body '}' { $$ = $3; - unsmob_book ($$)->origin ()->set_spot (@$); + unsmob ($$)->origin ()->set_spot (@$); pop_paper (parser); parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), SCM_BOOL_F); } @@ -706,7 +925,7 @@ book_body: { Book *book = new Book; init_papers (parser); - book->paper_ = dynamic_cast (unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); + book->paper_ = dynamic_cast (unsmob (parser->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); book->paper_->unprotect (); push_paper (parser, book->paper_); book->header_ = get_header (parser); @@ -717,8 +936,8 @@ book_body: parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $1); } | book_body paper_block { - unsmob_book ($1)->paper_ = unsmob_output_def ($2); - set_paper (parser, unsmob_output_def ($2)); + unsmob ($1)->paper_ = unsmob ($2); + set_paper (parser, unsmob ($2)); } | book_body bookpart_block { SCM proc = parser->lexer_->lookup_identifier ("book-bookpart-handler"); @@ -730,7 +949,7 @@ book_body: } | book_body composite_music { SCM proc = parser->lexer_->lookup_identifier ("book-music-handler"); - scm_call_3 (proc, parser->self_scm (), $1, $2); + scm_call_2 (proc, $1, $2); } | book_body full_markup { SCM proc = parser->lexer_->lookup_identifier ("book-text-handler"); @@ -742,7 +961,7 @@ book_body: } | book_body SCM_TOKEN { // Evaluate and ignore #xxx, as opposed to \xxx - parser->lexer_->eval_scm_token ($2); + parser->lexer_->eval_scm_token ($2, @2); } | book_body embedded_scm_active { @@ -755,15 +974,29 @@ book_body: { SCM proc = parser->lexer_->lookup_identifier ("book-text-handler"); scm_call_2 (proc, $1, out); + } else if (unsmob ($2)) + { + SCM proc = parser->lexer_->lookup_identifier ("book-score-handler"); + scm_call_2 (proc, $1, $2); + } else if (Output_def *od = unsmob ($2)) { + if (to_boolean (od->lookup_variable (ly_symbol2scm ("is-paper")))) { + unsmob ($1)->paper_ = od; + set_paper (parser, od); + } else { + parser->parser_error (@2, _ ("need \\paper for paper block")); + } + } else if (ly_is_module ($2)) + { + ly_module_copy (unsmob ($1)->header_, $2); } else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) parser->parser_error (@2, _("bad expression type")); } | book_body { - parser->lexer_->add_scope (unsmob_book ($1)->header_); + parser->lexer_->add_scope (unsmob ($1)->header_); } lilypond_header | book_body error { - Book *book = unsmob_book ($1); + Book *book = unsmob ($1); book->paper_ = 0; book->scores_ = SCM_EOL; book->bookparts_ = SCM_EOL; @@ -773,7 +1006,7 @@ book_body: bookpart_block: BOOKPART '{' bookpart_body '}' { $$ = $3; - unsmob_book ($$)->origin ()->set_spot (@$); + unsmob ($$)->origin ()->set_spot (@$); parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), SCM_BOOL_F); } ; @@ -788,7 +1021,7 @@ bookpart_body: parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $1); } | bookpart_body paper_block { - unsmob_book ($$)->paper_ = unsmob_output_def ($2); + unsmob ($$)->paper_ = unsmob ($2); } | bookpart_body score_block { SCM proc = parser->lexer_->lookup_identifier ("bookpart-score-handler"); @@ -796,7 +1029,7 @@ bookpart_body: } | bookpart_body composite_music { SCM proc = parser->lexer_->lookup_identifier ("bookpart-music-handler"); - scm_call_3 (proc, parser->self_scm (), $1, $2); + scm_call_2 (proc, $1, $2); } | bookpart_body full_markup { SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler"); @@ -808,7 +1041,7 @@ bookpart_body: } | bookpart_body SCM_TOKEN { // Evaluate and ignore #xxx, as opposed to \xxx - parser->lexer_->eval_scm_token ($2); + parser->lexer_->eval_scm_token ($2, @2); } | bookpart_body embedded_scm_active { @@ -821,18 +1054,33 @@ bookpart_body: { SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler"); scm_call_2 (proc, $1, out); + } else if (unsmob ($2)) + { + SCM proc = parser->lexer_->lookup_identifier ("bookpart-score-handler"); + scm_call_2 (proc, $1, $2); + } else if (Output_def *od = unsmob ($2)) { + if (to_boolean (od->lookup_variable (ly_symbol2scm ("is-paper")))) { + unsmob ($1)->paper_ = od; + } else { + parser->parser_error (@2, _ ("need \\paper for paper block")); + } + } else if (ly_is_module ($2)) { + Book *book = unsmob ($1); + if (!ly_is_module (book->header_)) + book->header_ = ly_make_module (false); + ly_module_copy (book->header_, $2); } else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) parser->parser_error (@2, _("bad expression type")); } | bookpart_body { - Book *book = unsmob_book ($1); + Book *book = unsmob ($1); if (!ly_is_module (book->header_)) book->header_ = ly_make_module (false); parser->lexer_->add_scope (book->header_); } lilypond_header | bookpart_body error { - Book *book = unsmob_book ($1); + Book *book = unsmob ($1); book->paper_ = 0; book->scores_ = SCM_EOL; } @@ -840,49 +1088,118 @@ bookpart_body: score_block: SCORE '{' score_body '}' { + unsmob ($3)->origin ()->set_spot (@$); $$ = $3; } ; score_body: - music { - SCM scorify = ly_lily_module_constant ("scorify-music"); - $$ = scm_call_2 (scorify, $1, parser->self_scm ()); - - unsmob_score ($$)->origin ()->set_spot (@$); - } - | embedded_scm_active { - Score *score; - if (unsmob_score ($1)) - score = new Score (*unsmob_score ($1)); - else { - score = new Score; - parser->parser_error (@1, _("score expected")); + score_items { + if (!unsmob ($1)) { + parser->parser_error (@1, _("Missing music in \\score")); + $$ = (new Score)->unprotect (); + if (scm_is_pair ($1) && ly_is_module (scm_car ($1))) + { + unsmob ($$)->set_header (scm_car ($1)); + $1 = scm_cdr ($1); + } + for (SCM p = scm_reverse_x ($1, SCM_EOL); + scm_is_pair (p); p = scm_cdr (p)) + { + unsmob ($$)-> + add_output_def (unsmob (scm_car (p))); + } } - unsmob_score ($$)->origin ()->set_spot (@$); - $$ = score->unprotect (); } - | score_body - { - Score *score = unsmob_score ($1); - if (!ly_is_module (score->get_header ())) - score->set_header (ly_make_module (false)); - parser->lexer_->add_scope (score->get_header ()); - } lilypond_header - | score_body output_def { - Output_def *od = unsmob_output_def ($2); - if (od->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T) - { - parser->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead")); + | score_body error { + unsmob ($$)->error_found_ = true; + } + ; + +score_item: + embedded_scm + | music + | output_def + ; +score_items: + /* empty */ + { + $$ = SCM_EOL; + } + | score_items score_item + { + Output_def *od = unsmob ($2); + if (od) { + if (to_boolean (od->lookup_variable (ly_symbol2scm ("is-paper")))) + { + parser->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead")); + od = 0; + $2 = SCM_UNSPECIFIED; + } + } else if (!unsmob ($$)) { + if (unsmob ($2)) { + $2 = Lily::scorify_music ($2); + } + if (unsmob ($2)) + { + $$ = $2; + $2 = SCM_UNSPECIFIED; + } } - else - { - unsmob_score ($1)->add_output_def (od); + Score *score = unsmob ($$); + if (score && scm_is_pair ($1)) { + if (ly_is_module (scm_car ($1))) + { + score->set_header (scm_car ($1)); + $1 = scm_cdr ($1); + } + for (SCM p = scm_reverse_x ($1, SCM_EOL); + scm_is_pair (p); p = scm_cdr (p)) + { + score->add_output_def (unsmob (scm_car (p))); + } } + if (od) { + if (score) + score->add_output_def (od); + else if (scm_is_pair ($$) && ly_is_module (scm_car ($$))) + scm_set_cdr_x ($$, scm_cons ($2, scm_cdr ($$))); + else + $$ = scm_cons ($2, $$); + } else if (ly_is_module ($2)) { + SCM module = SCM_UNSPECIFIED; + if (score) { + module = score->get_header (); + if (!ly_is_module (module)) + { + module = ly_make_module (false); + score->set_header (module); + } + } else if (scm_is_pair ($$) && ly_is_module (scm_car ($$))) + module = scm_car ($$); + else { + module = ly_make_module (false); + $$ = scm_cons (module, $$); + } + ly_module_copy (module, $2); + } else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) + parser->parser_error (@2, _("Spurious expression in \\score")); } - | score_body error { - unsmob_score ($$)->error_found_ = true; + | score_items + { + if (Score *score = unsmob ($1)) { + if (!ly_is_module (score->get_header ())) + score->set_header (ly_make_module (false)); + parser->lexer_->add_scope (score->get_header ()); + } else { + if (!scm_is_pair ($1) || !ly_is_module (scm_car ($1))) + $1 = scm_cons (ly_make_module (false), $1); + parser->lexer_->add_scope (scm_car ($1)); + } + } lilypond_header + { + $$ = $1; } ; @@ -893,9 +1210,9 @@ score_body: paper_block: output_def { - Output_def *od = unsmob_output_def ($1); + Output_def *od = unsmob ($1); - if (od->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T) + if (!to_boolean (od->lookup_variable (ly_symbol2scm ("is-paper")))) { parser->parser_error (@1, _ ("need \\paper for paper block")); $$ = get_paper (parser)->unprotect (); @@ -906,7 +1223,8 @@ paper_block: output_def: output_def_body '}' { - $$ = $1; + if (scm_is_pair ($1)) + $$ = scm_car ($1); parser->lexer_->remove_scope (); parser->lexer_->pop_state (); @@ -946,44 +1264,74 @@ output_def_head_with_mode_switch: // is still time to escape from notes mode. music_or_context_def: - music_arg + music_assign | context_def_spec_block ; output_def_body: output_def_head_with_mode_switch '{' { - $$ = $1; - unsmob_output_def ($$)->input_origin_.set_spot (@$); - } - | output_def_head_with_mode_switch '{' OUTPUT_DEF_IDENTIFIER { - Output_def *o = unsmob_output_def ($3); - o->input_origin_.set_spot (@$); - $$ = o->self_scm (); - parser->lexer_->remove_scope (); - parser->lexer_->add_scope (o->scope_); + unsmob ($1)->input_origin_.set_spot (@$); + // This is a stupid trick to mark the beginning of the + // body for deciding whether to allow + // embedded_scm_active to have an output definition + $$ = scm_list_1 ($1); } | output_def_body assignment { - + if (scm_is_pair ($1)) + $$ = scm_car ($1); } - | output_def_body embedded_scm { - + | output_def_body embedded_scm_active + { + // We don't switch into note mode for Scheme functions + // here. Does not seem warranted/required in output + // definitions. + if (scm_is_pair ($1)) + { + Output_def *o = unsmob ($2); + if (o) { + o->input_origin_.set_spot (@$); + $1 = o->self_scm (); + parser->lexer_->remove_scope (); + parser->lexer_->add_scope (o->scope_); + $2 = SCM_UNSPECIFIED; + } else + $1 = scm_car ($1); + } + if (unsmob ($2)) + assign_context_def (unsmob ($1), $2); + // Seems unlikely, but let's be complete: + else if (unsmob ($2)) + { + SCM proc = parser->lexer_->lookup_identifier + ("output-def-music-handler"); + scm_call_2 (proc, $1, $2); + } else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) + parser->parser_error (@2, _("bad expression type")); + $$ = $1; + } + | output_def_body SCM_TOKEN { + if (scm_is_pair ($1)) + $$ = scm_car ($1); + // Evaluate and ignore #xxx, as opposed to \xxx + parser->lexer_->eval_scm_token ($2, @2); } | output_def_body { - SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (nn); + if (scm_is_pair ($1)) + $1 = scm_car ($1); + parser->lexer_->push_note_state (Lily::pitchnames); } music_or_context_def { parser->lexer_->pop_state (); - if (unsmob_context_def ($3)) - assign_context_def (unsmob_output_def ($1), $3); + if (unsmob ($3)) + assign_context_def (unsmob ($1), $3); else { SCM proc = parser->lexer_->lookup_identifier ("output-def-music-handler"); - scm_call_3 (proc, parser->self_scm (), - $1, $3); + scm_call_2 (proc, $1, $3); } + $$ = $1; } | output_def_body error { @@ -992,14 +1340,14 @@ output_def_body: tempo_event: TEMPO steno_duration '=' tempo_range { - $$ = MAKE_SYNTAX ("tempo", @$, SCM_EOL, $2, $4); + $$ = MAKE_SYNTAX (tempo, @$, SCM_EOL, $2, $4); } - | TEMPO scalar_closed steno_duration '=' tempo_range { - $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, $5); - } - | TEMPO scalar { - $$ = MAKE_SYNTAX ("tempo", @$, $2); + | TEMPO text steno_duration '=' tempo_range { + $$ = MAKE_SYNTAX (tempo, @$, $2, $3, $5); } + | TEMPO text { + $$ = MAKE_SYNTAX (tempo, @$, $2); + } %prec ':' ; /* @@ -1010,7 +1358,7 @@ music_list: $$ = SCM_EOL; } | music_list music_embedded { - if (unsmob_music ($2)) + if (unsmob ($2)) $$ = scm_cons ($2, $1); } | music_list error { @@ -1029,14 +1377,27 @@ braced_music_list: } ; -music: music_arg +music: music_assign | lyric_element_music + | pitch_as_music + ; + +pitch_as_music: + pitch_or_music + { + $$ = make_music_from_simple (parser, @1, $1); + if (!unsmob ($$)) + { + parser->parser_error (@1, _ ("music expected")); + $$ = MAKE_SYNTAX (void_music, @$); + } + } ; music_embedded: music { - if (unsmob_music ($1)->is_mus_type ("post-event")) { + if (unsmob ($1)->is_mus_type ("post-event")) { parser->parser_error (@1, _ ("unexpected post-event")); $$ = SCM_UNSPECIFIED; } @@ -1049,6 +1410,18 @@ music_embedded: { $$ = $3; } + | multiplied_duration post_events + { + Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); + + parser->default_duration_ = *unsmob ($1); + n->set_property ("duration", $1); + + if (scm_is_pair ($2)) + n->set_property ("articulations", + scm_reverse_x ($2, SCM_EOL)); + $$ = n->unprotect (); + } ; music_embedded_backup: @@ -1056,7 +1429,7 @@ music_embedded_backup: { if (scm_is_eq ($1, SCM_UNSPECIFIED)) $$ = $1; - else if (Music *m = unsmob_music ($1)) { + else if (Music *m = unsmob ($1)) { if (m->is_mus_type ("post-event")) { parser->parser_error (@1, _ ("unexpected post-event")); @@ -1073,17 +1446,9 @@ music_embedded_backup: } ; -music_arg: - simple_music - { - $$ = make_music_from_simple (parser, @1, $1); - if (!unsmob_music ($$)) - parser->parser_error (@1, _ ("music expected")); - } - | composite_music %prec COMPOSITE - ; - -music_assign: +// music_assign does not need to contain lyrics: there are no +// assignments in lyricmode. +music_assign: simple_music | composite_music %prec COMPOSITE ; @@ -1091,29 +1456,29 @@ music_assign: repeated_music: REPEAT simple_string unsigned_number music { - $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, SCM_EOL); + $$ = 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); + $$ = MAKE_SYNTAX (repeat, @$, $2, $3, $4, $6); } ; sequential_music: SEQUENTIAL braced_music_list { - $$ = MAKE_SYNTAX ("sequential-music", @$, $2); + $$ = MAKE_SYNTAX (sequential_music, @$, $2); } | braced_music_list { - $$ = MAKE_SYNTAX ("sequential-music", @$, $1); + $$ = MAKE_SYNTAX (sequential_music, @$, $1); } ; simultaneous_music: SIMULTANEOUS braced_music_list { - $$ = MAKE_SYNTAX ("simultaneous-music", @$, $2); + $$ = MAKE_SYNTAX (simultaneous_music, @$, $2); } | DOUBLE_ANGLE_OPEN music_list DOUBLE_ANGLE_CLOSE { - $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_reverse_x ($2, SCM_EOL)); + $$ = MAKE_SYNTAX (simultaneous_music, @$, scm_reverse_x ($2, SCM_EOL)); } ; @@ -1126,83 +1491,168 @@ simple_music: context_modification: WITH { - SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (nn); + parser->lexer_->push_note_state (Lily::pitchnames); } '{' context_mod_list '}' { parser->lexer_->pop_state (); $$ = $4; } - | WITH CONTEXT_MOD_IDENTIFIER - { - $$ = $2; - } - | CONTEXT_MOD_IDENTIFIER - { - $$ = $1; - } | WITH context_modification_arg { - if (unsmob_music ($2)) { + if (unsmob ($2)) { SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler"); - $2 = scm_call_2 (proc, parser->self_scm (), $2); + $2 = scm_call_1 (proc, $2); } - if (unsmob_context_mod ($2)) + if (unsmob ($2)) $$ = $2; else { - parser->parser_error (@2, _ ("not a context mod")); + // let's permit \with #*unspecified* to go for + // an empty context mod + if (!scm_is_eq ($2, SCM_UNSPECIFIED)) + parser->parser_error (@2, _ ("not a context mod")); $$ = Context_mod ().smobbed_copy (); } } ; context_modification_arg: - embedded_scm_closed + embedded_scm | MUSIC_IDENTIFIER ; -optional_context_mod: - /**/ { - $$ = SCM_EOL; - } - | context_modification +/* A list of single mods collected from a (possibly empty) sequence of + * context modifications, usually written as \with ... \with ... + */ + +optional_context_mods: + context_modification_mods_list { - $$ = $1; + if (scm_is_pair ($1)) + $$ = scm_append_x (scm_reverse_x ($1, SCM_EOL)); } ; +/* The worker for optional_context_mods conses a (reversed) list where + * each element contains the list of single context mods from one + * context modification block. Context_mod::get_mods creates fresh + * copies, so it's okay to use append! on them. + */ + +context_modification_mods_list: + /**/ { + $$ = SCM_EOL; + } + | context_modification_mods_list context_modification + { + if (Context_mod *m = unsmob ($2)) + $$ = scm_cons (m->get_mods (), $1); + } + ; + +/* A Context_mod is a container for a list of context mods like + * \consists ... \override ... . context_mod_list produces a + * Context_mod from the inside of a \with { ... } statement. + */ + context_mod_list: /**/ { $$ = Context_mod ().smobbed_copy (); } | context_mod_list context_mod { if (!SCM_UNBNDP ($2)) - unsmob_context_mod ($1)->add_context_mod ($2); - } - | context_mod_list CONTEXT_MOD_IDENTIFIER { - Context_mod *md = unsmob_context_mod ($2); - if (md) - unsmob_context_mod ($1)->add_context_mods (md->get_mods ()); + unsmob ($1)->add_context_mod ($2); } - | context_mod_list context_mod_embedded { - unsmob_context_mod ($1)->add_context_mods - (unsmob_context_mod ($2)->get_mods ()); + | context_mod_list context_mod_arg { + if (unsmob ($2)) { + SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler"); + $2 = scm_call_1 (proc, $2); + } + if (unsmob ($2)) + unsmob ($$)->add_context_mods + (unsmob ($2)->get_mods ()); + else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) + parser->parser_error (@2, _ ("not a context mod")); } ; -composite_music: - complex_music +context_prefix: + CONTEXT symbol optional_id optional_context_mods { + $$ = START_MAKE_SYNTAX (context_specification, $2, $3, $4, SCM_BOOL_F); + } + | NEWCONTEXT symbol optional_id optional_context_mods { + $$ = START_MAKE_SYNTAX (context_specification, $2, $3, $4, SCM_BOOL_T); + } + ; + +new_lyrics: + ADDLYRICS optional_context_mods lyric_mode_music { + $$ = scm_acons ($3, $2, SCM_EOL); + } + | new_lyrics ADDLYRICS optional_context_mods lyric_mode_music { + $$ = scm_acons ($4, $3, $1); + } + ; + +/* basic_music is basically the same as composite_music but with + * context-prefixed music and lyricized music explicitly removed. The + * reason is that in a sequence + * + * \new Staff \new Voice { ... } \addlyrics { ... } \addlyrics { ... } + * + * we need to group both \addlyrics together (as they go with the same + * voice) but then combine them with \new Voice { ... }, meaning that + * combining \new Voice { ... } needs higher priority than + * { ... } \addlyrics, and *not* have \new Staff \new Voice { ... } + * combine before combining \new Voice { ... } \addlyrics: only one + * layer of context-prefixed music should assemble before \addlyrics + * is integrated. Total mess, and we sort this mess out with explicit + * rules preferring a single context-prefix. + */ + +basic_music: + music_function_call + | repeated_music | music_bare + | LYRICSTO simple_string lyric_mode_music { + $$ = MAKE_SYNTAX (lyric_combine, @$, $2, SCM_EOL, $3); + } + | LYRICSTO symbol '=' simple_string lyric_mode_music + { + $$ = MAKE_SYNTAX (lyric_combine, @$, $4, $2, $5); + } ; -/* Music that can be parsed without lookahead */ -closed_music: - music_bare - | complex_music_prefix closed_music +contextable_music: + basic_music + | pitch_as_music + | event_chord + ; + +contexted_basic_music: + context_prefix contextable_music new_lyrics + { + Input i; + i.set_location (@1, @2); + $$ = FINISH_MAKE_SYNTAX ($1, i, $2); + $$ = MAKE_SYNTAX (add_lyrics, @$, $$, scm_reverse_x ($3, SCM_EOL)); + } %prec COMPOSITE + | context_prefix contextable_music + { + $$ = FINISH_MAKE_SYNTAX ($1, @$, $2); + } %prec COMPOSITE + | context_prefix contexted_basic_music { $$ = FINISH_MAKE_SYNTAX ($1, @$, $2); } - | music_function_call_closed + ; + +composite_music: + basic_music %prec COMPOSITE + | contexted_basic_music + | basic_music new_lyrics + { + $$ = MAKE_SYNTAX (add_lyrics, @$, $1, scm_reverse_x ($2, SCM_EOL)); + } %prec COMPOSITE ; music_bare: @@ -1216,71 +1666,130 @@ grouped_music_list: | sequential_music { $$ = $1; } ; -/* 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 argument lists come in a number of flavors. Whenever - * LilyPond has to pick between different flavors, the decision is - * either made because of tokens it has already seen, or it is - * postponed until tokens suitable for making the decision come up. - * For postponing decisions, it may be necessary that the competing - * rules are written in a way making them compatible until a decision - * can be made. Sometimes this is done by putting common traits into - * a separate "common" rule set. +/* Function argument lists are arguably the most complex part in the + * parser. They are pretty tricky to understand because of the way + * they are processed, and because of optional arguments that can be + * omitted. When there are several optional arguments in a row, + * omitting one automatically omits all following arguments. Optional + * arguments can only be omitted when either * - * function_arglist: a full argument list. Optional arguments at the - * end of the list can only be skipped by writing \default in their - * place. + * a) the omission is explicitly started with \default + * b) the omission is implicitly started by an argument not matching + * its predicate, and there is a mandatory argument later that can + * "catch" the argument that does not fit. * - * function_arglist_backup: an argument list ending in an optional - * argument that may be skipped depending on its predicate. + * When argument parsing starts, the lexer pushes EXPECT_SCM tokens + * (corresponding to mandatory arguments and having a predicate + * function as semantic value) or EXPECT_OPTIONAL EXPECT_SCM (where + * the semantic value of the EXPECT_OPTIONAL token is the default to + * use when the optional argument is omitted, and EXPECT_SCM again has + * the argument predicate as semantic value) in reverse order to the + * parser, followed by EXPECT_NO_MORE_ARGS. The argument list is then + * processed inside-out while actual tokens are consumed. * - * function_arglist_skip: an argument list _not_ ending in an optional - * argument that is actually taken. + * This means that the argument list tokens determine the actions + * taken as they arrive. The structure of the argument list is known + * to the parser and stored in its parse stack when the first argument + * is being parsed. What the parser does not know is which predicates + * will match and whether or not \default will be appearing in the + * argument list, and where. * - * function_arglist_nonbackup: an argument list ending in an optional - * argument that may not be skipped because it is in end position and - * has not been shortcircuited with \default. + * Sequences of 0 or more optional arguments are scanned using either + * function_arglist_backup or function_arglist_nonbackup. The first + * is used when optional arguments are followed by at least one + * mandatory argument: in that case optional arguments may be skipped + * by either a false predicate (in which case the expression will be + * pushed back as one or more tokens, preceded by a BACKUP token) or + * by using \default. + * + * If optional arguments are at the end of the argument list, they are + * instead scanned using function_arglist_nonbackup: here the only + * manner to enter into skipping of optional arguments is the use of + * \default. + * + * The argument list of a normal function call is parsed using + * function_arglist. The part of an argument list before a mandatory + * argument is parsed using function_arglist_optional. + * + * The difference is that leading optional arguments are scanned using + * function_arglist_nonbackup and function_arglist_backup, + * respectively. + * + * Most other details are obvious in the rules themselves. * - * function_arglist* / function_arglist_closed*: The closed variants - * don't end in simple music expressions that might still accept - * things like a duration or a postevent. */ -function_arglist_skip: - function_arglist_common - | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_skip +symbol_list_arg: + SYMBOL_LIST + | SYMBOL_LIST '.' symbol_list_rev { - $$ = scm_cons ($1, $3); - } %prec FUNCTION_ARGLIST - | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_skip + $$ = scm_append (scm_list_2 ($1, scm_reverse_x ($3, SCM_EOL))); + } + | SYMBOL_LIST ',' symbol_list_rev { - $$ = scm_cons ($1, $3); - } %prec FUNCTION_ARGLIST - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip + $$ = scm_append (scm_list_2 ($1, scm_reverse_x ($3, SCM_EOL))); + } + ; + +symbol_list_rev: + symbol_list_part + | symbol_list_rev '.' symbol_list_part { - $$ = scm_cons ($1, $3); - } %prec FUNCTION_ARGLIST + $$ = scm_append_x (scm_list_2 ($3, $1)); + } + | symbol_list_rev ',' symbol_list_part + { + $$ = scm_append_x (scm_list_2 ($3, $1)); + } + ; + +// symbol_list_part delivers elements in reverse copy, no lookahead + +symbol_list_part: + symbol_list_part_bare + | embedded_scm_bare + { + $$ = make_reverse_key_list ($1); + if (SCM_UNBNDP ($$)) { + parser->parser_error (@1, _("not a key")); + $$ = SCM_EOL; + } + } ; -function_arglist_nonbackup_common: - EXPECT_OPTIONAL EXPECT_PITCH function_arglist pitch_also_in_chords { - $$ = scm_cons ($4, $3); +symbol_list_element: + STRING + { + $$ = scm_string_to_symbol ($1); } - | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed duration_length { - $$ = scm_cons ($4, $3); + | UNSIGNED + ; + + +symbol_list_part_bare: + SYMBOL + { + $$ = try_word_variants (Lily::key_list_p, $1); + if (SCM_UNBNDP ($$)) { + parser->parser_error (@1, _("not a key")); + $$ = SCM_EOL; + } else + $$ = scm_reverse ($$); } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist FRACTION + | symbol_list_element { - $$ = check_scheme_arg (parser, @4, $4, $3, $2); + $$ = scm_list_1 ($1); } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed post_event_nofinger + ; + +function_arglist_nonbackup: + function_arglist_common + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup post_event_nofinger { $$ = check_scheme_arg (parser, @4, $4, $3, $2); } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' UNSIGNED + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup '-' UNSIGNED { SCM n = scm_difference ($5, SCM_UNDEFINED); if (scm_is_true (scm_call_1 ($2, n))) @@ -1291,97 +1800,54 @@ function_arglist_nonbackup_common: $$ = check_scheme_arg (parser, @4, t->unprotect (), $3, $2, n); } - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' REAL + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup '-' REAL { $$ = check_scheme_arg (parser, @4, scm_difference ($5, SCM_UNDEFINED), $3, $2); } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' NUMBER_IDENTIFIER + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup '-' NUMBER_IDENTIFIER { $$ = check_scheme_arg (parser, @4, scm_difference ($5, SCM_UNDEFINED), $3, $2); } - ; - -function_arglist_closed_nonbackup: - function_arglist_nonbackup_common - | EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg_closed - { - $$ = check_scheme_arg (parser, @4, $4, $3, $2); - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number_closed + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup embedded_scm_arg { - $$ = check_scheme_arg (parser, @4, $4, $3, $2); - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist SCM_IDENTIFIER - { - $$ = check_scheme_arg (parser, @4, - try_string_variants ($2, $4), - $3, $2, $4); - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist STRING - { - $$ = check_scheme_arg (parser, @4, - try_string_variants ($2, $4), - $3, $2, $4); + if (scm_is_true (scm_call_1 ($2, $4))) + $$ = scm_cons ($4, $3); + else + $$ = check_scheme_arg (parser, @4, + make_music_from_simple + (parser, @4, $4), + $3, $2); } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist full_markup + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup bare_number_common { $$ = check_scheme_arg (parser, @4, $4, $3, $2); } - ; - -symbol_list_arg: - SYMBOL_LIST - | SYMBOL_LIST '.' symbol_list_rev - { - $$ = scm_append (scm_list_2 ($1, scm_reverse_x ($3, SCM_EOL))); - } - ; - -symbol_list_rev: - symbol_list_part - | symbol_list_rev '.' symbol_list_part + | function_arglist_nonbackup_reparse REPARSE pitch_or_music { - $$ = scm_append_x (scm_list_2 ($3, $1)); + if (scm_is_true (scm_call_1 ($2, $3))) + $$ = scm_cons ($3, $1); + else + $$ = check_scheme_arg (parser, @3, + make_music_from_simple + (parser, @3, $3), + $1, $2); } - ; - -// symbol_list_part delivers elements in reverse copy. - -symbol_list_part: - symbol_list_element + | function_arglist_nonbackup_reparse REPARSE multiplied_duration { - SCM sym_l_p = ly_lily_module_constant ("symbol-list?"); - $$ = try_string_variants (sym_l_p, $1); - if (SCM_UNBNDP ($$)) { - parser->parser_error (@1, _("not a symbol")); - $$ = SCM_EOL; - } else - $$ = scm_reverse ($$); + $$ = check_scheme_arg (parser, @3, $3, $1, $2); } - ; - - -symbol_list_element: - STRING - | embedded_scm_bare - ; - - -function_arglist_nonbackup: - function_arglist_nonbackup_common - | EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg + | function_arglist_nonbackup_reparse REPARSE reparsed_rhythm { - $$ = check_scheme_arg (parser, @4, $4, $3, $2); + $$ = check_scheme_arg (parser, @3, $3, $1, $2); } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number + | function_arglist_nonbackup_reparse REPARSE bare_number_common { - $$ = check_scheme_arg (parser, @4, $4, $3, $2); + $$ = check_scheme_arg (parser, @3, $3, $1, $2); } | function_arglist_nonbackup_reparse REPARSE SCM_ARG { @@ -1397,8 +1863,22 @@ function_arglist_nonbackup: } ; + +reparsed_rhythm: + DURATION_ARG dots multipliers post_events + { + $$ = make_music_from_simple (parser, @$, + make_duration ($1, scm_to_int ($2), $3)); + Music *m = unsmob ($$); + assert (m); + if (scm_is_pair ($4)) + m->set_property ("articulations", + scm_reverse_x ($4, SCM_EOL)); + } %prec ':' + ; + function_arglist_nonbackup_reparse: - EXPECT_OPTIONAL EXPECT_SCM function_arglist SCM_IDENTIFIER + EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup SCM_IDENTIFIER { $$ = $3; SCM res = try_string_variants ($2, $4); @@ -1415,7 +1895,29 @@ function_arglist_nonbackup_reparse: else MYREPARSE (@4, $2, SCM_ARG, $4); } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist STRING + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup pitch + { + $$ = $3; + if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple + (parser, @4, $4)))) + MYREPARSE (@4, $2, PITCH_IDENTIFIER, $4); + else + MYREPARSE (@4, $2, SCM_ARG, $4); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup steno_tonic_pitch + { + $$ = $3; + if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple + (parser, @4, $4)))) + MYREPARSE (@4, $2, TONICNAME_PITCH, $4); + else + MYREPARSE (@4, $2, SCM_ARG, $4); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup STRING { $$ = $3; SCM res = try_string_variants ($2, $4); @@ -1432,7 +1934,24 @@ function_arglist_nonbackup_reparse: else MYREPARSE (@4, $2, SCM_ARG, $4); } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist full_markup + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup SYMBOL + { + $$ = $3; + SCM res = try_word_variants ($2, $4); + if (!SCM_UNBNDP (res)) + if (scm_is_pair (res)) + MYREPARSE (@4, $2, SYMBOL_LIST, res); + else + MYREPARSE (@4, $2, SCM_ARG, res); + else if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple + (parser, @4, $4)))) + MYREPARSE (@4, $2, STRING, $4); + else + MYREPARSE (@4, $2, SCM_ARG, $4); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup full_markup { $$ = $3; if (scm_is_true (scm_call_1 ($2, $4))) @@ -1445,91 +1964,163 @@ function_arglist_nonbackup_reparse: else MYREPARSE (@4, $2, SCM_ARG, $4); } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup UNSIGNED + { + $$ = $3; + if (scm_is_true (scm_call_1 ($2, $4))) + // May be 3 \cm or similar + MYREPARSE (@4, $2, REAL, $4); + else if (scm_is_true (scm_call_1 ($2, scm_list_1 ($4)))) + MYREPARSE (@4, $2, SYMBOL_LIST, scm_list_1 ($4)); + else { + SCM d = make_duration ($4); + if (!SCM_UNBNDP (d)) { + if (scm_is_true (scm_call_1 ($2, d))) + MYREPARSE (@4, $2, DURATION_IDENTIFIER, d); + else if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple (parser, @4, d)))) + MYREPARSE (@4, $2, DURATION_ARG, d); + else + MYREPARSE (@4, $2, SCM_ARG, $4); // trigger error + } else + MYREPARSE (@4, $2, SCM_ARG, $4); // trigger error + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup DURATION_IDENTIFIER + { + $$ = $3; + if (scm_is_true (scm_call_1 ($2, $4))) + MYREPARSE (@4, $2, DURATION_IDENTIFIER, $4); + else if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple (parser, @4, $4)))) + MYREPARSE (@4, $2, DURATION_ARG, $4); + else + MYREPARSE (@4, $2, SCM_ARG, $4); // trigger error + } ; -function_arglist_keep: - function_arglist_common - | function_arglist_backup - ; - -function_arglist_closed_keep: - function_arglist_closed_common - | function_arglist_backup - ; +// function_arglist_backup can't occur at the end of an argument +// list. function_arglist_backup: - EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep embedded_scm_arg_closed + function_arglist_common + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup embedded_scm_arg { if (scm_is_true (scm_call_1 ($2, $4))) - { $$ = scm_cons ($4, $3); - } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); - MYBACKUP (SCM_ARG, $4, @4); + else { + $$ = make_music_from_simple (parser, @4, $4); + if (scm_is_true (scm_call_1 ($2, $$))) + $$ = scm_cons ($$, $3); + else + { + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); + MYBACKUP (SCM_ARG, $4, @4); + } } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep post_event_nofinger + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup post_event_nofinger { if (scm_is_true (scm_call_1 ($2, $4))) { $$ = scm_cons ($4, $3); } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (EVENT_IDENTIFIER, $4, @4); } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep full_markup + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup pitch { - if (scm_is_true (scm_call_1 ($2, $4))) + if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple + (parser, @4, $4)))) + { + $$ = $3; + MYREPARSE (@4, $2, PITCH_IDENTIFIER, $4); + } else if (scm_is_true (scm_call_1 ($2, $4))) $$ = scm_cons ($4, $3); else { - $$ = scm_cons (loc_on_music (@3, $1), $3); - MYBACKUP (LYRIC_ELEMENT, $4, @4); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); + MYBACKUP (PITCH_IDENTIFIER, $4, @4); } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep UNSIGNED + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup steno_tonic_pitch { - if (scm_is_true (scm_call_1 ($2, $4))) + if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple + (parser, @4, $4)))) { $$ = $3; - MYREPARSE (@4, $2, UNSIGNED, $4); - } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); - MYBACKUP (UNSIGNED, $4, @4); + MYREPARSE (@4, $2, TONICNAME_PITCH, $4); + } else if (scm_is_true (scm_call_1 ($2, $4))) + $$ = scm_cons ($4, $3); + else { + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); + MYBACKUP (TONICNAME_PITCH, $4, @4); } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep REAL + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup full_markup { if (scm_is_true (scm_call_1 ($2, $4))) - { - $$ = $3; + $$ = scm_cons ($4, $3); + else { + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); + MYBACKUP (SCM_IDENTIFIER, $4, @4); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup UNSIGNED + { + $$ = $3; + if (scm_is_true (scm_call_1 ($2, $4))) + // May be 3 \cm or similar MYREPARSE (@4, $2, REAL, $4); - } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); - MYBACKUP (REAL, $4, @4); + else if (scm_is_true (scm_call_1 ($2, scm_list_1 ($4)))) + MYREPARSE (@4, $2, SYMBOL_LIST, scm_list_1 ($4)); + else { + SCM d = make_duration ($4); + if (!SCM_UNBNDP (d)) { + if (scm_is_true (scm_call_1 ($2, d))) + MYREPARSE (@4, $2, DURATION_IDENTIFIER, d); + else if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple (parser, @4, d)))) + MYREPARSE (@4, $2, DURATION_ARG, d); + else { + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); + MYBACKUP (UNSIGNED, $4, @4); + } + } else { + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); + MYBACKUP (UNSIGNED, $4, @4); + } } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep NUMBER_IDENTIFIER + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup REAL { if (scm_is_true (scm_call_1 ($2, $4))) { - $$ = scm_cons ($4, $3); + $$ = $3; + MYREPARSE (@4, $2, REAL, $4); } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); - MYBACKUP (NUMBER_IDENTIFIER, $4, @4); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); + MYBACKUP (REAL, $4, @4); } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep FRACTION + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup 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 (FRACTION, $4, @4); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); + MYBACKUP (NUMBER_IDENTIFIER, $4, @4); } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep '-' UNSIGNED + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup '-' UNSIGNED { SCM n = scm_difference ($5, SCM_UNDEFINED); if (scm_is_true (scm_call_1 ($2, n))) { @@ -1542,43 +2133,48 @@ function_arglist_backup: if (scm_is_true (scm_call_1 ($2, $$))) $$ = scm_cons ($$, $3); else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (UNSIGNED, $5, @5); - parser->lexer_->push_extra_token ('-'); + parser->lexer_->push_extra_token (@4, '-'); } } - } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep '-' REAL + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup '-' REAL { SCM n = scm_difference ($5, SCM_UNDEFINED); if (scm_is_true (scm_call_1 ($2, n))) { MYREPARSE (@5, $2, REAL, n); $$ = $3; } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (REAL, n, @5); } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep '-' NUMBER_IDENTIFIER + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup '-' NUMBER_IDENTIFIER { SCM n = scm_difference ($5, SCM_UNDEFINED); if (scm_is_true (scm_call_1 ($2, n))) { $$ = scm_cons (n, $3); } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (NUMBER_IDENTIFIER, n, @5); } } - | 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 + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup DURATION_IDENTIFIER { - $$ = scm_cons ($4, $3); + $$ = $3; + if (scm_is_true (scm_call_1 ($2, $4))) + MYREPARSE (@4, $2, DURATION_IDENTIFIER, $4); + else if (scm_is_true + (scm_call_1 + ($2, make_music_from_simple (parser, @4, $4)))) + MYREPARSE (@4, $2, DURATION_ARG, $4); + else { + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); + MYBACKUP (DURATION_IDENTIFIER, $4, @4); + } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep SCM_IDENTIFIER + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup SCM_IDENTIFIER { SCM res = try_string_variants ($2, $4); if (!SCM_UNBNDP (res)) @@ -1589,11 +2185,11 @@ function_arglist_backup: else $$ = scm_cons (res, $3); else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (SCM_IDENTIFIER, $4, @4); } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep STRING + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup STRING { SCM res = try_string_variants ($2, $4); if (!SCM_UNBNDP (res)) @@ -1604,54 +2200,147 @@ function_arglist_backup: else $$ = scm_cons (res, $3); else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); + MYBACKUP (STRING, $4, @4); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup SYMBOL + { + SCM res = try_word_variants ($2, $4); + if (!SCM_UNBNDP (res)) + if (scm_is_pair (res)) { + $$ = $3; + MYREPARSE (@4, $2, SYMBOL_LIST, res); + } + else + $$ = scm_cons (res, $3); + else { + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); MYBACKUP (STRING, $4, @4); } } - | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup BACKUP + | function_arglist_backup REPARSE pitch_or_music + { + if (scm_is_true (scm_call_1 ($2, $3))) + $$ = scm_cons ($3, $1); + else + $$ = check_scheme_arg (parser, @3, + make_music_from_simple + (parser, @3, $3), + $1, $2); + } + | function_arglist_backup REPARSE bare_number_common + { + $$ = check_scheme_arg (parser, @3, + $3, $1, $2); + } + | function_arglist_backup REPARSE multiplied_duration + { + $$ = check_scheme_arg (parser, @3, + $3, $1, $2); + } + | function_arglist_backup REPARSE reparsed_rhythm + { + $$ = check_scheme_arg (parser, @3, + $3, $1, $2); + } + | function_arglist_backup REPARSE symbol_list_arg + { + $$ = check_scheme_arg (parser, @3, $3, $1, $2); + } + ; + +function_arglist: + function_arglist_nonbackup + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_nonbackup DEFAULT + { + $$ = scm_cons (loc_on_copy (parser, @4, $1), $3); + } + ; + +function_arglist_skip_nonbackup: + function_arglist_nonbackup + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_nonbackup + { + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); + } + ; + +// Partial function arglists are returned just in their incomplete +// state: when combined with the music function, the missing parts of +// the signature can be reconstructed +// +// To serve as a partial arglist, the argument list must absolutely +// _not_ be in "skipping optional arguments" mode since then there is +// some backup token that has nowhere to go before \etc. +// +// So we can skim off an arbitrary number of arguments from the end of +// the argument list. The argument list remaining afterwards has to +// be in not-skipping-optional-arguments mode. + +function_arglist_partial: + EXPECT_SCM function_arglist_optional + { + $$ = $2; + } + | EXPECT_SCM function_arglist_partial_optional { - $$ = scm_cons ($1, $3); - MYBACKUP(0, SCM_UNDEFINED, @3); + $$ = $2; } - | function_arglist_backup REPARSE bare_number + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup { - $$ = check_scheme_arg (parser, @3, - $3, $1, $2); + $$ = $3; } - | function_arglist_backup REPARSE symbol_list_arg + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_partial { - $$ = check_scheme_arg (parser, @3, $3, $1, $2); + $$ = $3; } ; -function_arglist: - function_arglist_common - | function_arglist_nonbackup +function_arglist_partial_optional: + EXPECT_SCM function_arglist_optional + { + $$ = $2; + } + | EXPECT_SCM function_arglist_partial_optional + { + $$ = $2; + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup + { + $$ = $3; + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_partial_optional + { + $$ = $3; + } ; function_arglist_common: - function_arglist_bare - | EXPECT_SCM function_arglist_optional embedded_scm_arg - { - $$ = check_scheme_arg (parser, @3, - $3, $2, $1); + EXPECT_NO_MORE_ARGS { + $$ = SCM_EOL; } - | EXPECT_SCM function_arglist_closed_optional bare_number + | EXPECT_SCM function_arglist_optional embedded_scm_arg { - $$ = check_scheme_arg (parser, @3, - $3, $2, $1); + if (scm_is_true (scm_call_1 ($1, $3))) + $$ = scm_cons ($3, $2); + else + $$ = check_scheme_arg (parser, @3, + make_music_from_simple + (parser, @3, $3), + $2, $1); } - | EXPECT_SCM function_arglist_optional FRACTION + | EXPECT_SCM function_arglist_optional bare_number_common { $$ = check_scheme_arg (parser, @3, $3, $2, $1); } - | EXPECT_SCM function_arglist_closed_optional post_event_nofinger + | EXPECT_SCM function_arglist_optional post_event_nofinger { $$ = check_scheme_arg (parser, @3, $3, $2, $1); } - | EXPECT_SCM function_arglist_closed_optional '-' NUMBER_IDENTIFIER + | EXPECT_SCM function_arglist_optional '-' NUMBER_IDENTIFIER { SCM n = scm_difference ($4, SCM_UNDEFINED); $$ = check_scheme_arg (parser, @4, n, $2, $1); @@ -1666,7 +2355,27 @@ function_arglist_common: $$ = check_scheme_arg (parser, @3, $3, $1, $2); } - | function_arglist_common_reparse REPARSE bare_number + | function_arglist_common_reparse REPARSE pitch_or_music + { + if (scm_is_true (scm_call_1 ($2, $3))) + $$ = scm_cons ($3, $1); + else + $$ = check_scheme_arg (parser, @3, + make_music_from_simple + (parser, @3, $3), + $1, $2); + } + | function_arglist_common_reparse REPARSE bare_number_common + { + $$ = check_scheme_arg (parser, @3, + $3, $1, $2); + } + | function_arglist_common_reparse REPARSE multiplied_duration + { + $$ = check_scheme_arg (parser, @3, + $3, $1, $2); + } + | function_arglist_common_reparse REPARSE reparsed_rhythm { $$ = check_scheme_arg (parser, @3, $3, $1, $2); @@ -1696,6 +2405,28 @@ function_arglist_common_reparse: // know the predicate to be false. MYREPARSE (@3, $1, SCM_ARG, $3); } + | EXPECT_SCM function_arglist_optional pitch + { + $$ = $2; + if (scm_is_true + (scm_call_1 + ($1, make_music_from_simple + (parser, @3, $3)))) + MYREPARSE (@3, $1, PITCH_IDENTIFIER, $3); + else + MYREPARSE (@3, $1, SCM_ARG, $3); + } + | EXPECT_SCM function_arglist_optional steno_tonic_pitch + { + $$ = $2; + if (scm_is_true + (scm_call_1 + ($1, make_music_from_simple + (parser, @3, $3)))) + MYREPARSE (@3, $1, TONICNAME_PITCH, $3); + else + MYREPARSE (@3, $1, SCM_ARG, $3); + } | EXPECT_SCM function_arglist_optional STRING { $$ = $2; @@ -1714,6 +2445,24 @@ function_arglist_common_reparse: // know the predicate to be false. MYREPARSE (@3, $1, SCM_ARG, $3); } + | EXPECT_SCM function_arglist_optional SYMBOL + { + $$ = $2; + SCM res = try_word_variants ($1, $3); + if (!SCM_UNBNDP (res)) + if (scm_is_pair (res)) + MYREPARSE (@3, $1, SYMBOL_LIST, res); + else + MYREPARSE (@3, $1, SCM_ARG, res); + else if (scm_is_true + (scm_call_1 + ($1, make_music_from_simple (parser, @3, $3)))) + MYREPARSE (@3, $1, LYRIC_ELEMENT, $3); + else + // This is going to flag a syntax error, we + // know the predicate to be false. + MYREPARSE (@3, $1, SCM_ARG, $3); + } | EXPECT_SCM function_arglist_optional full_markup { $$ = $2; @@ -1728,7 +2477,42 @@ function_arglist_common_reparse: // know the predicate to be false. MYREPARSE (@3, $1, SCM_ARG, $3); } - | EXPECT_SCM function_arglist_closed_optional '-' UNSIGNED + | EXPECT_SCM function_arglist_optional UNSIGNED + { + $$ = $2; + if (scm_is_true (scm_call_1 ($1, $3))) + // May be 3 \cm or similar + MYREPARSE (@3, $1, REAL, $3); + else if (scm_is_true (scm_call_1 ($1, scm_list_1 ($3)))) + MYREPARSE (@3, $1, SYMBOL_LIST, scm_list_1 ($3)); + else { + SCM d = make_duration ($3); + if (!SCM_UNBNDP (d)) { + if (scm_is_true (scm_call_1 ($1, d))) + MYREPARSE (@3, $1, DURATION_IDENTIFIER, d); + else if (scm_is_true + (scm_call_1 + ($1, make_music_from_simple (parser, @3, d)))) + MYREPARSE (@3, $1, DURATION_ARG, d); + else + MYREPARSE (@3, $1, SCM_ARG, $3); // trigger error + } else + MYREPARSE (@3, $1, SCM_ARG, $3); // trigger error + } + } + | EXPECT_SCM function_arglist_optional DURATION_IDENTIFIER + { + $$ = $2; + if (scm_is_true (scm_call_1 ($1, $3))) + MYREPARSE (@3, $1, DURATION_IDENTIFIER, $3); + else if (scm_is_true + (scm_call_1 + ($1, make_music_from_simple (parser, @3, $3)))) + MYREPARSE (@3, $1, DURATION_ARG, $3); + else + MYREPARSE (@3, $1, SCM_ARG, $3); // trigger error + } + | EXPECT_SCM function_arglist_optional '-' UNSIGNED { $$ = $2; SCM n = scm_difference ($4, SCM_UNDEFINED); @@ -1743,9 +2527,8 @@ function_arglist_common_reparse: else MYREPARSE (@4, $1, SCM_ARG, $4); } - } - | EXPECT_SCM function_arglist_closed_optional '-' REAL + | EXPECT_SCM function_arglist_optional '-' REAL { $$ = $2; SCM n = scm_difference ($4, SCM_UNDEFINED); @@ -1753,124 +2536,27 @@ function_arglist_common_reparse: } ; -function_arglist_closed: - function_arglist_closed_common - | function_arglist_closed_nonbackup - ; - -function_arglist_closed_common: - function_arglist_bare - | EXPECT_SCM function_arglist_optional embedded_scm_arg_closed - { - $$ = check_scheme_arg (parser, @3, - $3, $2, $1); - } - | EXPECT_SCM function_arglist_closed_optional bare_number - { - $$ = check_scheme_arg (parser, @3, - $3, $2, $1); - } - | EXPECT_SCM function_arglist_closed_optional '-' NUMBER_IDENTIFIER - { - $$ = check_scheme_arg (parser, @3, - scm_difference ($4, SCM_UNDEFINED), - $2, $1); - } - | EXPECT_SCM function_arglist_closed_optional post_event_nofinger - { - $$ = check_scheme_arg (parser, @3, - $3, $2, $1); - } - | EXPECT_SCM function_arglist_optional FRACTION - { - $$ = check_scheme_arg (parser, @3, - $3, $2, $1); - } - | function_arglist_common_reparse REPARSE SCM_ARG - { - $$ = check_scheme_arg (parser, @3, - $3, $1, $2); - } - | function_arglist_common_reparse REPARSE bare_number - { - $$ = check_scheme_arg (parser, @3, - $3, $1, $2); - } - | function_arglist_common_reparse REPARSE symbol_list_arg - { - $$ = check_scheme_arg (parser, @3, $3, $1, $2); - } - ; - 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 + function_arglist_backup + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_backup DEFAULT { - $$ = scm_cons ($1, $3); + $$ = scm_cons (loc_on_copy (parser, @4, $1), $3); } + | function_arglist_skip_backup BACKUP ; -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 +function_arglist_skip_backup: + function_arglist_backup + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_backup { - $$ = 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; - } - | 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); + $$ = scm_cons (loc_on_copy (parser, @3, $1), $3); } ; music_function_call: MUSIC_FUNCTION function_arglist { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); + $$ = MAKE_SYNTAX (music_function, @$, + $1, $2); } ; @@ -1882,38 +2568,28 @@ optional_id: } ; -complex_music: - music_function_call - | repeated_music { $$ = $1; } - | re_rhythmed_music { $$ = $1; } - | complex_music_prefix music - { - $$ = FINISH_MAKE_SYNTAX ($1, @$, $2); - } - ; +// We must not have lookahead tokens parsed in lyric mode. In order +// to save confusion, we take almost the same set as permitted with +// \lyricmode and/or \lyrics. However, music identifiers are also +// allowed, and they obviously do not require switching into lyrics +// mode for parsing. -complex_music_prefix: - CONTEXT symbol optional_id optional_context_mod { - Context_mod *ctxmod = unsmob_context_mod ($4); - SCM mods = SCM_EOL; - if (ctxmod) - mods = ctxmod->get_mods (); - $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_F); - } - | NEWCONTEXT symbol optional_id optional_context_mod { - Context_mod *ctxmod = unsmob_context_mod ($4); - SCM mods = SCM_EOL; - if (ctxmod) - mods = ctxmod->get_mods (); - $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_T); +lyric_mode_music: + { + parser->lexer_->push_lyric_state (); + } grouped_music_list + { + parser->lexer_->pop_state (); + $$ = $2; } + | MUSIC_IDENTIFIER ; mode_changed_music: mode_changing_head grouped_music_list { - if ($1 == ly_symbol2scm ("chords")) + if (scm_is_eq ($1, ly_symbol2scm ("chords"))) { - $$ = MAKE_SYNTAX ("unrelativable-music", @$, $2); + $$ = MAKE_SYNTAX (unrelativable_music, @$, $2); } else { @@ -1921,15 +2597,11 @@ mode_changed_music: } parser->lexer_->pop_state (); } - | mode_changing_head_with_context optional_context_mod grouped_music_list { - Context_mod *ctxmod = unsmob_context_mod ($2); - SCM mods = SCM_EOL; - if (ctxmod) - mods = ctxmod->get_mods (); - $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, mods, SCM_BOOL_T, $3); - if ($1 == ly_symbol2scm ("ChordNames")) + | mode_changing_head_with_context optional_context_mods grouped_music_list { + $$ = MAKE_SYNTAX (context_specification, @$, $1, SCM_EOL, $2, SCM_BOOL_T, $3); + if (scm_is_eq ($1, ly_symbol2scm ("ChordNames"))) { - $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$); + $$ = MAKE_SYNTAX (unrelativable_music, @$, $$); } parser->lexer_->pop_state (); } @@ -1937,15 +2609,13 @@ mode_changed_music: mode_changing_head: NOTEMODE { - SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (nn); + parser->lexer_->push_note_state (Lily::pitchnames); $$ = ly_symbol2scm ("notes"); } | DRUMMODE { - SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames"); - parser->lexer_->push_note_state (nn); + parser->lexer_->push_note_state (Lily::drum_pitch_names); $$ = ly_symbol2scm ("drums"); } @@ -1955,10 +2625,9 @@ mode_changing_head: $$ = ly_symbol2scm ("figures"); } | CHORDMODE { - SCM nn = parser->lexer_->lookup_identifier ("chordmodifiers"); - parser->lexer_->chordmodifier_tab_ = alist_to_hashq (nn); - nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_chord_state (nn); + parser->lexer_->chordmodifier_tab_ = + alist_to_hashq (Lily::chordmodifiers); + parser->lexer_->push_chord_state (Lily::pitchnames); $$ = ly_symbol2scm ("chords"); } @@ -1970,8 +2639,7 @@ mode_changing_head: mode_changing_head_with_context: DRUMS { - SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames"); - parser->lexer_->push_note_state (nn); + parser->lexer_->push_note_state (Lily::drum_pitch_names); $$ = ly_symbol2scm ("DrumStaff"); } @@ -1981,10 +2649,9 @@ mode_changing_head_with_context: $$ = ly_symbol2scm ("FiguredBass"); } | CHORDS { - SCM nn = parser->lexer_->lookup_identifier ("chordmodifiers"); - parser->lexer_->chordmodifier_tab_ = alist_to_hashq (nn); - nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_chord_state (nn); + parser->lexer_->chordmodifier_tab_ = + alist_to_hashq (Lily::chordmodifiers); + parser->lexer_->push_chord_state (Lily::pitchnames); $$ = ly_symbol2scm ("ChordNames"); } | LYRICS @@ -1993,39 +2660,9 @@ mode_changing_head_with_context: } ; -new_lyrics: - ADDLYRICS { parser->lexer_->push_lyric_state (); } - /*cont */ - 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); - } - | new_lyrics ADDLYRICS { - parser->lexer_->push_lyric_state (); - } composite_music { - parser->lexer_->pop_state (); - $$ = scm_cons ($4, $1); - } - ; - -re_rhythmed_music: - composite_music new_lyrics { - $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); - } %prec COMPOSITE - | LYRICSTO simple_string { - parser->lexer_->push_lyric_state (); - } music { - parser->lexer_->pop_state (); - $$ = MAKE_SYNTAX ("lyric-combine", @$, $2, $4); - } - ; - context_change: - CHANGE STRING '=' STRING { - $$ = MAKE_SYNTAX ("context-change", @$, scm_string_to_symbol ($2), $4); + CHANGE symbol '=' simple_string { + $$ = MAKE_SYNTAX (context_change, @$, $2, $4); } ; @@ -2034,9 +2671,6 @@ property_path: symbol_list_rev { $$ = scm_reverse_x ($1, SCM_EOL); } - | symbol_list_rev property_path { - $$ = scm_reverse_x ($1, $2); - } ; property_operation: @@ -2046,7 +2680,7 @@ property_operation: | UNSET symbol { $$ = scm_list_2 (ly_symbol2scm ("unset"), $2); } - | OVERRIDE property_path '=' scalar { + | OVERRIDE revert_arg '=' scalar { if (scm_ilength ($2) < 2) { parser->parser_error (@2, _("bad grob property path")); $$ = SCM_UNDEFINED; @@ -2110,10 +2744,14 @@ revert_arg_part: { $$ = scm_append_x (scm_list_2 ($5, $3)); } + | revert_arg_backup BACKUP SCM_ARG ',' symbol_list_part + { + $$ = scm_append_x (scm_list_2 ($5, $3)); + } | revert_arg_backup BACKUP SCM_ARG symbol_list_part { $$ = scm_append_x (scm_list_2 ($4, $3)); - } + } ; context_def_mod: @@ -2135,11 +2773,14 @@ context_mod: | context_def_mod STRING { $$ = scm_list_2 ($1, $2); } + | context_def_mod SYMBOL { + $$ = scm_list_2 ($1, $2); + } | context_def_mod embedded_scm { if (!scm_is_string ($2) - && ly_symbol2scm ("consists") != $1 - && ly_symbol2scm ("remove") != $1) + && !scm_is_eq ($1, ly_symbol2scm ("consists")) + && !scm_is_eq ($1, ly_symbol2scm ("remove"))) { $$ = SCM_EOL; parser->parser_error (@1, _ ("only \\consists and \\remove take non-string argument.")); @@ -2210,43 +2851,6 @@ context_prop_spec: } ; -simple_music_property_def: - OVERRIDE grob_prop_path '=' scalar { - if (SCM_UNBNDP ($2)) - $$ = SCM_UNDEFINED; - else { - $$ = scm_list_5 (scm_car ($2), - ly_symbol2scm ("OverrideProperty"), - scm_cadr ($2), - $4, - scm_cddr ($2)); - } - } - | REVERT simple_revert_context revert_arg { - $$ = scm_list_4 ($2, - ly_symbol2scm ("RevertProperty"), - scm_car ($3), - scm_cdr ($3)); - } - | SET context_prop_spec '=' scalar { - if (SCM_UNBNDP ($2)) - $$ = SCM_UNDEFINED; - else - $$ = scm_list_4 (scm_car ($2), - ly_symbol2scm ("PropertySet"), - scm_cadr ($2), - $4); - } - | UNSET context_prop_spec { - if (SCM_UNBNDP ($2)) - $$ = SCM_UNDEFINED; - else - $$ = scm_list_3 (scm_car ($2), - ly_symbol2scm ("PropertyUnset"), - scm_cadr ($2)); - } - ; - // This is all quite awkward for the sake of substantial backward // compatibility while at the same time allowing a more "natural" form @@ -2271,34 +2875,70 @@ simple_revert_context: (scm_object_property (scm_car ($1), ly_symbol2scm ("is-grob?")))) { $$ = ly_symbol2scm ("Bottom"); - parser->lexer_->push_extra_token (SCM_IDENTIFIER, $1); + parser->lexer_->push_extra_token (@1, SCM_IDENTIFIER, $1); } else { $$ = scm_car ($1); - parser->lexer_->push_extra_token (SCM_IDENTIFIER, + parser->lexer_->push_extra_token (@1, SCM_IDENTIFIER, scm_cdr ($1)); } } ; music_property_def: - simple_music_property_def { - if (SCM_UNBNDP ($1)) - $$ = MAKE_SYNTAX ("void-music", @1); + OVERRIDE grob_prop_path '=' scalar { + if (SCM_UNBNDP ($2)) + $$ = MAKE_SYNTAX (void_music, @$); + else + $$ = MAKE_SYNTAX (property_override, @$, + scm_car ($2), + scm_cdr ($2), + $4); + } + | REVERT simple_revert_context revert_arg { + $$ = MAKE_SYNTAX (property_revert, @$, $2, $3); + } + | SET context_prop_spec '=' scalar { + if (SCM_UNBNDP ($2)) + $$ = MAKE_SYNTAX (void_music, @$); + else + $$ = MAKE_SYNTAX (property_set, @$, + scm_car ($2), + scm_cadr ($2), + $4); + } + | UNSET context_prop_spec { + if (SCM_UNBNDP ($2)) + $$ = MAKE_SYNTAX (void_music, @$); else - $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons2 (parser->self_scm (), make_input (@$), $1)); + $$ = MAKE_SYNTAX (property_unset, @$, + scm_car ($2), + scm_cadr ($2)); } ; string: - STRING { - $$ = $1; - } + STRING + | SYMBOL | full_markup ; -simple_string: STRING { - $$ = $1; +text: + STRING + | SYMBOL + | full_markup + | embedded_scm_bare + { + if (Text_interface::is_markup ($1)) { + $$ = $1; + } else { + parser->parser_error (@1, (_ ("markup expected"))); + $$ = scm_string (SCM_EOL); + } } + ; + +simple_string: STRING + | SYMBOL | embedded_scm_bare { if (scm_is_string ($1)) { @@ -2314,12 +2954,17 @@ symbol: STRING { $$ = scm_string_to_symbol ($1); } + | SYMBOL + { + if (!is_regular_identifier ($1, false)) + parser->parser_error (@1, (_ ("symbol expected"))); + $$ = scm_string_to_symbol ($1); + } | embedded_scm_bare { // This is a bit of overkill but makes the same // routine responsible for all symbol interpretations. - $$ = try_string_variants (ly_lily_module_constant ("symbol?"), - $1); + $$ = try_string_variants (Guile_user::symbol_p, $1); if (SCM_UNBNDP ($$)) { parser->parser_error (@1, (_ ("symbol expected"))); @@ -2332,6 +2977,7 @@ symbol: scalar: embedded_scm_arg + | pitch_or_music | SCM_IDENTIFIER | bare_number // The following is a rather defensive variant of admitting @@ -2345,63 +2991,34 @@ scalar: { $$ = scm_difference ($2, SCM_UNDEFINED); } - | FRACTION - | STRING - | full_markup - ; - -scalar_closed: - embedded_scm_arg_closed - | SCM_IDENTIFIER - // for scalar_closed to be an actually closed (no lookahead) - // expression, we'd need to use bare_number_closed here. It - // turns out that the only use of scalar_closed in TEMPO is - // not of the kind requiring the full closedness criterion. - | bare_number - | '-' bare_number + | string + | symbol_list_part_bare '.' property_path { - $$ = scm_difference ($2, SCM_UNDEFINED); + $$ = scm_reverse_x ($1, $3); + } + | symbol_list_part_bare ',' property_path + { + $$ = scm_reverse_x ($1, $3); } - | FRACTION - | STRING - | full_markup ; - event_chord: simple_element post_events { // Let the rhythmic music iterator sort this mess out. if (scm_is_pair ($2)) { - $$ = make_music_from_simple (parser, @1, $1); - if (unsmob_music ($$)) - unsmob_music ($$)->set_property ("articulations", - scm_reverse_x ($2, SCM_EOL)); - else - parser->parser_error (@1, _("music expected")); + unsmob ($$)->set_property ("articulations", + scm_reverse_x ($2, SCM_EOL)); } - } - | simple_chord_elements post_events { - SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL)); - - Input i; - /* why is this giving wrong start location? -ns - * i = @$; */ - i.set_location (@1, @2); - $$ = MAKE_SYNTAX ("event-chord", i, elts); - } + } %prec ':' | CHORD_REPETITION optional_notemode_duration post_events { - Input i; - i.set_location (@1, @3); - $$ = MAKE_SYNTAX ("repetition-chord", i, + $$ = MAKE_SYNTAX (repetition_chord, @$, $2, scm_reverse_x ($3, SCM_EOL)); - } + } %prec ':' | MULTI_MEASURE_REST optional_notemode_duration post_events { - Input i; - i.set_location (@1, @3); - $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, + $$ = MAKE_SYNTAX (multi_measure_rest, @$, $2, scm_reverse_x ($3, SCM_EOL)); - } - | command_element + } %prec ':' + | tempo_event | note_chord_element ; @@ -2409,25 +3026,29 @@ event_chord: note_chord_element: chord_body optional_notemode_duration post_events { - Music *m = unsmob_music ($1); - SCM dur = unsmob_duration ($2)->smobbed_copy (); + Music *m = unsmob ($1); + SCM dur = unsmob ($2)->smobbed_copy (); SCM es = m->get_property ("elements"); SCM postevs = scm_reverse_x ($3, SCM_EOL); for (SCM s = es; scm_is_pair (s); s = scm_cdr (s)) - unsmob_music (scm_car (s))->set_property ("duration", dur); + unsmob (scm_car (s))->set_property ("duration", dur); es = ly_append2 (es, postevs); - m-> set_property ("elements", es); - m->set_spot (@$); + m->set_property ("elements", es); + m->set_spot (parser->lexer_->override_input (@$)); $$ = m->self_scm (); - } + } %prec ':' ; chord_body: ANGLE_OPEN chord_body_elements ANGLE_CLOSE { - $$ = MAKE_SYNTAX ("event-chord", @$, scm_reverse_x ($2, SCM_EOL)); + $$ = MAKE_SYNTAX (event_chord, @$, scm_reverse_x ($2, SCM_EOL)); + } + | FIGURE_OPEN figure_list FIGURE_CLOSE + { + $$ = MAKE_SYNTAX (event_chord, @$, scm_reverse_x ($2, SCM_EOL)); } ; @@ -2440,7 +3061,7 @@ chord_body_elements: ; chord_body_element: - pitch exclamations questions octave_check post_events + pitch_or_tonic_pitch exclamations questions octave_check post_events { bool q = to_boolean ($3); bool ex = to_boolean ($2); @@ -2478,11 +3099,11 @@ chord_body_element: } | music_function_chord_body { - Music *m = unsmob_music ($1); + Music *m = unsmob ($1); while (m && m->is_mus_type ("music-wrapper-music")) { $$ = m->get_property ("element"); - m = unsmob_music ($$); + m = unsmob ($$); } if (!(m && m->is_mus_type ("rhythmic-event"))) { @@ -2495,47 +3116,23 @@ chord_body_element: music_function_chord_body: music_function_call | MUSIC_IDENTIFIER - ; - -// 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_call_closed: - MUSIC_FUNCTION function_arglist_closed { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); - } + | embedded_scm ; event_function_event: - EVENT_FUNCTION function_arglist_closed { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); + EVENT_FUNCTION function_arglist { + $$ = MAKE_SYNTAX (music_function, @$, + $1, $2); } ; -command_element: - command_event { - $$ = $1; - } - ; - -command_event: - tempo_event { - $$ = $1; - } - ; - - post_events: /* empty */ { $$ = SCM_EOL; } | post_events post_event { $$ = $1; - if (Music *m = unsmob_music ($2)) + if (Music *m = unsmob ($2)) { if (m->is_mus_type ("post-event-wrapper")) { @@ -2546,7 +3143,7 @@ post_events: $$ = scm_cons (scm_car (p), $$); } } else { - m->set_spot (@2); + m->set_spot (parser->lexer_->override_input (@2)); $$ = scm_cons ($2, $$); } } @@ -2557,14 +3154,14 @@ post_event_nofinger: direction_less_event { $$ = $1; } - | script_dir music_function_call_closed { + | script_dir music_function_call { $$ = $2; - if (!unsmob_music ($2)->is_mus_type ("post-event")) { + if (!unsmob ($2)->is_mus_type ("post-event")) { parser->parser_error (@2, _ ("post-event expected")); $$ = SCM_UNSPECIFIED; } else if (!SCM_UNBNDP ($1)) { - unsmob_music ($$)->set_property ("direction", $1); + unsmob ($$)->set_property ("direction", $1); } } | HYPHEN { @@ -2580,7 +3177,7 @@ post_event_nofinger: | script_dir direction_reqd_event { if (!SCM_UNBNDP ($1)) { - Music *m = unsmob_music ($2); + Music *m = unsmob ($2); m->set_property ("direction", $1); } $$ = $2; @@ -2588,7 +3185,7 @@ post_event_nofinger: | script_dir direction_less_event { if (!SCM_UNBNDP ($1)) { - Music *m = unsmob_music ($2); + Music *m = unsmob ($2); m->set_property ("direction", $1); } $$ = $2; @@ -2596,13 +3193,13 @@ post_event_nofinger: | '^' fingering { $$ = $2; - unsmob_music ($$)->set_property ("direction", scm_from_int (UP)); + unsmob ($$)->set_property ("direction", scm_from_int (UP)); } | '_' fingering { $$ = $2; - unsmob_music ($$)->set_property ("direction", scm_from_int (DOWN)); - } + unsmob ($$)->set_property ("direction", scm_from_int (DOWN)); + } ; post_event: @@ -2630,7 +3227,7 @@ direction_less_event: a->set_property ("tremolo-type", $1); $$ = a->unprotect (); } - | event_function_event + | event_function_event ; direction_reqd_event: @@ -2639,11 +3236,21 @@ direction_reqd_event: } | script_abbreviation { SCM s = parser->lexer_->lookup_identifier ("dash" + ly_scm2string ($1)); - Music *a = MY_MAKE_MUSIC ("ArticulationEvent", @$); - if (scm_is_string (s)) + if (scm_is_string (s)) { + Music *a = MY_MAKE_MUSIC ("ArticulationEvent", @$); a->set_property ("articulation-type", s); - else parser->parser_error (@1, _ ("expecting string as script definition")); - $$ = a->unprotect (); + $$ = a->unprotect (); + } else { + Music *original = unsmob (s); + if (original && original->is_mus_type ("post-event")) { + Music *a = original->clone (); + a->set_spot (parser->lexer_->override_input (@$)); + $$ = a->unprotect (); + } else { + parser->parser_error (@1, _ ("expecting string or post-event as script definition")); + $$ = MY_MAKE_MUSIC ("PostEvents", @$)->unprotect (); + } + } } ; @@ -2683,8 +3290,8 @@ steno_pitch: NOTENAME_PITCH quotes { if (!scm_is_eq (SCM_INUM0, $2)) { - Pitch p = *unsmob_pitch ($1); - p = p.transposed (Pitch (scm_to_int ($2),0,0)); + Pitch p = *unsmob ($1); + p = p.transposed (Pitch (scm_to_int ($2), 0)); $$ = p.smobbed_copy (); } } @@ -2698,8 +3305,8 @@ steno_tonic_pitch: TONICNAME_PITCH quotes { if (!scm_is_eq (SCM_INUM0, $2)) { - Pitch p = *unsmob_pitch ($1); - p = p.transposed (Pitch (scm_to_int ($2),0,0)); + Pitch p = *unsmob ($1); + p = p.transposed (Pitch (scm_to_int ($2), 0)); $$ = p.smobbed_copy (); } } @@ -2707,10 +3314,17 @@ steno_tonic_pitch: pitch: steno_pitch - | PITCH_IDENTIFIER + | PITCH_IDENTIFIER quotes { + if (!scm_is_eq (SCM_INUM0, $2)) + { + Pitch p = *unsmob ($1); + p = p.transposed (Pitch (scm_to_int ($2), 0)); + $$ = p.smobbed_copy (); + } + } ; -pitch_also_in_chords: +pitch_or_tonic_pitch: pitch | steno_tonic_pitch ; @@ -2727,9 +3341,16 @@ gen_text_def: make_simple_markup ($1)); $$ = t->unprotect (); } - | embedded_scm_closed + | SYMBOL { + // Flag a warning? could be unintentional + Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$); + t->set_property ("text", + make_simple_markup ($1)); + $$ = t->unprotect (); + } + | embedded_scm { - Music *m = unsmob_music ($1); + Music *m = unsmob ($1); if (m && m->is_mus_type ("post-event")) $$ = $1; else if (Text_interface::is_markup ($1)) { @@ -2751,25 +3372,25 @@ fingering: script_abbreviation: '^' { - $$ = scm_from_locale_string ("Hat"); + $$ = scm_from_ascii_string ("Hat"); } | '+' { - $$ = scm_from_locale_string ("Plus"); + $$ = scm_from_ascii_string ("Plus"); } | '-' { - $$ = scm_from_locale_string ("Dash"); + $$ = scm_from_ascii_string ("Dash"); } | '!' { - $$ = scm_from_locale_string ("Bang"); + $$ = scm_from_ascii_string ("Bang"); } | ANGLE_CLOSE { - $$ = scm_from_locale_string ("Larger"); + $$ = scm_from_ascii_string ("Larger"); } | '.' { - $$ = scm_from_locale_string ("Dot"); + $$ = scm_from_ascii_string ("Dot"); } | '_' { - $$ = scm_from_locale_string ("Underscore"); + $$ = scm_from_ascii_string ("Underscore"); } ; @@ -2779,19 +3400,13 @@ script_dir: | '-' { $$ = SCM_UNDEFINED; } ; -duration_length: - multiplied_duration { - $$ = $1; - } - ; - maybe_notemode_duration: { $$ = SCM_UNDEFINED; - } + } %prec ':' | multiplied_duration { $$ = $1; - parser->default_duration_ = *unsmob_duration ($$); + parser->default_duration_ = *unsmob ($$); } ; @@ -2806,36 +3421,21 @@ optional_notemode_duration: steno_duration: UNSIGNED dots { - int len = 0; - int n = scm_to_int ($1); - if (!is_duration (n)) - parser->parser_error (@1, _f ("not a duration: %d", n)); - else - len = intlog2 (n); - - $$ = Duration (len, scm_to_int ($2)).smobbed_copy (); + $$ = make_duration ($1, scm_to_int ($2)); + if (SCM_UNBNDP ($$)) + { + parser->parser_error (@1, _ ("not a duration")); + $$ = Duration ().smobbed_copy (); + } } | DURATION_IDENTIFIER dots { - Duration *d = unsmob_duration ($1); - Duration k (d->duration_log (), - d->dot_count () + scm_to_int ($2)); - k = k.compressed (d->factor ()); - scm_remember_upto_here_1 ($1); - $$ = k.smobbed_copy (); + $$ = make_duration ($1, scm_to_int ($2)); } ; multiplied_duration: - steno_duration { - $$ = $1; - } - | multiplied_duration '*' UNSIGNED { - $$ = unsmob_duration ($$)->compressed (scm_to_int ($3)).smobbed_copy (); - } - | multiplied_duration '*' FRACTION { - Rational m (scm_to_int (scm_car ($3)), scm_to_int (scm_cdr ($3))); - - $$ = unsmob_duration ($$)->compressed (m).smobbed_copy (); + steno_duration multipliers { + $$ = make_duration ($1, 0, $2); } ; @@ -2848,22 +3448,48 @@ dots: } ; +multipliers: + /* empty */ + { + $$ = SCM_UNDEFINED; + } + | multipliers '*' UNSIGNED + { + if (!SCM_UNBNDP ($1)) + $$ = scm_product ($1, $3); + else + $$ = $3; + } + | multipliers '*' FRACTION + { + if (!SCM_UNBNDP ($1)) + $$ = scm_product ($1, scm_divide (scm_car ($3), + scm_cdr ($3))); + else + $$ = scm_divide (scm_car ($3), scm_cdr ($3)); + } + ; + tremolo_type: ':' { - $$ = SCM_INUM0; + $$ = scm_from_int (parser->default_tremolo_type_); } | ':' UNSIGNED { - int n = scm_to_int ($2); - if (!is_duration (n)) - parser->parser_error (@2, _f ("not a duration: %d", n)); - $$ = $2; + if (SCM_UNBNDP (make_duration ($2))) { + parser->parser_error (@2, _ ("not a duration")); + $$ = scm_from_int (parser->default_tremolo_type_); + } else { + $$ = $2; + parser->default_tremolo_type_ = scm_to_int ($2); + } } ; bass_number: - UNSIGNED { $$ = $1; } - | STRING { $$ = $1; } - | full_markup { $$ = $1; } + UNSIGNED + | STRING + | SYMBOL + | full_markup | embedded_scm_bare { // as an integer, it needs to be non-negative, and otherwise @@ -2902,10 +3528,10 @@ bass_figure: } | bass_figure ']' { $$ = $1; - unsmob_music ($1)->set_property ("bracket-stop", SCM_BOOL_T); + unsmob ($1)->set_property ("bracket-stop", SCM_BOOL_T); } | bass_figure figured_bass_alteration { - Music *m = unsmob_music ($1); + Music *m = unsmob ($1); if (scm_to_double ($2)) { SCM salter = m->get_property ("alteration"); SCM alter = scm_is_number (salter) ? salter : scm_from_int (0); @@ -2916,7 +3542,7 @@ bass_figure: } } | bass_figure figured_bass_modification { - Music *m = unsmob_music ($1); + Music *m = unsmob ($1); m->set_property ($2, SCM_BOOL_T); } ; @@ -2943,7 +3569,7 @@ br_bass_figure: } | '[' bass_figure { $$ = $2; - unsmob_music ($$)->set_property ("bracket-start", SCM_BOOL_T); + unsmob ($$)->set_property ("bracket-start", SCM_BOOL_T); } ; @@ -2956,56 +3582,72 @@ figure_list: } ; -figure_spec: - FIGURE_OPEN figure_list FIGURE_CLOSE { - $$ = scm_reverse_x ($2, SCM_EOL); - } - ; - - optional_rest: /**/ { $$ = SCM_BOOL_F; } | REST { $$ = SCM_BOOL_T; } ; -simple_element: - pitch exclamations questions octave_check maybe_notemode_duration optional_rest { +pitch_or_music: + pitch exclamations questions octave_check maybe_notemode_duration optional_rest post_events { if (!parser->lexer_->is_note_state ()) parser->parser_error (@1, _ ("have to be in Note mode for notes")); if (!SCM_UNBNDP ($2) || !SCM_UNBNDP ($3) || scm_is_number ($4) || !SCM_UNBNDP ($5) - || scm_is_true ($6)) + || scm_is_true ($6) + || scm_is_pair ($7)) { Music *n = 0; if (scm_is_true ($6)) n = MY_MAKE_MUSIC ("RestEvent", @$); else n = MY_MAKE_MUSIC ("NoteEvent", @$); - + n->set_property ("pitch", $1); if (SCM_UNBNDP ($5)) n->set_property ("duration", parser->default_duration_.smobbed_copy ()); else n->set_property ("duration", $5); - + if (scm_is_number ($4)) { int q = scm_to_int ($4); n->set_property ("absolute-octave", scm_from_int (q-1)); } - + if (to_boolean ($3)) n->set_property ("cautionary", SCM_BOOL_T); if (to_boolean ($2) || to_boolean ($3)) n->set_property ("force-accidental", SCM_BOOL_T); - + if (scm_is_pair ($7)) + n->set_property ("articulations", + scm_reverse_x ($7, SCM_EOL)); $$ = n->unprotect (); } - } - | DRUM_PITCH optional_notemode_duration { + } %prec ':' + | new_chord post_events { + if (!parser->lexer_->is_chord_state ()) + parser->parser_error (@1, _ ("have to be in Chord mode for chords")); + if (scm_is_pair ($2)) { + if (unsmob ($1)) + $1 = make_chord_elements (@1, + $1, + parser->default_duration_.smobbed_copy (), + SCM_EOL); + + SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL)); + + $$ = MAKE_SYNTAX (event_chord, @1, elts); + } else if (!unsmob ($1)) + $$ = MAKE_SYNTAX (event_chord, @1, $1); + // A mere pitch drops through. + } %prec ':' + ; + +simple_element: + DRUM_PITCH optional_notemode_duration { Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); n->set_property ("duration", $2); n->set_property ("drum-type", $1); @@ -3027,30 +3669,20 @@ simple_element: } ; -simple_chord_elements: - new_chord { - if (!parser->lexer_->is_chord_state ()) - parser->parser_error (@1, _ ("have to be in Chord mode for chords")); - $$ = $1; - } - | figure_spec optional_notemode_duration { - for (SCM s = $1; scm_is_pair (s); s = scm_cdr (s)) - { - unsmob_music (scm_car (s))->set_property ("duration", $2); - } - $$ = $1; - } - ; - lyric_element: full_markup { if (!parser->lexer_->is_lyric_state ()) parser->parser_error (@1, _ ("markup outside of text script or \\lyricmode")); $$ = $1; } + | SYMBOL { + if (!parser->lexer_->is_lyric_state ()) + parser->parser_error (@1, _f ("not a note name: %s", ly_scm2string ($1))); + $$ = $1; + } | STRING { if (!parser->lexer_->is_lyric_state ()) - parser->parser_error (@1, _ ("unrecognized string, not in text script or \\lyricmode")); + parser->parser_error (@1, _ ("string outside of text script or \\lyricmode")); $$ = $1; } | LYRIC_ELEMENT @@ -3058,21 +3690,25 @@ lyric_element: lyric_element_music: lyric_element optional_notemode_duration post_events { - $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2); + $$ = MAKE_SYNTAX (lyric_event, @$, $1, $2); if (scm_is_pair ($3)) - unsmob_music ($$)->set_property + unsmob ($$)->set_property ("articulations", scm_reverse_x ($3, SCM_EOL)); - } + } %prec ':' ; +// Can return a single pitch rather than a list. new_chord: - steno_tonic_pitch optional_notemode_duration { - $$ = make_chord_elements (@$, $1, $2, SCM_EOL); + steno_tonic_pitch maybe_notemode_duration { + if (SCM_UNBNDP ($2)) + $$ = $1; + else + $$ = make_chord_elements (@$, $1, $2, SCM_EOL); } | steno_tonic_pitch optional_notemode_duration chord_separator chord_items { SCM its = scm_reverse_x ($4, SCM_EOL); $$ = make_chord_elements (@$, $1, $2, scm_cons ($3, its)); - } + } %prec ':' ; chord_items: @@ -3131,10 +3767,10 @@ step_number: ; tempo_range: - UNSIGNED { + unsigned_number { $$ = $1; - } - | UNSIGNED '-' UNSIGNED { + } %prec ':' + | unsigned_number '-' unsigned_number { $$ = scm_cons ($1, $3); } ; @@ -3174,26 +3810,43 @@ number_factor: | bare_number ; +bare_number_common: + REAL + | NUMBER_IDENTIFIER + | REAL NUMBER_IDENTIFIER + { + $$ = scm_product ($1, $2); + } + ; bare_number: - bare_number_closed + bare_number_common + | UNSIGNED | UNSIGNED NUMBER_IDENTIFIER { $$ = scm_product ($1, $2); } - | REAL NUMBER_IDENTIFIER { - $$ = scm_product ($1, $2); - } - ; - -bare_number_closed: - UNSIGNED - | REAL - | NUMBER_IDENTIFIER ; unsigned_number: UNSIGNED | NUMBER_IDENTIFIER + { + if (!scm_is_integer ($1) + || scm_is_true (scm_negative_p ($1))) + { + parser->parser_error (@1, _("not an unsigned integer")); + $$ = SCM_INUM0; + } + } + | embedded_scm + { + if (!scm_is_integer ($1) + || scm_is_true (scm_negative_p ($1))) + { + parser->parser_error (@1, _("not an unsigned integer")); + $$ = SCM_INUM0; + } + } ; exclamations: @@ -3208,7 +3861,13 @@ exclamations: ; questions: - { $$ = SCM_UNDEFINED; } +// This precedence rule is rather weird. It triggers when '!' is +// encountered after a pitch, and is used for deciding whether to save +// this instead for a figure modification. This should not actually +// occur in practice as pitches and figures are generated in different +// modes. Using a greedy (%right) precedence makes sure that we don't +// get stuck in a wrong interpretation. + { $$ = SCM_UNDEFINED; } %prec ':' | questions '?' { if (SCM_UNBNDP ($1)) @@ -3227,22 +3886,35 @@ full_markup_list: } ; -full_markup: +markup_mode: MARKUP - { parser->lexer_->push_markup_state (); } - markup_top { - $$ = $3; + { + parser->lexer_->push_markup_state (); + } + ; + +full_markup: + markup_mode markup_top { + $$ = $2; + parser->lexer_->pop_state (); + } + ; + +partial_markup: + markup_mode markup_partial_function ETC + { + $$ = MAKE_SYNTAX (partial_markup, @2, $2); parser->lexer_->pop_state (); } ; markup_top: - simple_markup_list { - $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1); + markup_list { + $$ = scm_list_2 (Lily::line_markup, $1); } | markup_head_1_list simple_markup { - $$ = scm_car (MAKE_SYNTAX ("composed-markup-list", + $$ = scm_car (MAKE_SYNTAX (composed_markup_list, @2, $1, scm_list_1 ($2))); } | simple_markup { @@ -3251,7 +3923,7 @@ markup_top: ; markup_scm: - embedded_scm_bare + embedded_scm { if (Text_interface::is_markup ($1)) MYBACKUP (MARKUP_IDENTIFIER, $1, @1); @@ -3263,9 +3935,9 @@ markup_scm: } } BACKUP ; - -simple_markup_list: + +markup_list: markup_composed_list { $$ = $1; } @@ -3283,29 +3955,24 @@ markup_uncomposed_list: { $$ = $2; } - ; - -markup_list: - simple_markup_list - | markup_score - { - $$ = scm_list_1 (scm_list_2 (ly_lily_module_constant ("score-lines-markup-list"), $1)); - } - ; - -markup_score: - SCORE { - SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); - parser->lexer_->push_note_state (nn); + | SCORELINES { + parser->lexer_->push_note_state (Lily::pitchnames); } '{' score_body '}' { - $$ = $4; + Score *sc = unsmob ($4); + sc->origin ()->set_spot (@$); + if (sc->defs_.empty ()) { + Output_def *od = get_layout (parser); + sc->add_output_def (od); + od->unprotect (); + } + $$ = scm_list_1 (scm_list_2 (Lily::score_lines_markup_list, $4)); parser->lexer_->pop_state (); } ; markup_composed_list: markup_head_1_list markup_uncomposed_list { - $$ = MAKE_SYNTAX ("composed-markup-list", + $$ = MAKE_SYNTAX (composed_markup_list, @2, $1, $2); } ; @@ -3321,7 +3988,7 @@ markup_braced_list_body: | markup_braced_list_body markup { $$ = scm_cons ($2, $1); } - | markup_braced_list_body simple_markup_list { + | markup_braced_list_body markup_list { $$ = scm_reverse_x ($2, $1); } ; @@ -3336,7 +4003,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_closed { + | EXPECT_SCM markup_command_list_arguments embedded_scm { $$ = check_scheme_arg (parser, @3, $3, $2, $1); } | EXPECT_NO_MORE_ARGS { @@ -3351,6 +4018,37 @@ markup_command_list_arguments: } ; +markup_partial_function: + MARKUP_FUNCTION markup_arglist_partial + { + $$ = scm_list_1 (scm_cons ($1, scm_reverse_x ($2, SCM_EOL))); + } + | markup_head_1_list MARKUP_FUNCTION markup_arglist_partial + { + $$ = scm_cons (scm_cons ($2, scm_reverse_x ($3, SCM_EOL)), + $1); + } + ; + +markup_arglist_partial: + EXPECT_MARKUP markup_arglist_partial + { + $$ = $2; + } + | EXPECT_SCM markup_arglist_partial + { + $$= $2; + } + | EXPECT_MARKUP markup_command_list_arguments + { + $$ = $2; + } + | EXPECT_SCM markup_command_list_arguments + { + $$ = $2; + } + ; + markup_head_1_item: MARKUP_FUNCTION EXPECT_MARKUP markup_command_list_arguments { $$ = scm_cons ($1, scm_reverse_x ($3, SCM_EOL)); @@ -3370,6 +4068,22 @@ simple_markup: STRING { $$ = make_simple_markup ($1); } + | SYMBOL { + $$ = make_simple_markup ($1); + } + | SCORE { + parser->lexer_->push_note_state (Lily::pitchnames); + } '{' score_body '}' { + Score *sc = unsmob ($4); + sc->origin ()->set_spot (@$); + if (sc->defs_.empty ()) { + Output_def *od = get_layout (parser); + sc->add_output_def (od); + od->unprotect (); + } + $$ = scm_list_2 (Lily::score_markup, $4); + parser->lexer_->pop_state (); + } | MARKUP_FUNCTION markup_command_basic_arguments { $$ = scm_cons ($1, scm_reverse_x ($2, SCM_EOL)); } @@ -3377,16 +4091,12 @@ simple_markup: { $$ = $2; } - | markup_score - { - $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), $1); - } ; markup: markup_head_1_list simple_markup { - $$ = scm_car (MAKE_SYNTAX ("composed-markup-list", + $$ = scm_car (MAKE_SYNTAX (composed_markup_list, @2, $1, scm_list_1 ($2))); } | simple_markup { @@ -3405,12 +4115,19 @@ Lily_parser::set_yydebug (bool x) SCM Lily_parser::do_yyparse () { - SCM retval = SCM_UNDEFINED; - yyparse (this, &retval); - return retval; + return scm_c_with_fluid (Lily::f_parser, + self_scm (), + do_yyparse_trampoline, + static_cast (this)); } - +SCM +Lily_parser::do_yyparse_trampoline (void *parser) +{ + SCM retval = SCM_UNDEFINED; + yyparse (static_cast (parser), &retval); + return retval; +} @@ -3423,8 +4140,8 @@ otherwise, we have to import music classes into the lexer. int Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) { - if (unsmob_book (sid)) { - Book *book = unsmob_book (sid)->clone (); + if (unsmob (sid)) { + Book *book = unsmob (sid)->clone (); *destination = book->self_scm (); book->unprotect (); @@ -3432,45 +4149,44 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) } else if (scm_is_number (sid)) { *destination = sid; return NUMBER_IDENTIFIER; - } else if (unsmob_context_def (sid)) { - Context_def *def= unsmob_context_def (sid)->clone (); - - *destination = def->self_scm (); - def->unprotect (); - - return CONTEXT_DEF_IDENTIFIER; - } else if (unsmob_context_mod (sid)) { - *destination = unsmob_context_mod (sid)->smobbed_copy (); - - return CONTEXT_MOD_IDENTIFIER; - } else if (Music *mus = unsmob_music (sid)) { + } else if (unsmob (sid)) + { + *destination = unsmob (sid)->clone ()->unprotect (); + return SCM_IDENTIFIER; + } else if (unsmob (sid)) { + *destination = unsmob (sid)->smobbed_copy (); + return SCM_IDENTIFIER; + } else if (Music *mus = unsmob (sid)) { mus = mus->clone (); *destination = mus->self_scm (); bool is_event = mus->is_mus_type ("post-event"); mus->unprotect (); return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER; - } else if (unsmob_pitch (sid)) { - *destination = unsmob_pitch (sid)->smobbed_copy (); + } else if (unsmob (sid)) { + *destination = unsmob (sid)->smobbed_copy (); return PITCH_IDENTIFIER; - } else if (unsmob_duration (sid)) { - *destination = unsmob_duration (sid)->smobbed_copy (); + } else if (unsmob (sid)) { + *destination = unsmob (sid)->smobbed_copy (); return DURATION_IDENTIFIER; - } else if (unsmob_output_def (sid)) { - Output_def *p = unsmob_output_def (sid); - p = p->clone (); - - *destination = p->self_scm (); - p->unprotect (); - return OUTPUT_DEF_IDENTIFIER; + } else if (unsmob (sid)) { + *destination = unsmob (sid)->clone ()->unprotect (); + return SCM_IDENTIFIER; + } else if (unsmob (sid)) { + *destination = unsmob (sid)->clone ()->unprotect (); + return SCM_IDENTIFIER; + } else if (scm_is_pair (sid) + && scm_is_pair (scm_car (sid)) + && scm_is_true (Lily::key_p (scm_caar (sid)))) { + *destination = sid; + return LOOKUP_IDENTIFIER; } - return -1; } SCM get_next_unique_context_id () { - return scm_from_locale_string ("$uniqueContextId"); + return scm_from_ascii_string ("$uniqueContextId"); } @@ -3480,7 +4196,7 @@ get_next_unique_lyrics_context_id () static int new_context_count; char s[128]; snprintf (s, sizeof (s)-1, "uniqueContext%d", new_context_count++); - return scm_from_locale_string (s); + return scm_from_ascii_string (s); } // check_scheme_arg checks one argument with a given predicate for use @@ -3509,37 +4225,115 @@ SCM check_scheme_arg (Lily_parser *parser, Input loc, return args; } scm_set_cdr_x (scm_last_pair (args), SCM_EOL); - MAKE_SYNTAX ("argument-error", loc, scm_length (args), pred, + MAKE_SYNTAX (argument_error, loc, scm_length (args), pred, SCM_UNBNDP (disp) ? arg : disp); scm_set_cdr_x (scm_last_pair (args), SCM_BOOL_F); return args; } -SCM loc_on_music (Input loc, SCM arg) +SCM loc_on_copy (Lily_parser *parser, Input loc, SCM arg) { - if (Music *m = unsmob_music (arg)) + if (Music *m = unsmob (arg)) { m = m->clone (); - m->set_spot (loc); + m->set_spot (parser->lexer_->override_input (loc)); return m->unprotect (); } + if (Book *b = unsmob (arg)) + { + b = b->clone (); + b->origin ()->set_spot (parser->lexer_->override_input (loc)); + return b->unprotect (); + } + if (Context_def *cd = unsmob (arg)) + { + cd = cd->clone (); + cd->origin ()->set_spot (parser->lexer_->override_input (loc)); + return cd->unprotect (); + } + if (Output_def *od = unsmob (arg)) + { + od = od->clone (); + od->input_origin_ = parser->lexer_->override_input (loc); + return od->unprotect (); + } + if (Score *s = unsmob (arg)) + { + s = s->clone (); + s->origin ()->set_spot (parser->lexer_->override_input (loc)); + return s->unprotect (); + } + if (Context_mod *cm = unsmob (arg)) + { + return cm->smobbed_copy (); + } return arg; } +SCM +make_reverse_key_list (SCM keys) +{ + if (scm_is_true (Lily::key_p (keys))) + return scm_list_1 (keys); + if (scm_is_string (keys)) + return scm_list_1 (scm_string_to_symbol (keys)); + if (!ly_is_list (keys)) + return SCM_UNDEFINED; + SCM res = SCM_EOL; + for (; scm_is_pair (keys); keys = scm_cdr (keys)) + { + SCM elt = scm_car (keys); + if (scm_is_true (Lily::key_p (elt))) + res = scm_cons (elt, res); + else if (scm_is_string (elt)) + res = scm_cons (scm_string_to_symbol (elt), res); + else return SCM_UNDEFINED; + } + return res; +} + SCM try_string_variants (SCM pred, SCM str) { // a matching predicate is always ok if (scm_is_true (scm_call_1 (pred, str))) return str; - // a symbol may be interpreted as a list of symbols if it helps - if (scm_is_symbol (str)) { + // a key may be interpreted as a list of keys if it helps + if (scm_is_true (Lily::key_p (str))) { str = scm_list_1 (str); if (scm_is_true (scm_call_1 (pred, str))) return str; return SCM_UNDEFINED; } + if (!scm_is_string (str)) + return SCM_UNDEFINED; + + // Let's attempt the symbol list interpretation first. + + str = scm_string_to_symbol (str); + + SCM lst = scm_list_1 (str); + + if (scm_is_true (scm_call_1 (pred, lst))) + return lst; + + // Try the single symbol interpretation + + if (scm_is_true (scm_call_1 (pred, str))) + return str; + + return SCM_UNDEFINED; +} + +SCM +try_word_variants (SCM pred, SCM str) +{ + // str is always a string when we come here + + if (scm_is_true (scm_call_1 (pred, str))) + return str; + // If this cannot be a string representation of a symbol list, // we are through. @@ -3547,6 +4341,10 @@ try_string_variants (SCM pred, SCM str) return SCM_UNDEFINED; str = scm_string_split (str, SCM_MAKE_CHAR ('.')); + for (SCM p = str; scm_is_pair (p); p = scm_cdr (p)) + scm_set_car_x (p, scm_string_split (scm_car (p), + SCM_MAKE_CHAR (','))); + str = scm_append_x (str); for (SCM p = str; scm_is_pair (p); p = scm_cdr (p)) scm_set_car_x (p, scm_string_to_symbol (scm_car (p))); @@ -3585,7 +4383,8 @@ is_regular_identifier (SCM id, bool multiple) || (c >= 'A' && c <= 'Z') || c > 0x7f) middle = true; - else if (middle && (c == '-' || c == '_' || (multiple && c == '.'))) + else if (middle && (c == '-' || c == '_' || (multiple && + (c == '.' || c == ',')))) middle = false; else return false; @@ -3596,31 +4395,58 @@ is_regular_identifier (SCM id, bool multiple) SCM make_music_from_simple (Lily_parser *parser, Input loc, SCM simple) { - if (unsmob_music (simple)) + if (unsmob (simple)) return simple; - if (parser->lexer_->is_note_state ()) { - if (scm_is_symbol (simple)) { + + if (scm_is_symbol (simple)) + { + SCM out = SCM_UNDEFINED; + switch (parser->lexer_->scan_word (out, simple)) + { + case DRUM_PITCH: + { Music *n = MY_MAKE_MUSIC ("NoteEvent", loc); n->set_property ("duration", parser->default_duration_.smobbed_copy ()); - n->set_property ("drum-type", simple); + n->set_property ("drum-type", out); return n->unprotect (); } - if (unsmob_pitch (simple)) { + case NOTENAME_PITCH: + case TONICNAME_PITCH: + // Take the parsed pitch + simple = out; + break; + // Don't scan CHORD_MODIFIER etc. + } + } + + if (parser->lexer_->is_note_state ()) { + if (unsmob (simple)) { Music *n = MY_MAKE_MUSIC ("NoteEvent", loc); n->set_property ("duration", parser->default_duration_.smobbed_copy ()); n->set_property ("pitch", simple); return n->unprotect (); } + SCM d = simple; + if (scm_is_integer (simple)) + d = make_duration (simple); + if (unsmob (d)) { + Music *n = MY_MAKE_MUSIC ("NoteEvent", loc); + n->set_property ("duration", d); + return n->unprotect (); + } return simple; } else if (parser->lexer_->is_lyric_state ()) { if (Text_interface::is_markup (simple)) - return MAKE_SYNTAX ("lyric-event", loc, simple, + return MAKE_SYNTAX (lyric_event, loc, simple, parser->default_duration_.smobbed_copy ()); } else if (parser->lexer_->is_chord_state ()) { - if (unsmob_pitch (simple)) - return make_chord_elements (loc, simple, - parser->default_duration_.smobbed_copy (), - SCM_EOL); + if (unsmob (simple)) + return MAKE_SYNTAX + (event_chord, + loc, + make_chord_elements (loc, simple, + parser->default_duration_.smobbed_copy (), + SCM_EOL)); } return simple; } @@ -3639,23 +4465,41 @@ make_simple_markup (SCM a) return a; } -bool -is_duration (int t) +SCM +make_duration (SCM d, int dots, SCM factor) { - return t && t == 1 << intlog2 (t); + Duration k; + + if (Duration *dur = unsmob (d)) { + if (!dots && SCM_UNBNDP (factor)) + return d; + k = *dur; + if (dots) + k = Duration (k.duration_log (), k.dot_count () + dots) + .compressed (k.factor ()); + } else { + int t = scm_to_int (d); + if (t > 0 && (t & (t-1)) == 0) + k = Duration (intlog2 (t), dots); + else + return SCM_UNDEFINED; + } + + if (!SCM_UNBNDP (factor)) + k = k.compressed (ly_scm2rational (factor)); + + return k.smobbed_copy (); } SCM make_chord_step (SCM step_scm, Rational alter) { - int step = scm_to_int (step_scm); + Pitch m (0, scm_to_int (step_scm) - 1, alter); - if (step == 7) - alter += FLAT_ALTERATION; + // Notename/octave are normalized + if (m.get_notename () == 6) + m = m.transposed (Pitch (0, 0, FLAT_ALTERATION)); - while (step < 0) - step += 7; - Pitch m ((step -1) / 7, (step - 1) % 7, alter); return m.smobbed_copy (); } @@ -3663,11 +4507,10 @@ make_chord_step (SCM step_scm, Rational alter) SCM make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list) { - SCM chord_ctor = ly_lily_module_constant ("construct-chord-elements"); - SCM res = scm_call_3 (chord_ctor, pitch, dur, modification_list); + SCM res = Lily::construct_chord_elements (pitch, dur, modification_list); for (SCM s = res; scm_is_pair (s); s = scm_cdr (s)) { - unsmob_music (scm_car (s))->set_spot (loc); + unsmob (scm_car (s))->set_spot (loc); } return res; } @@ -3679,6 +4522,9 @@ yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser) lex->lexval_ = s; lex->lexloc_ = loc; + int tok = lex->pop_extra_token (); + if (tok >= 0) + return tok; lex->prepare_for_next_token (); return lex->yylex (); }