X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=c60c6ed64c1157fa00e516efdcd98b8cb9e9eb0b;hb=42cd2e57e37cbbf1fc5ccbe2bc83048761690f60;hp=71095680c53fa5db76c6f98631b30b7479a24660;hpb=958e95822083954cad00e0a598eb9f12ceba67b9;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 71095680c5..c60c6ed64c 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -41,9 +41,7 @@ do { \ if (scm_is_eq (value, SCM_UNSPECIFIED)) \ break; \ - SCM s = scm_call_2 (ly_lily_module_constant ("value->lily-string"), \ - value, \ - parser->self_scm ()); \ + SCM s = Display::value_to_lily_string (value); \ char *p = scm_to_locale_string (s); \ fputs (p, file); \ free (p); \ @@ -130,6 +128,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" @@ -139,6 +138,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) @@ -187,18 +187,30 @@ Lily_parser::parser_error (Input const *i, Lily_parser *parser, SCM *, const str 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 (), parser->lexer_->override_input (location).smobbed_copy (), ##__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 (), parser->lexer_->override_input (location).smobbed_copy (), 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 (); @@ -216,7 +228,7 @@ 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_music (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); @@ -253,6 +265,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" @@ -400,34 +413,34 @@ toplevel_expression: } | 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_2 (proc, parser->self_scm (), $1); + 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 @@ -443,11 +456,11 @@ 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_2 (proc, parser->self_scm (), $1); + scm_call_1 (proc, $1); } else if (Output_def * od = unsmob ($1)) { SCM id = SCM_EOL; @@ -497,6 +510,7 @@ embedded_scm_bare_arg: $$ = parser->lexer_->eval_scm_token ($1, @1); } | FRACTION + | partial_markup | full_markup_list | context_modification | score_block @@ -530,8 +544,8 @@ embedded_scm_arg: scm_function_call: SCM_FUNCTION function_arglist { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); + $$ = MAKE_SYNTAX (music_function, @$, + $1, $2); } ; @@ -554,7 +568,7 @@ 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 @@ -587,7 +601,7 @@ embedded_lilypond: $3 = scm_cons ($2, $3); if (unsmob ($1)) $3 = scm_cons ($1, $3); - $$ = MAKE_SYNTAX ("sequential-music", @$, $3); + $$ = MAKE_SYNTAX (sequential_music, @$, $3); } | error { parser->error_level_ = 1; @@ -678,9 +692,95 @@ identifier_init_nonumber: | 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: @@ -749,7 +849,7 @@ context_def_spec_body: } 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 (Context_mod *cm = unsmob ($2)) { for (SCM m = cm->get_mods (); scm_is_pair (m); m = scm_cdr (m)) { @@ -803,7 +903,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"); @@ -884,7 +984,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"); @@ -994,8 +1094,7 @@ score_items: } } else if (!unsmob ($$)) { if (unsmob ($2)) { - SCM scorify = ly_lily_module_constant ("scorify-music"); - $2 = scm_call_2 (scorify, $2, parser->self_scm ()); + $2 = Lily::scorify_music ($2); } if (unsmob ($2)) { @@ -1144,8 +1243,7 @@ output_def_body: { SCM proc = parser->lexer_->lookup_identifier ("output-def-music-handler"); - scm_call_3 (proc, parser->self_scm (), - $1, $2); + scm_call_2 (proc, $1, $2); } else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) parser->parser_error (@2, _("bad expression type")); $$ = $1; @@ -1171,8 +1269,7 @@ output_def_body: 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; } @@ -1183,13 +1280,13 @@ 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 steno_duration '=' tempo_range { - $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, $5); + | TEMPO text steno_duration '=' tempo_range { + $$ = MAKE_SYNTAX (tempo, @$, $2, $3, $5); } - | TEMPO scalar { - $$ = MAKE_SYNTAX ("tempo", @$, $2); + | TEMPO text { + $$ = MAKE_SYNTAX (tempo, @$, $2); } %prec ':' ; @@ -1232,7 +1329,7 @@ pitch_as_music: if (!unsmob ($$)) { parser->parser_error (@1, _ ("music expected")); - $$ = MAKE_SYNTAX ("void-music", @$); + $$ = MAKE_SYNTAX (void_music, @$); } } ; @@ -1299,29 +1396,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)); } ; @@ -1353,7 +1450,7 @@ context_modification: { 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 ($2)) $$ = $2; @@ -1397,7 +1494,7 @@ context_mod_list: ; else 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 ($2)) unsmob ($$)->add_context_mods @@ -1414,23 +1511,31 @@ context_prefix: SCM mods = SCM_EOL; if (ctxmod) mods = ctxmod->get_mods (); - $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_F); + $$ = START_MAKE_SYNTAX (context_specification, $2, $3, mods, SCM_BOOL_F); } | NEWCONTEXT symbol optional_id optional_context_mod { Context_mod *ctxmod = unsmob ($4); SCM mods = SCM_EOL; if (ctxmod) mods = ctxmod->get_mods (); - $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_T); + $$ = START_MAKE_SYNTAX (context_specification, $2, $3, mods, SCM_BOOL_T); } ; new_lyrics: - ADDLYRICS lyric_mode_music { - $$ = scm_list_1 ($2); + ADDLYRICS optional_context_mod lyric_mode_music { + Context_mod *ctxmod = unsmob ($2); + SCM mods = SCM_EOL; + if (ctxmod) + mods = ctxmod->get_mods (); + $$ = scm_acons ($3, mods, SCM_EOL); } - | new_lyrics ADDLYRICS lyric_mode_music { - $$ = scm_cons ($3, $1); + | new_lyrics ADDLYRICS optional_context_mod lyric_mode_music { + Context_mod *ctxmod = unsmob ($3); + SCM mods = SCM_EOL; + if (ctxmod) + mods = ctxmod->get_mods (); + $$ = scm_acons ($4, mods, $1); } ; @@ -1455,11 +1560,11 @@ basic_music: | repeated_music | music_bare | LYRICSTO simple_string lyric_mode_music { - $$ = MAKE_SYNTAX ("lyric-combine", @$, $2, SCM_EOL, $3); + $$ = MAKE_SYNTAX (lyric_combine, @$, $2, SCM_EOL, $3); } | LYRICSTO symbol '=' simple_string lyric_mode_music { - $$ = MAKE_SYNTAX ("lyric_combine", @$, $3, $2, $4); + $$ = MAKE_SYNTAX (lyric_combine, @$, $3, $2, $4); } ; @@ -1475,7 +1580,7 @@ contexted_basic_music: Input i; i.set_location (@1, @2); $$ = FINISH_MAKE_SYNTAX ($1, i, $2); - $$ = MAKE_SYNTAX ("add-lyrics", @$, $$, scm_reverse_x ($3, SCM_EOL)); + $$ = MAKE_SYNTAX (add_lyrics, @$, $$, scm_reverse_x ($3, SCM_EOL)); } %prec COMPOSITE | context_prefix contextable_music { @@ -1492,7 +1597,7 @@ composite_music: | contexted_basic_music | basic_music new_lyrics { - $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); + $$ = MAKE_SYNTAX (add_lyrics, @$, $1, scm_reverse_x ($2, SCM_EOL)); } %prec COMPOSITE ; @@ -1581,8 +1686,7 @@ symbol_list_rev: symbol_list_part: symbol_list_element { - SCM sym_l_p = ly_lily_module_constant ("symbol-list?"); - $$ = try_string_variants (sym_l_p, $1); + $$ = try_string_variants (Lily::symbol_list_p, $1); if (SCM_UNBNDP ($$)) { parser->parser_error (@1, _("not a symbol")); $$ = SCM_EOL; @@ -1778,7 +1882,7 @@ function_arglist_backup: $$ = scm_cons ($$, $3); else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (SCM_ARG, $4, @4); } } @@ -1789,7 +1893,7 @@ function_arglist_backup: { $$ = scm_cons ($4, $3); } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (EVENT_IDENTIFIER, $4, @4); } } @@ -1805,7 +1909,7 @@ function_arglist_backup: } else 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_music (parser, @3, $1), $3); MYBACKUP (PITCH_IDENTIFIER, $4, @4); } } @@ -1821,7 +1925,7 @@ function_arglist_backup: } else 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_music (parser, @3, $1), $3); MYBACKUP (TONICNAME_PITCH, $4, @4); } } @@ -1830,7 +1934,7 @@ function_arglist_backup: 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_music (parser, @3, $1), $3); MYBACKUP (SCM_IDENTIFIER, $4, @4); } } @@ -1844,7 +1948,7 @@ function_arglist_backup: SCM d = make_duration ($4); if (SCM_UNBNDP (d) || scm_is_false (scm_call_1 ($2, d))) { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (UNSIGNED, $4, @4); } else { MYREPARSE (@4, $2, DURATION_IDENTIFIER, d); @@ -1859,7 +1963,7 @@ function_arglist_backup: $$ = $3; MYREPARSE (@4, $2, REAL, $4); } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (REAL, $4, @4); } } @@ -1869,7 +1973,7 @@ function_arglist_backup: { $$ = scm_cons ($4, $3); } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (NUMBER_IDENTIFIER, $4, @4); } } @@ -1886,7 +1990,7 @@ 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_music (parser, @3, $1), $3); MYBACKUP (UNSIGNED, $5, @5); parser->lexer_->push_extra_token (@4, '-'); } @@ -1899,7 +2003,7 @@ function_arglist_backup: MYREPARSE (@5, $2, REAL, n); $$ = $3; } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (REAL, n, @5); } } @@ -1909,7 +2013,7 @@ function_arglist_backup: 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_music (parser, @3, $1), $3); MYBACKUP (NUMBER_IDENTIFIER, n, @5); } } @@ -1920,7 +2024,7 @@ function_arglist_backup: MYREPARSE (@4, $2, DURATION_IDENTIFIER, $4); $$ = $3; } else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (DURATION_IDENTIFIER, $4, @4); } } @@ -1935,7 +2039,7 @@ function_arglist_backup: else $$ = scm_cons (res, $3); else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (SCM_IDENTIFIER, $4, @4); } } @@ -1950,7 +2054,7 @@ function_arglist_backup: else $$ = scm_cons (res, $3); else { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); MYBACKUP (STRING, $4, @4); } } @@ -1984,7 +2088,7 @@ function_arglist: function_arglist_nonbackup | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_nonbackup DEFAULT { - $$ = scm_cons (loc_on_music (@4, $1), $3); + $$ = scm_cons (loc_on_music (parser, @4, $1), $3); } ; @@ -1992,7 +2096,57 @@ function_arglist_skip_nonbackup: function_arglist_nonbackup | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_nonbackup { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (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 + { + $$ = $2; + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup + { + $$ = $3; + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_partial + { + $$ = $3; + } + ; + +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; } ; @@ -2180,7 +2334,7 @@ function_arglist_optional: function_arglist_backup | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_backup DEFAULT { - $$ = scm_cons (loc_on_music (@4, $1), $3); + $$ = scm_cons (loc_on_music (parser, @4, $1), $3); } | function_arglist_skip_backup BACKUP ; @@ -2189,14 +2343,14 @@ function_arglist_skip_backup: function_arglist_backup | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_backup { - $$ = scm_cons (loc_on_music (@3, $1), $3); + $$ = scm_cons (loc_on_music (parser, @3, $1), $3); } ; music_function_call: MUSIC_FUNCTION function_arglist { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); + $$ = MAKE_SYNTAX (music_function, @$, + $1, $2); } ; @@ -2229,7 +2383,7 @@ mode_changed_music: mode_changing_head grouped_music_list { if (scm_is_eq ($1, ly_symbol2scm ("chords"))) { - $$ = MAKE_SYNTAX ("unrelativable-music", @$, $2); + $$ = MAKE_SYNTAX (unrelativable_music, @$, $2); } else { @@ -2242,10 +2396,10 @@ mode_changed_music: SCM mods = SCM_EOL; if (ctxmod) mods = ctxmod->get_mods (); - $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, mods, SCM_BOOL_T, $3); + $$ = MAKE_SYNTAX (context_specification, @$, $1, SCM_EOL, mods, SCM_BOOL_T, $3); if (scm_is_eq ($1, ly_symbol2scm ("ChordNames"))) { - $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$); + $$ = MAKE_SYNTAX (unrelativable_music, @$, $$); } parser->lexer_->pop_state (); } @@ -2311,7 +2465,7 @@ mode_changing_head_with_context: context_change: CHANGE symbol '=' simple_string { - $$ = MAKE_SYNTAX ("context-change", @$, $2, $4); + $$ = MAKE_SYNTAX (context_change, @$, $2, $4); } ; @@ -2496,43 +2650,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 @@ -2567,24 +2684,57 @@ simple_revert_context: ; 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 (), @$.smobbed_copy (), $1)); + $$ = MAKE_SYNTAX (property_unset, @$, + scm_car ($2), + scm_cadr ($2)); } ; string: - STRING { - $$ = $1; - } + STRING | full_markup ; -simple_string: STRING { - $$ = $1; +text: + STRING + | 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 | embedded_scm_bare { if (scm_is_string ($1)) { @@ -2604,8 +2754,7 @@ symbol: { // 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"))); @@ -2646,13 +2795,13 @@ event_chord: | CHORD_REPETITION optional_notemode_duration post_events { Input i; i.set_location (@1, @3); - $$ = MAKE_SYNTAX ("repetition-chord", i, + $$ = MAKE_SYNTAX (repetition_chord, i, $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, i, $2, scm_reverse_x ($3, SCM_EOL)); } %prec ':' | tempo_event @@ -2672,8 +2821,8 @@ note_chord_element: 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 ':' ; @@ -2681,11 +2830,11 @@ note_chord_element: 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)); + $$ = MAKE_SYNTAX (event_chord, @$, scm_reverse_x ($2, SCM_EOL)); } ; @@ -2758,8 +2907,8 @@ music_function_chord_body: event_function_event: EVENT_FUNCTION function_arglist { - $$ = MAKE_SYNTAX ("music-function", @$, - $1, $2); + $$ = MAKE_SYNTAX (music_function, @$, + $1, $2); } ; @@ -2780,7 +2929,7 @@ post_events: $$ = scm_cons (scm_car (p), $$); } } else { - m->set_spot (@2); + m->set_spot (parser->lexer_->override_input (@2)); $$ = scm_cons ($2, $$); } } @@ -3265,9 +3414,9 @@ pitch_or_music: SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL)); - $$ = MAKE_SYNTAX ("event-chord", @1, elts); + $$ = MAKE_SYNTAX (event_chord, @1, elts); } else if (!unsmob ($1)) - $$ = MAKE_SYNTAX ("event-chord", @1, $1); + $$ = MAKE_SYNTAX (event_chord, @1, $1); // A mere pitch drops through. } %prec ':' ; @@ -3311,7 +3460,7 @@ 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 ($$)->set_property ("articulations", scm_reverse_x ($3, SCM_EOL)); @@ -3507,22 +3656,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: markup_list { - $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1); + $$ = 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 { @@ -3574,14 +3736,14 @@ markup_uncomposed_list: sc->add_output_def (od); od->unprotect (); } - $$ = scm_list_1 (scm_list_2 (ly_lily_module_constant ("score-lines-markup-list"), $4)); + $$ = 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); } ; @@ -3627,6 +3789,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)); @@ -3657,7 +3850,7 @@ simple_markup: sc->add_output_def (od); od->unprotect (); } - $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), $4); + $$ = scm_list_2 (Lily::score_markup, $4); parser->lexer_->pop_state (); } | MARKUP_FUNCTION markup_command_basic_arguments { @@ -3672,7 +3865,7 @@ simple_markup: 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 { @@ -3691,12 +3884,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; +} @@ -3790,18 +3990,18 @@ 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_music (Lily_parser *parser, Input loc, SCM arg) { if (Music *m = unsmob (arg)) { m = m->clone (); - m->set_spot (loc); + m->set_spot (parser->lexer_->override_input (loc)); return m->unprotect (); } return arg; @@ -3895,12 +4095,12 @@ make_music_from_simple (Lily_parser *parser, Input loc, SCM simple) 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 (simple)) return MAKE_SYNTAX - ("event-chord", + (event_chord, loc, make_chord_elements (loc, simple, parser->default_duration_.smobbed_copy (), @@ -3936,14 +4136,12 @@ make_duration (SCM d, int dots) 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 (); } @@ -3951,8 +4149,7 @@ 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 (scm_car (s))->set_spot (loc);