X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=8a7f4675d4bf004c792284b5e22698bc76a87308;hb=refs%2Fheads%2Fdon%2Ffix_configure_ac;hp=9d209b9462cdb881cc973911f10fa4715b891823;hpb=2e77ecfa2052f244e0285ccaa5138690a3e1558c;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 9d209b9462..8a7f4675d4 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1,41 +1,71 @@ +/* -*- mode: c++; c-file-style: "linux"; indent-tabs-mode: t -*- */ /* - parser.yy -- Bison/C++ parser for LilyPond + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1997--2007 Han-Wen Nienhuys + Copyright (C) 1997--2012 Han-Wen Nienhuys Jan Nieuwenhuizen + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -%{ +/* Mode and indentation are at best a rough approximation based on TAB + * formatting (reasonable for compatibility with unspecific editor + * modes as Bison modes are hard to find) and need manual correction + * frequently. Without a reasonably dependable way of formatting a + * Bison file sensibly, there is little point in trying to fix the + * inconsistent state of indentation. + */ -#define YYDEBUG 1 -#define YYERROR_VERBOSE 1 -#define YYPARSE_PARAM my_lily_parser -#define YYLEX_PARAM my_lily_parser -#define PARSER ((Lily_parser *) my_lily_parser) +%{ -#define yyerror PARSER->parser_error +#define yyerror Lily_parser::parser_error /* We use custom location type: Input objects */ #define YYLTYPE Input +#define YYSTYPE SCM #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; \ + SCM s = scm_call_2 (ly_lily_module_constant ("value->lily-string"), \ + value, \ + parser->self_scm ()); \ + char *p = scm_to_locale_string (s); \ + fputs (p, file); \ + free (p); \ + } while (0) %} +%parse-param {Lily_parser *parser} +%parse-param {SCM *retval} +%lex-param {Lily_parser *parser} +%error-verbose +%debug + /* We use SCMs to do strings, because it saves us the trouble of -deleting them. Let's hope that a stack overflow doesnt trigger a move +deleting them. Let's hope that a stack overflow doesn't trigger a move of the parse stack onto the heap. */ -%left PREC_TOP -%left ADDLYRICS %left PREC_BOT +%nonassoc REPEAT REPEAT_IDENTIFIER +%nonassoc ALTERNATIVE -%expect 1 - -/* One shift/reduce problem +/* The above precedences tackle the shift/reduce problem 1. \repeat \repeat .. \alternative @@ -44,11 +74,30 @@ of the parse stack onto the heap. */ or - \repeat { \repeat } \alternative + \repeat { \repeat } \alternative */ +%nonassoc COMPOSITE +%left ADDLYRICS + +%right ':' UNSIGNED REAL E_UNSIGNED EVENT_IDENTIFIER EVENT_FUNCTION '^' '_' + HYPHEN EXTENDER DURATION_IDENTIFIER + + /* 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 -%pure_parser +%left PREC_TOP + + + + +%pure-parser %locations @@ -73,6 +122,7 @@ using namespace std; #include "book.hh" #include "context-def.hh" +#include "context-mod.hh" #include "dimensions.hh" #include "file-path.hh" #include "input.hh" @@ -83,31 +133,54 @@ using namespace std; #include "main.hh" #include "misc.hh" #include "music.hh" -#include "music.hh" #include "output-def.hh" #include "paper-book.hh" -#include "program-option.hh" #include "scm-hash.hh" #include "score.hh" #include "text-interface.hh" #include "warn.hh" -%} +void +Lily_parser::parser_error (Input const *i, Lily_parser *parser, SCM *, const string &s) +{ + parser->parser_error (*i, s); +} +#define MYBACKUP(Token, Value, Location) \ +do \ + if (yychar == YYEMPTY) \ + { \ + if (Token) \ + parser->lexer_->push_extra_token (Token, Value); \ + parser->lexer_->push_extra_token (BACKUP); \ + } else { \ + parser->parser_error \ + (Location, _("Too much lookahead")); \ + } \ +while (0) + + +#define MYREPARSE(Location, 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) + +%} -%union { - Book *book; - Output_def *outputdef; - SCM scm; - std::string *string; - Music *music; - Score *score; - int i; -} %{ -#define MY_MAKE_MUSIC(x, spot) make_music_with_input (ly_symbol2scm (x), spot) +#define MY_MAKE_MUSIC(x, spot) \ + make_music_with_input (ly_symbol2scm (x), \ + parser->lexer_->override_input (spot)) /* ES TODO: - Don't use lily module, create a new module instead. @@ -116,8 +189,12 @@ using namespace std; #define LOWLEVEL_MAKE_SYNTAX(proc, args) \ scm_apply_0 (proc, args) /* Syntactic Sugar. */ -#define MAKE_SYNTAX(name, location, ...) \ - LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (PARSER->self_scm (), make_input (location), __VA_ARGS__, SCM_UNDEFINED)); +#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)) +#define START_MAKE_SYNTAX(name, ...) \ + scm_list_n (ly_lily_module_constant (name) , ##__VA_ARGS__, SCM_UNDEFINED) +#define FINISH_MAKE_SYNTAX(start, location, ...) \ + LOWLEVEL_MAKE_SYNTAX (scm_car (start), scm_cons2 (parser->self_scm (), make_input (parser->lexer_->override_input (location)), scm_append_x (scm_list_2 (scm_cdr (start), scm_list_n (__VA_ARGS__, SCM_UNDEFINED))))) SCM get_next_unique_context_id (); SCM get_next_unique_lyrics_context_id (); @@ -132,17 +209,17 @@ SCM get_next_unique_lyrics_context_id (); static Music *make_music_with_input (SCM name, Input where); -SCM make_music_relative (Pitch start, SCM music, Input loc); -SCM run_music_function (Lily_parser *, SCM expr); -SCM get_first_context_id (SCM type, Music *m); -SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list); -SCM make_chord_step (int step, Rational alter); +SCM 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 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); -bool is_regular_identifier (SCM id); -bool ly_input_procedure_p (SCM x); -int yylex (YYSTYPE *s, YYLTYPE *loc, void *v); -void set_music_properties (Music *p, SCM a); +SCM make_duration (SCM t, int dots = 0); +bool is_regular_identifier (SCM id, bool multiple=false); +SCM try_string_variants (SCM pred, SCM str); +int yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser); %} @@ -151,14 +228,16 @@ void set_music_properties (Music *p, SCM a); FIXME: Bison needs to translate some of these, eg, STRING. -*/ - +*/ + /* Keyword tokens with plain escaped name. */ +%token END_OF_FILE 0 "end of input" %token ACCEPTS "\\accepts" %token ADDLYRICS "\\addlyrics" %token ALIAS "\\alias" %token ALTERNATIVE "\\alternative" %token BOOK "\\book" +%token BOOKPART "\\bookpart" %token CHANGE "\\change" %token CHORDMODE "\\chordmode" %token CHORDS "\\chords" @@ -172,26 +251,19 @@ void set_music_properties (Music *p, SCM a); %token DRUMS "\\drums" %token FIGUREMODE "\\figuremode" %token FIGURES "\\figures" -%token GROBDESCRIPTIONS "\\grobdescriptions" %token HEADER "\\header" -%token INVALID "\\invalid" -%token KEY "\\key" +%token INVALID "\\version-error" %token LAYOUT "\\layout" %token LYRICMODE "\\lyricmode" %token LYRICS "\\lyrics" %token LYRICSTO "\\lyricsto" -%token MARK "\\mark" %token MARKUP "\\markup" +%token MARKUPLIST "\\markuplist" %token MIDI "\\midi" %token NAME "\\name" %token NOTEMODE "\\notemode" -%token OBJECTID "\\objectid" -%token OCTAVE "\\octave" -%token ONCE "\\once" %token OVERRIDE "\\override" %token PAPER "\\paper" -%token PARTIAL "\\partial" -%token RELATIVE "\\relative" %token REMOVE "\\remove" %token REPEAT "\\repeat" %token REST "\\rest" @@ -200,16 +272,12 @@ void set_music_properties (Music *p, SCM a); %token SEQUENTIAL "\\sequential" %token SET "\\set" %token SIMULTANEOUS "\\simultaneous" -%token SKIP "\\skip" %token TEMPO "\\tempo" -%token TIMES "\\times" -%token TRANSPOSE "\\transpose" %token TYPE "\\type" %token UNSET "\\unset" %token WITH "\\with" /* Keyword token exceptions. */ -%token TIME_T "\\time" %token NEWCONTEXT "\\new" @@ -225,16 +293,8 @@ void set_music_properties (Music *p, SCM a); %token DOUBLE_ANGLE_OPEN "<<" %token DOUBLE_ANGLE_CLOSE ">>" %token E_BACKSLASH "\\" -%token E_ANGLE_CLOSE "\\>" -%token E_CHAR "\\C[haracter]" -%token E_CLOSE "\\)" %token E_EXCLAMATION "\\!" -%token E_BRACKET_OPEN "\\[" -%token E_OPEN "\\(" -%token E_BRACKET_CLOSE "\\]" -%token E_ANGLE_OPEN "\\<" %token E_PLUS "\\+" -%token E_TILDE "\\~" %token EXTENDER "__" /* @@ -245,187 +305,58 @@ If we give names, Bison complains. %token FIGURE_SPACE "_" %token HYPHEN "--" -%token CHORDMODIFIERS -%token LYRIC_MARKUP %token MULTI_MEASURE_REST -%token DIGIT -%token E_UNSIGNED -%token UNSIGNED +%token E_UNSIGNED +%token UNSIGNED /* Artificial tokens, for more generic function syntax */ -%token EXPECT_MARKUP; -%token EXPECT_MUSIC; -%token EXPECT_SCM; +%token EXPECT_MARKUP "markup?" +%token EXPECT_SCM "scheme?" +%token BACKUP "(backed-up?)" +%token REPARSE "(reparsed?)" +%token EXPECT_MARKUP_LIST "markup-list?" +%token EXPECT_OPTIONAL "optional?" /* After the last argument. */ -%token EXPECT_NO_MORE_ARGS; - -%token BOOK_IDENTIFIER -%token CHORDMODIFIER_PITCH -%token CHORD_MODIFIER -%token CONTEXT_DEF_IDENTIFIER -%token DRUM_PITCH -%token DURATION_IDENTIFIER -%token EVENT_IDENTIFIER -%token FRACTION -%token LYRICS_STRING -%token LYRIC_MARKUP_IDENTIFIER -%token MARKUP_HEAD_EMPTY -%token MARKUP_HEAD_LIST0 -%token MARKUP_HEAD_MARKUP0 -%token MARKUP_HEAD_MARKUP0_MARKUP1 -%token MARKUP_HEAD_SCM0 -%token MARKUP_HEAD_SCM0_MARKUP1 -%token MARKUP_HEAD_SCM0_SCM1 -%token MARKUP_HEAD_SCM0_SCM1_MARKUP2 -%token MARKUP_HEAD_SCM0_SCM1_SCM2 -%token MARKUP_IDENTIFIER -%token MUSIC_FUNCTION -%token MUSIC_IDENTIFIER -%token NOTENAME_PITCH -%token NUMBER_IDENTIFIER -%token OUTPUT_DEF_IDENTIFIER -%token REAL -%token RESTNAME -%token SCM_IDENTIFIER -%token SCM_TOKEN -%token SCORE_IDENTIFIER -%token STRING -%token STRING_IDENTIFIER -%token TONICNAME_PITCH - - -%type book_block -%type book_body - -%type bare_unsigned -%type figured_bass_alteration -%type dots -%type exclamations -%type optional_rest -%type questions -%type script_dir -%type sub_quotes -%type sup_quotes -%type tremolo_type - -/* Music */ -%type composite_music -%type grouped_music_list -%type music -%type prefix_composite_music -%type repeated_music -%type sequential_music -%type simple_music -%type simultaneous_music -%type chord_body -%type chord_body_element -%type command_element -%type command_event -%type context_change -%type direction_less_event -%type direction_reqd_event -%type event_chord -%type gen_text_def -%type music_property_def -%type note_chord_element -%type post_event -%type re_rhythmed_music -%type relative_music -%type simple_element -%type simple_music_property_def -%type string_number_event -%type tempo_event - -%type output_def_body -%type output_def_head -%type output_def_head_with_mode_switch -%type output_def -%type paper_block - -%type alternative_music -%type generic_prefix_music_scm -%type music_list -%type absolute_pitch -%type assignment_id -%type bare_number -%type unsigned_number -%type bass_figure -%type figured_bass_modification -%type br_bass_figure -%type bass_number -%type chord_body_elements -%type chord_item -%type chord_items -%type chord_separator -%type context_def_mod -%type context_def_spec_block -%type context_def_spec_body -%type context_mod -%type context_mod_list -%type context_prop_spec -%type direction_less_char -%type duration_length -%type embedded_scm -%type figure_list -%type figure_spec -%type fraction -%type full_markup -%type function_scm_argument -%type function_arglist -%type function_arglist_music_last -%type function_arglist_nonmusic_last -%type function_arglist_nonmusic -%type identifier_init -%type lilypond_header -%type lilypond_header_body -%type lyric_element -%type lyric_markup -%type markup -%type markup_braced_list -%type markup_braced_list_body -%type markup_composed_list -%type markup_head_1_item -%type markup_head_1_list -%type markup_list -%type markup_top -%type mode_changing_head -%type mode_changing_head_with_context -%type multiplied_duration -%type music_function_identifier_musicless_prefix -%type music_function_event -%type music_function_chord_body -%type new_chord -%type new_lyrics -%type number_expression -%type number_factor -%type number_term -%type object_id_setting -%type octave_check -%type optional_context_mod -%type optional_id -%type optional_notemode_duration -%type pitch -%type pitch_also_in_chords -%type post_events -%type property_operation -%type property_path property_path_revved -%type scalar -%type script_abbreviation -%type simple_chord_elements -%type simple_markup -%type simple_string -%type steno_duration -%type steno_pitch -%type steno_tonic_pitch -%type step_number -%type step_numbers -%type string - -%type score_block -%type score_body - +%token EXPECT_NO_MORE_ARGS; + +/* An artificial token for parsing embedded Lilypond */ +%token EMBEDDED_LILY "#{" + +%token BOOK_IDENTIFIER +%token CHORD_BODY_IDENTIFIER +%token CHORD_MODIFIER +%token CHORD_REPETITION +%token CONTEXT_DEF_IDENTIFIER +%token CONTEXT_MOD_IDENTIFIER +%token DRUM_PITCH +%token PITCH_IDENTIFIER +%token PITCH_ARG +%token DURATION_IDENTIFIER +%token EVENT_IDENTIFIER +%token EVENT_FUNCTION +%token FRACTION +%token LYRIC_ELEMENT +%token MARKUP_FUNCTION +%token MARKUP_LIST_FUNCTION +%token MARKUP_IDENTIFIER +%token MARKUPLIST_IDENTIFIER +%token MUSIC_FUNCTION +%token MUSIC_IDENTIFIER +%token NOTENAME_PITCH +%token NUMBER_IDENTIFIER +%token OUTPUT_DEF_IDENTIFIER +%token REAL +%token REPEAT_IDENTIFIER +%token RESTNAME +%token SCM_ARG +%token SCM_FUNCTION +%token SCM_IDENTIFIER +%token SCM_TOKEN +%token STRING +%token SYMBOL_LIST +%token TONICNAME_PITCH %left '-' '+' @@ -436,85 +367,205 @@ prec levels in different prods */ %% -lilypond: /* empty */ +start_symbol: + lilypond + | EMBEDDED_LILY { + SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); + parser->lexer_->push_note_state (nn); + } embedded_lilypond { + parser->lexer_->pop_state (); + *retval = $3; + } + ; + +lilypond: /* empty */ { $$ = SCM_UNSPECIFIED; } | lilypond toplevel_expression { } | lilypond assignment { } | lilypond error { - PARSER->error_level_ = 1; + parser->error_level_ = 1; } | lilypond INVALID { - PARSER->error_level_ = 1; + parser->error_level_ = 1; } ; -object_id_setting: - OBJECTID STRING { $$ = $2; } - ; - toplevel_expression: - lilypond_header { - PARSER->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1); + { + parser->lexer_->add_scope (get_header (parser)); + } lilypond_header { + parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $2); } | book_block { - Book *book = $1; - SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-book-handler"); - scm_call_2 (proc, PARSER->self_scm (), book->self_scm ()); - book->unprotect (); + SCM proc = parser->lexer_->lookup_identifier ("toplevel-book-handler"); + scm_call_2 (proc, parser->self_scm (), $1); + } + | bookpart_block { + SCM proc = parser->lexer_->lookup_identifier ("toplevel-bookpart-handler"); + scm_call_2 (proc, parser->self_scm (), $1); + } + | BOOK_IDENTIFIER { + SCM proc = parser->lexer_->lookup_identifier + (unsmob_book($1)->paper_ + ? "toplevel-book-handler" + : "toplevel-bookpart-handler"); + scm_call_2 (proc, parser->self_scm (), $1); } | score_block { - Score *score = $1; - - SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-score-handler"); - scm_call_2 (proc, PARSER->self_scm (), score->self_scm ()); - score->unprotect (); + SCM proc = parser->lexer_->lookup_identifier ("toplevel-score-handler"); + scm_call_2 (proc, parser->self_scm (), $1); } | composite_music { - Music *music = unsmob_music ($1); - SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-music-handler"); - scm_call_2 (proc, PARSER->self_scm (), music->self_scm ()); + SCM proc = parser->lexer_->lookup_identifier ("toplevel-music-handler"); + scm_call_2 (proc, parser->self_scm (), $1); } | full_markup { - SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-text-handler"); - scm_call_2 (proc, PARSER->self_scm (), $1); + SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler"); + scm_call_2 (proc, parser->self_scm (), 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_TOKEN { + // Evaluate and ignore #xxx, as opposed to \xxx + parser->lexer_->eval_scm_token ($1, @1); + } + | embedded_scm_active + { + SCM out = SCM_UNDEFINED; + if (Text_interface::is_markup ($1)) + out = scm_list_1 ($1); + else if (Text_interface::is_markup_list ($1)) + out = $1; + if (scm_is_pair (out)) + { + SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler"); + scm_call_2 (proc, parser->self_scm (), out); + } else if (unsmob_score ($1)) + { + SCM proc = parser->lexer_->lookup_identifier ("toplevel-score-handler"); + scm_call_2 (proc, parser->self_scm (), $1); + } else if (!scm_is_eq ($1, SCM_UNSPECIFIED)) + parser->parser_error (@1, _("bad expression type")); } | output_def { SCM id = SCM_EOL; - Output_def * od = $1; + Output_def * od = unsmob_output_def ($1); - if ($1->c_variable ("is-paper") == SCM_BOOL_T) + if (od->c_variable ("is-paper") == SCM_BOOL_T) id = ly_symbol2scm ("$defaultpaper"); - else if ($1->c_variable ("is-midi") == SCM_BOOL_T) + else if (od->c_variable ("is-midi") == SCM_BOOL_T) id = ly_symbol2scm ("$defaultmidi"); - else if ($1->c_variable ("is-layout") == SCM_BOOL_T) + else if (od->c_variable ("is-layout") == SCM_BOOL_T) id = ly_symbol2scm ("$defaultlayout"); - PARSER->lexer_->set_identifier (id, od->self_scm ()); - od->unprotect(); + parser->lexer_->set_identifier (id, $1); } ; -embedded_scm: +embedded_scm_bare: SCM_TOKEN + { + $$ = parser->lexer_->eval_scm_token ($1, @1); + } | SCM_IDENTIFIER ; +embedded_scm_active: + SCM_IDENTIFIER + | scm_function_call + ; -lilypond_header_body: +embedded_scm_bare_arg: + SCM_ARG + | SCM_TOKEN + { + $$ = parser->lexer_->eval_scm_token ($1, @1); + } + | FRACTION + | full_markup_list + | context_modification + | score_block + | context_def_spec_block + | book_block + | bookpart_block + | output_def + ; + +/* The generic version may end in music, or not */ + +embedded_scm: + embedded_scm_bare + | scm_function_call + ; + +/* 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_assign + ; + +scm_function_call: + SCM_FUNCTION function_arglist { + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $2); + } + ; + +embedded_lilypond: + /* empty */ { - $$ = get_header (PARSER); - PARSER->lexer_->add_scope ($$); + // FIXME: @$ does not contain a useful source location + // 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", @$); + } + | identifier_init + | music_embedded music_embedded music_list { + $3 = scm_reverse_x ($3, SCM_EOL); + if (unsmob_music ($2)) + $3 = scm_cons ($2, $3); + if (unsmob_music ($1)) + $3 = scm_cons ($1, $3); + $$ = MAKE_SYNTAX ("sequential-music", @$, $3); + } + | error { + parser->error_level_ = 1; + $$ = SCM_UNSPECIFIED; + } + | INVALID embedded_lilypond { + parser->error_level_ = 1; + $$ = $2; } + ; + + +lilypond_header_body: + /* empty */ { $$ = SCM_UNSPECIFIED; } | lilypond_header_body assignment { - + + } + | lilypond_header_body embedded_scm { + } ; lilypond_header: HEADER '{' lilypond_header_body '}' { - $$ = PARSER->lexer_->remove_scope (); + $$ = parser->lexer_->remove_scope (); } ; @@ -523,102 +574,126 @@ lilypond_header: */ assignment_id: STRING { $$ = $1; } - | LYRICS_STRING { $$ = $1; } ; assignment: assignment_id '=' identifier_init { - PARSER->lexer_->set_identifier ($1, $3); - -/* - TODO: devise standard for protection in parser. - - The parser stack lives on the C-stack, which means that -all objects can be unprotected as soon as they're here. - -*/ + 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); + $$ = 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; } - | embedded_scm { } ; identifier_init: - score_block { - $$ = $1->self_scm (); - $1->unprotect (); - } - | book_block { - $$ = $1->self_scm (); - $1->unprotect (); - } - | output_def { - $$ = $1->self_scm (); - $1->unprotect (); - } - | context_def_spec_block { - $$ = $1; - } - | music { - /* Hack: Create event-chord around standalone events. - Prevents the identifier from being interpreted as a post-event. */ - Music *mus = unsmob_music ($1); - bool is_event = mus && - (scm_memq (ly_symbol2scm ("event"), mus->get_property ("types")) - != SCM_BOOL_F); - if (!is_event) - $$ = $1; + score_block + | book_block + | bookpart_block + | output_def + | context_def_spec_block + | music_assign + | post_event_nofinger post_events + { + $$ = scm_reverse_x ($2, SCM_EOL); + if (Music *m = unsmob_music ($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 - $$ = MAKE_SYNTAX ("event-chord", @$, scm_list_1 ($1)); - } - | post_event { - $$ = $1; - } - | number_expression { - $$ = $1; - } - | string { - $$ = $1; - } - | embedded_scm { - $$ = $1; - } - | full_markup { - $$ = $1; - } - | DIGIT { - $$ = scm_from_int ($1); + { + Music * m = MY_MAKE_MUSIC ("PostEvents", @$); + m->set_property ("elements", $$); + $$ = m->unprotect (); + } } + | number_expression + | FRACTION + | string + | embedded_scm + | full_markup_list + | context_modification ; context_def_spec_block: CONTEXT '{' context_def_spec_body '}' { $$ = $3; + unsmob_context_def ($$)->origin ()->set_spot (@$); + } + ; + +context_mod_arg: + embedded_scm + | + { + SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); + parser->lexer_->push_note_state (nn); + } + composite_music + { + parser->lexer_->pop_state (); + $$ = $2; + } + ; + +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 (); - unsmob_context_def ($$)->origin ()->set_spot (@$); } | CONTEXT_DEF_IDENTIFIER { $$ = $1; - unsmob_context_def ($$)->origin ()->set_spot (@$); - } - | context_def_spec_body GROBDESCRIPTIONS embedded_scm { - Context_def*td = unsmob_context_def ($$); - - for (SCM p = $3; scm_is_pair (p); p = scm_cdr (p)) { - SCM tag = scm_caar (p); - - /* TODO: should make new tag "grob-definition" ? */ - td->add_context_mod (scm_list_3 (ly_symbol2scm ("assign"), - tag, scm_cons (scm_cdar (p), SCM_EOL))); - } } | context_def_spec_body context_mod { - unsmob_context_def ($$)->add_context_mod ($2); + if (!SCM_UNBNDP ($2)) + unsmob_context_def ($$)->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 (); + 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)); + } } ; @@ -627,6 +702,9 @@ context_def_spec_body: book_block: BOOK '{' book_body '}' { $$ = $3; + unsmob_book ($$)->origin ()->set_spot (@$); + pop_paper (parser); + parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), SCM_BOOL_F); } ; @@ -635,90 +713,235 @@ book_block: * grok \layout and \midi? */ book_body: { - $$ = new Book; - $$->origin ()->set_spot (@$); - $$->paper_ = dynamic_cast (unsmob_output_def (PARSER->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); - $$->paper_->unprotect (); - $$->header_ = PARSER->lexer_->lookup_identifier ("$defaultheader"); + Book *book = new Book; + init_papers (parser); + book->paper_ = dynamic_cast (unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); + book->paper_->unprotect (); + push_paper (parser, book->paper_); + book->header_ = get_header (parser); + $$ = book->unprotect (); + parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $$); } | BOOK_IDENTIFIER { - $$ = unsmob_book ($1); - $$->protect (); - $$->origin ()->set_spot (@$); + parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $1); } | book_body paper_block { - $$->paper_ = $2; - $2->unprotect (); + unsmob_book ($1)->paper_ = unsmob_output_def ($2); + set_paper (parser, unsmob_output_def ($2)); + } + | book_body bookpart_block { + SCM proc = parser->lexer_->lookup_identifier ("book-bookpart-handler"); + scm_call_2 (proc, $1, $2); } | book_body score_block { - Score *score = $2; - SCM proc = PARSER->lexer_->lookup_identifier ("book-score-handler"); - scm_call_2 (proc, $$->self_scm (), score->self_scm ()); - score->unprotect (); + SCM proc = parser->lexer_->lookup_identifier ("book-score-handler"); + scm_call_2 (proc, $1, $2); } | book_body composite_music { - Music *music = unsmob_music ($2); - SCM proc = PARSER->lexer_->lookup_identifier ("book-music-handler"); - scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ()); + SCM proc = parser->lexer_->lookup_identifier ("book-music-handler"); + scm_call_3 (proc, parser->self_scm (), $1, $2); } | book_body full_markup { - SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler"); - scm_call_2 (proc, $$->self_scm (), $2); + SCM proc = parser->lexer_->lookup_identifier ("book-text-handler"); + scm_call_2 (proc, $1, scm_list_1 ($2)); } - | book_body lilypond_header { - $$->header_ = $2; + | book_body full_markup_list { + SCM proc = parser->lexer_->lookup_identifier ("book-text-handler"); + scm_call_2 (proc, $1, $2); + } + | book_body SCM_TOKEN { + // Evaluate and ignore #xxx, as opposed to \xxx + parser->lexer_->eval_scm_token ($2, @2); + } + | book_body embedded_scm_active + { + SCM out = SCM_UNDEFINED; + if (Text_interface::is_markup ($2)) + out = scm_list_1 ($2); + else if (Text_interface::is_markup_list ($2)) + out = $2; + if (scm_is_pair (out)) + { + SCM proc = parser->lexer_->lookup_identifier ("book-text-handler"); + scm_call_2 (proc, $1, out); + } else if (unsmob_score ($2)) + { + SCM proc = parser->lexer_->lookup_identifier ("book-score-handler"); + scm_call_2 (proc, $1, $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_); + } lilypond_header | book_body error { - $$->paper_ = 0; - $$->scores_ = SCM_EOL; + Book *book = unsmob_book ($1); + book->paper_ = 0; + book->scores_ = SCM_EOL; + book->bookparts_ = SCM_EOL; + } + ; + +bookpart_block: + BOOKPART '{' bookpart_body '}' { + $$ = $3; + unsmob_book ($$)->origin ()->set_spot (@$); + parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), SCM_BOOL_F); + } + ; + +bookpart_body: + { + Book *book = new Book; + $$ = book->unprotect (); + parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $$); + } + | BOOK_IDENTIFIER { + parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $1); + } + | bookpart_body paper_block { + unsmob_book ($$)->paper_ = unsmob_output_def ($2); + } + | bookpart_body score_block { + SCM proc = parser->lexer_->lookup_identifier ("bookpart-score-handler"); + scm_call_2 (proc, $1, $2); + } + | bookpart_body composite_music { + SCM proc = parser->lexer_->lookup_identifier ("bookpart-music-handler"); + scm_call_3 (proc, parser->self_scm (), $1, $2); + } + | bookpart_body full_markup { + SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler"); + scm_call_2 (proc, $1, scm_list_1 ($2)); } - | book_body object_id_setting { - $$->user_key_ = ly_scm2string ($2); + | bookpart_body full_markup_list { + SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler"); + scm_call_2 (proc, $1, $2); + } + | bookpart_body SCM_TOKEN { + // Evaluate and ignore #xxx, as opposed to \xxx + parser->lexer_->eval_scm_token ($2, @2); + } + | bookpart_body embedded_scm_active + { + SCM out = SCM_UNDEFINED; + if (Text_interface::is_markup ($2)) + out = scm_list_1 ($2); + else if (Text_interface::is_markup_list ($2)) + out = $2; + if (scm_is_pair (out)) + { + SCM proc = parser->lexer_->lookup_identifier ("bookpart-text-handler"); + scm_call_2 (proc, $1, out); + } else if (unsmob_score ($2)) + { + SCM proc = parser->lexer_->lookup_identifier ("bookpart-score-handler"); + scm_call_2 (proc, $1, $2); + } else if (!scm_is_eq ($2, SCM_UNSPECIFIED)) + parser->parser_error (@2, _("bad expression type")); + } + | bookpart_body + { + Book *book = unsmob_book ($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->paper_ = 0; + book->scores_ = SCM_EOL; } ; score_block: SCORE '{' score_body '}' { + unsmob_score ($3)->origin ()->set_spot (@$); $$ = $3; } ; +score_headers: + /* empty */ + { + $$ = SCM_EOL; + } + | score_headers + { + 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; + } + | score_headers 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")); + + } + else + { + if (scm_is_pair ($1) && ly_is_module (scm_car ($1))) + scm_set_cdr_x ($1, scm_cons ($2, scm_cdr ($1))); + else + $$ = scm_cons ($2, $1); + } + } + ; + + + score_body: - music { - SCM m = $1; + score_headers music { SCM scorify = ly_lily_module_constant ("scorify-music"); - SCM score = scm_call_2 (scorify, m, PARSER->self_scm ()); + $$ = scm_call_2 (scorify, $2, parser->self_scm ()); - // pass ownernship to C++ again. - $$ = unsmob_score (score); - $$->protect (); - $$->origin ()->set_spot (@$); - } - | SCORE_IDENTIFIER { - $$ = unsmob_score ($1); - $$->protect (); - $$->origin ()->set_spot (@$); - } - | score_body object_id_setting { - $$->user_key_ = ly_scm2string ($2); + if (scm_is_pair ($1) && ly_is_module (scm_car ($1))) + { + unsmob_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)) + { + unsmob_score ($$)-> + add_output_def (unsmob_output_def (scm_car (p))); + } } - | score_body lilypond_header { - $$->header_ = $2; + | embedded_scm_active { + if (!unsmob_score ($1)) + { + $$ = (new Score)->unprotect (); + parser->parser_error (@1, _("score expected")); + } } + | 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 { - if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T) + 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")); - + parser->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead")); + } else { - $$->add_output_def ($2); + unsmob_score ($1)->add_output_def (od); } - $2->unprotect (); } | score_body error { - $$->error_found_ = true; + unsmob_score ($$)->error_found_ = true; } ; @@ -729,12 +952,12 @@ score_body: paper_block: output_def { - $$ = $1; - if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T) + Output_def *od = unsmob_output_def ($1); + + if (od->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T) { - PARSER->parser_error (@1, _ ("need \\paper for paper block")); - $1->unprotect (); - $$ = get_paper (PARSER); + parser->parser_error (@1, _ ("need \\paper for paper block")); + $$ = get_paper (parser)->unprotect (); } } ; @@ -744,57 +967,82 @@ output_def: output_def_body '}' { $$ = $1; - PARSER->lexer_->remove_scope (); - PARSER->lexer_->pop_state (); + parser->lexer_->remove_scope (); + parser->lexer_->pop_state (); } ; output_def_head: PAPER { - $$ = get_paper (PARSER); - $$->input_origin_ = @$; - PARSER->lexer_->add_scope ($$->scope_); + Output_def *p = get_paper (parser); + p->input_origin_ = @$; + parser->lexer_->add_scope (p->scope_); + $$ = p->unprotect (); } | MIDI { - Output_def *p = get_midi (PARSER); - $$ = p; - PARSER->lexer_->add_scope (p->scope_); + Output_def *p = get_midi (parser); + $$ = p->unprotect (); + parser->lexer_->add_scope (p->scope_); } | LAYOUT { - Output_def *p = get_layout (PARSER); + Output_def *p = get_layout (parser); - PARSER->lexer_->add_scope (p->scope_); - $$ = p; + parser->lexer_->add_scope (p->scope_); + $$ = p->unprotect (); } ; output_def_head_with_mode_switch: output_def_head { - PARSER->lexer_->push_initial_state (); + parser->lexer_->push_initial_state (); $$ = $1; } ; +// We need this weird nonterminal because both music as well as a +// context definition can start with \context and the difference is +// only apparent after looking at the next token. If it is '{', there +// is still time to escape from notes mode. + +music_or_context_def: + music_arg + | context_def_spec_block + ; + output_def_body: output_def_head_with_mode_switch '{' { $$ = $1; - $$->input_origin_.set_spot (@$); + unsmob_output_def ($$)->input_origin_.set_spot (@$); } | output_def_head_with_mode_switch '{' OUTPUT_DEF_IDENTIFIER { - $1->unprotect (); - Output_def *o = unsmob_output_def ($3); o->input_origin_.set_spot (@$); - $$ = o; - $$->protect (); - PARSER->lexer_->remove_scope (); - PARSER->lexer_->add_scope (o->scope_); + $$ = o->self_scm (); + parser->lexer_->remove_scope (); + parser->lexer_->add_scope (o->scope_); } | output_def_body assignment { } - | output_def_body context_def_spec_block { - assign_context_def ($$, $2); + | output_def_body embedded_scm { + + } + | output_def_body + { + SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); + parser->lexer_->push_note_state (nn); + } music_or_context_def + { + parser->lexer_->pop_state (); + if (unsmob_context_def ($3)) + assign_context_def (unsmob_output_def ($1), $3); + else { + + SCM proc = parser->lexer_->lookup_identifier + ("output-def-music-handler"); + scm_call_3 (proc, parser->self_scm (), + $1, $3); + } } | output_def_body error { @@ -802,118 +1050,237 @@ output_def_body: ; tempo_event: - TEMPO steno_duration '=' bare_unsigned { - $$ = MAKE_SYNTAX ("tempo", @$, $2, scm_int2num ($4)); - } + TEMPO steno_duration '=' tempo_range { + $$ = MAKE_SYNTAX ("tempo", @$, SCM_EOL, $2, $4); + } + | TEMPO scalar steno_duration '=' tempo_range { + $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, $5); + } + | TEMPO scalar { + $$ = MAKE_SYNTAX ("tempo", @$, $2); + } %prec ':' ; /* -The representation of a list is the - - (LIST . LAST-CONS) - - to have efficient append. */ +The representation of a list is reversed to have efficient append. */ music_list: /* empty */ { - $$ = scm_cons (SCM_EOL, SCM_EOL); - } - | music_list music { - SCM s = $$; - SCM c = scm_cons ($2, SCM_EOL); - - if (scm_is_pair (scm_cdr (s))) - scm_set_cdr_x (scm_cdr (s), c); /* append */ - else - scm_set_car_x (s, c); /* set first cons */ - scm_set_cdr_x (s, c); /* remember last cell */ + $$ = SCM_EOL; } - | music_list embedded_scm { - + | music_list music_embedded { + if (unsmob_music ($2)) + $$ = scm_cons ($2, $1); } | music_list error { Music *m = MY_MAKE_MUSIC("Music", @$); - // ugh. code dup + // ugh. code dup m->set_property ("error-found", SCM_BOOL_T); - SCM s = $$; - SCM c = scm_cons (m->self_scm (), SCM_EOL); + $$ = scm_cons (m->self_scm (), $1); m->unprotect (); /* UGH */ + } + ; - if (scm_is_pair (scm_cdr (s))) - scm_set_cdr_x (scm_cdr (s), c); /* append */ - else - scm_set_car_x (s, c); /* set first cons */ - scm_set_cdr_x (s, c); /* remember last cell */ +braced_music_list: + '{' music_list '}' + { + $$ = scm_reverse_x ($2, SCM_EOL); } ; -music: - simple_music - | composite_music +music: music_arg + | lyric_element_music ; -alternative_music: - /* empty */ { - $$ = SCM_EOL; +music_embedded: + music + { + if (unsmob_music ($1)->is_mus_type ("post-event")) { + parser->parser_error (@1, _ ("unexpected post-event")); + $$ = SCM_UNSPECIFIED; + } } - | ALTERNATIVE '{' music_list '}' { - $$ = scm_car ($3); + | music_embedded_backup + { + $$ = $1; } - ; - - -repeated_music: - REPEAT simple_string unsigned_number music alternative_music + | music_embedded_backup BACKUP lyric_element_music { - $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $5); + $$ = $3; } ; -sequential_music: - SEQUENTIAL '{' music_list '}' { - $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($3)); - } - | '{' music_list '}' { - $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($2)); +music_embedded_backup: + embedded_scm + { + if (scm_is_eq ($1, SCM_UNSPECIFIED)) + $$ = $1; + else if (Music *m = unsmob_music ($1)) { + if (m->is_mus_type ("post-event")) { + parser->parser_error + (@1, _ ("unexpected post-event")); + $$ = SCM_UNSPECIFIED; + } else + $$ = $1; + } else if (parser->lexer_->is_lyric_state () + && Text_interface::is_markup ($1)) + MYBACKUP (LYRIC_ELEMENT, $1, @1); + else { + @$.warning (_ ("Ignoring non-music expression")); + $$ = $1; + } } ; -simultaneous_music: - SIMULTANEOUS '{' music_list '}'{ - $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($3)); - } - | DOUBLE_ANGLE_OPEN music_list DOUBLE_ANGLE_CLOSE { - $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($2)); +music_arg: + simple_music + { + $$ = make_music_from_simple (parser, @1, $1); + if (!unsmob_music ($$)) + { + parser->parser_error (@1, _ ("music expected")); + $$ = MAKE_SYNTAX ("void-music", @$); + } } + | composite_music %prec COMPOSITE ; -simple_music: - event_chord - | MUSIC_IDENTIFIER - | music_property_def - | context_change +music_assign: + simple_music + | composite_music %prec COMPOSITE ; -optional_context_mod: - /**/ { $$ = SCM_EOL; } - | WITH { PARSER->lexer_->push_initial_state (); } - '{' context_mod_list '}' +repeated_music: + REPEAT simple_string unsigned_number music + { + $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, SCM_EOL); + } + | REPEAT_IDENTIFIER music + { + $$ = MAKE_SYNTAX ("repeat", @$, scm_car ($1), scm_cdr ($1), + $2, SCM_EOL); + } + | REPEAT simple_string unsigned_number music ALTERNATIVE braced_music_list + { + $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $6); + } + | REPEAT_IDENTIFIER music ALTERNATIVE braced_music_list { - PARSER->lexer_->pop_state (); - $$ = $4; + $$ = MAKE_SYNTAX ("repeat", @$, scm_car ($1), scm_cdr ($1), + $2, $4); } ; -context_mod_list: - /* */ { $$ = SCM_EOL; } - | context_mod_list context_mod { - $$ = scm_cons ($2, $1); +sequential_music: + SEQUENTIAL braced_music_list { + $$ = MAKE_SYNTAX ("sequential-music", @$, $2); + } + | braced_music_list { + $$ = MAKE_SYNTAX ("sequential-music", @$, $1); } ; +simultaneous_music: + SIMULTANEOUS braced_music_list { + $$ = MAKE_SYNTAX ("simultaneous-music", @$, $2); + } + | DOUBLE_ANGLE_OPEN music_list DOUBLE_ANGLE_CLOSE { + $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_reverse_x ($2, SCM_EOL)); + } + ; + +simple_music: + event_chord + | music_property_def + | context_change + ; + +context_modification: + WITH + { + SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); + parser->lexer_->push_note_state (nn); + } '{' 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)) { + SCM proc = parser->lexer_->lookup_identifier ("context-mod-music-handler"); + $2 = scm_call_2 (proc, parser->self_scm (), $2); + } + if (unsmob_context_mod ($2)) + $$ = $2; + else { + parser->parser_error (@2, _ ("not a context mod")); + $$ = Context_mod ().smobbed_copy (); + } + } + ; + +context_modification_arg: + embedded_scm_closed + | MUSIC_IDENTIFIER + ; + +optional_context_mod: + /**/ { + $$ = SCM_EOL; + } + | context_modification + { + $$ = $1; + } + ; + +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 ()); + } + | context_mod_list context_mod_embedded { + unsmob_context_mod ($1)->add_context_mods + (unsmob_context_mod ($2)->get_mods ()); + } + ; + composite_music: - prefix_composite_music { $$ = $1; } - | grouped_music_list { $$ = $1; } + complex_music + | music_bare + ; + +/* Music that can be parsed without lookahead */ +closed_music: + music_bare + | complex_music_prefix closed_music + { + $$ = FINISH_MAKE_SYNTAX ($1, @$, $2); + } + | music_function_call_closed + ; + +music_bare: + mode_changed_music + | MUSIC_IDENTIFIER + | grouped_music_list ; grouped_music_list: @@ -921,53 +1288,786 @@ grouped_music_list: | sequential_music { $$ = $1; } ; -function_scm_argument: - embedded_scm - | simple_string +/* 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 + * + * 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. + * + * 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. + * + * 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. + * + * Many of the basic nonterminals used for argument list scanning come + * in a "normal" and a "closed" flavor. A closed expression is one + * that can be parsed without a lookahead token. That makes it + * feasible for an optional argument that may need to be skipped: + * skipping can only be accomplished by pushing back the token into + * the lexer, and that only works when there is no lookahead token. + * + * 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_nonbackup_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_nonbackup '-' UNSIGNED + { + SCM n = scm_difference ($5, SCM_UNDEFINED); + if (scm_is_true (scm_call_1 ($2, n))) + $$ = scm_cons (n, $3); + else { + Music *t = MY_MAKE_MUSIC ("FingeringEvent", @5); + t->set_property ("digit", $5); + $$ = check_scheme_arg (parser, @4, t->unprotect (), + $3, $2, n); + } + + } + | 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_nonbackup '-' NUMBER_IDENTIFIER + { + $$ = check_scheme_arg (parser, @4, + scm_difference ($5, SCM_UNDEFINED), + $3, $2); + } + ; + +function_arglist_closed_nonbackup: + function_arglist_nonbackup_common + | function_arglist_closed_common + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup embedded_scm_arg_closed + { + $$ = check_scheme_arg (parser, @4, $4, $3, $2); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup bare_number_closed + { + $$ = check_scheme_arg (parser, @4, $4, $3, $2); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup SCM_IDENTIFIER + { + $$ = check_scheme_arg (parser, @4, + try_string_variants ($2, $4), + $3, $2, $4); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup STRING + { + $$ = check_scheme_arg (parser, @4, + try_string_variants ($2, $4), + $3, $2, $4); + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup full_markup + { + $$ = 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 + { + $$ = scm_append_x (scm_list_2 ($3, $1)); + } + ; + +// symbol_list_part delivers elements in reverse copy. + +symbol_list_part: + symbol_list_element + { + 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 ($$); + } + ; + + +symbol_list_element: + STRING + | embedded_scm_bare + ; + + +function_arglist_nonbackup: + function_arglist_nonbackup_common + | function_arglist_common + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup embedded_scm_arg + { + 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_nonbackup bare_number_common + { + $$ = check_scheme_arg (parser, @4, $4, $3, $2); + } + | function_arglist_nonbackup_reparse REPARSE duration_length + { + $$ = check_scheme_arg (parser, @3, $3, $1, $2); + } + | function_arglist_nonbackup_reparse REPARSE bare_number_common + { + $$ = check_scheme_arg (parser, @3, $3, $1, $2); + } + | function_arglist_nonbackup_reparse REPARSE SCM_ARG + { + $$ = check_scheme_arg (parser, @3, $3, $1, $2); + } + | function_arglist_nonbackup_reparse REPARSE lyric_element_music + { + $$ = check_scheme_arg (parser, @3, $3, $1, $2); + } + | function_arglist_nonbackup_reparse REPARSE symbol_list_arg + { + $$ = check_scheme_arg (parser, @3, $3, $1, $2); + } + ; + +function_arglist_nonbackup_reparse: + EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup SCM_IDENTIFIER + { + $$ = $3; + SCM res = try_string_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 STRING + { + $$ = $3; + SCM res = try_string_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))) + MYREPARSE (@4, $2, SCM_ARG, $4); + 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 UNSIGNED + { + $$ = $3; + if (scm_is_true (scm_call_1 ($2, $4))) + MYREPARSE (@4, $2, REAL, $4); + else { + SCM d = make_duration ($4); + if (SCM_UNBNDP (d) || scm_is_false (scm_call_1 ($2, d))) + MYREPARSE (@4, $2, REAL, $4); // trigger error + else + MYREPARSE (@4, $2, DURATION_IDENTIFIER, d); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_nonbackup DURATION_IDENTIFIER { + $$ = $3; + MYREPARSE (@4, $2, DURATION_IDENTIFIER, $4); + } ; -/* An argument list. If a function \foo expects scm scm music, then the lexer expands \foo into the token sequence: - MUSIC_FUNCTION EXPECT_MUSIC EXPECT_SCM EXPECT_SCM -and this rule returns the reversed list of arguments. */ -function_arglist_music_last: - EXPECT_MUSIC function_arglist music { - $$ = scm_cons ($3, $2); +// function_arglist_backup can't occur at the end of an argument +// list. It needs to be careful about avoiding lookahead only until +// it has made a decision whether or not to accept the parsed entity. +// At that point of time, music requiring lookahead to parse becomes +// fine. +function_arglist_backup: + function_arglist_common + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup embedded_scm_arg_closed + { + if (scm_is_true (scm_call_1 ($2, $4))) + { + $$ = scm_cons ($4, $3); + } else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (SCM_ARG, $4, @4); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup REPEAT simple_string unsigned_number + { + $4 = MAKE_SYNTAX ("repeat", @4, $5, $6, + MY_MAKE_MUSIC ("Music", @4)->unprotect (), + SCM_EOL); + if (scm_is_true (scm_call_1 ($2, $4))) + { + $$ = $3; + MYREPARSE (@4, $2, REPEAT_IDENTIFIER, scm_cons ($5, $6)); + } else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (REPEAT_IDENTIFIER, scm_cons ($5, $6), @4); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup chord_body + { + if (scm_is_true (scm_call_1 ($2, $4))) + { + $$ = $3; + MYREPARSE (@4, $2, CHORD_BODY_IDENTIFIER, $4); + } else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (CHORD_BODY_IDENTIFIER, $4, @4); + } + } + | 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); + MYBACKUP (EVENT_IDENTIFIER, $4, @4); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup full_markup + { + 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); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup UNSIGNED + { + if (scm_is_true (scm_call_1 ($2, $4))) + { + MYREPARSE (@4, $2, REAL, $4); + $$ = $3; + } else { + 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); + MYBACKUP (UNSIGNED, $4, @4); + } else { + MYREPARSE (@4, $2, DURATION_IDENTIFIER, d); + $$ = $3; + } + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup REAL + { + if (scm_is_true (scm_call_1 ($2, $4))) + { + $$ = $3; + MYREPARSE (@4, $2, REAL, $4); + } else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (REAL, $4, @4); + } + } + | 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 (NUMBER_IDENTIFIER, $4, @4); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup '-' UNSIGNED + { + SCM n = scm_difference ($5, SCM_UNDEFINED); + if (scm_is_true (scm_call_1 ($2, n))) { + $$ = $3; + MYREPARSE (@5, $2, REAL, n); + } else { + Music *t = MY_MAKE_MUSIC ("FingeringEvent", @5); + t->set_property ("digit", $5); + $$ = t->unprotect (); + if (scm_is_true (scm_call_1 ($2, $$))) + $$ = scm_cons ($$, $3); + else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (UNSIGNED, $5, @5); + parser->lexer_->push_extra_token ('-'); + } + } + + } + | 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); + MYBACKUP (REAL, n, @5); + } + } + | 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); + MYBACKUP (NUMBER_IDENTIFIER, n, @5); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup PITCH_IDENTIFIER + { + SCM m = make_music_from_simple (parser, @4, $4); + if (unsmob_music (m) && scm_is_true (scm_call_1 ($2, m))) + { + MYREPARSE (@4, $2, PITCH_IDENTIFIER, $4); + $$ = $3; + } else if (scm_is_true (scm_call_1 ($2, $4))) + { + MYREPARSE (@4, $2, PITCH_ARG, $4); + $$ = $3; + } else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (PITCH_IDENTIFIER, $4, @4); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup NOTENAME_PITCH + { + SCM m = make_music_from_simple (parser, @4, $4); + if (unsmob_music (m) && scm_is_true (scm_call_1 ($2, m))) + { + MYREPARSE (@4, $2, NOTENAME_PITCH, $4); + $$ = $3; + } else if (scm_is_true (scm_call_1 ($2, $4))) + { + MYREPARSE (@4, $2, PITCH_ARG, $4); + $$ = $3; + } else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (NOTENAME_PITCH, $4, @4); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup TONICNAME_PITCH + { + SCM m = make_music_from_simple (parser, @4, $4); + if (unsmob_music (m) && scm_is_true (scm_call_1 ($2, m))) + { + MYREPARSE (@4, $2, TONICNAME_PITCH, $4); + $$ = $3; + } else if (scm_is_true (scm_call_1 ($2, $4))) + { + MYREPARSE (@4, $2, PITCH_ARG, $4); + $$ = $3; + } else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (TONICNAME_PITCH, $4, @4); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup DURATION_IDENTIFIER + { + if (scm_is_true (scm_call_1 ($2, $4))) + { + MYREPARSE (@4, $2, DURATION_IDENTIFIER, $4); + $$ = $3; + } else { + $$ = scm_cons (loc_on_music (@3, $1), $3); + MYBACKUP (DURATION_IDENTIFIER, $4, @4); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup SCM_IDENTIFIER + { + SCM res = try_string_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_music (@3, $1), $3); + MYBACKUP (SCM_IDENTIFIER, $4, @4); + } + } + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup STRING + { + SCM res = try_string_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_music (@3, $1), $3); + MYBACKUP (STRING, $4, @4); + } + } + | function_arglist_backup REPARSE music_assign + { + 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 pitch_arg + { + $$ = check_scheme_arg (parser, @3, + $3, $1, $2); + } + | function_arglist_backup REPARSE bare_number_common + { + $$ = check_scheme_arg (parser, @3, + $3, $1, $2); + } + | function_arglist_backup REPARSE duration_length + { + $$ = 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_nonmusic_last: - EXPECT_MARKUP function_arglist full_markup { - $$ = scm_cons ($3, $2); +function_arglist: + function_arglist_nonbackup + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_nonbackup DEFAULT + { + $$ = scm_cons (loc_on_music (@4, $1), $3); } - | EXPECT_SCM function_arglist function_scm_argument { - $$ = scm_cons ($3, $2); + ; + +function_arglist_skip_nonbackup: + function_arglist_nonbackup + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_nonbackup + { + $$ = scm_cons (loc_on_music (@3, $1), $3); } ; -function_arglist_nonmusic: EXPECT_NO_MORE_ARGS { +function_arglist_common: + EXPECT_NO_MORE_ARGS { $$ = SCM_EOL; } - | EXPECT_MARKUP function_arglist_nonmusic full_markup { - $$ = scm_cons ($3, $2); + | EXPECT_SCM function_arglist_optional embedded_scm_arg + { + 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_nonmusic function_scm_argument { - $$ = scm_cons ($3, $2); + | EXPECT_SCM function_arglist_optional bare_number_common + { + $$ = check_scheme_arg (parser, @3, + $3, $2, $1); + } + | EXPECT_SCM function_arglist_optional post_event_nofinger + { + $$ = check_scheme_arg (parser, @3, + $3, $2, $1); + } + | EXPECT_SCM function_arglist_optional '-' NUMBER_IDENTIFIER + { + SCM n = scm_difference ($4, SCM_UNDEFINED); + $$ = check_scheme_arg (parser, @4, n, $2, $1); + } + | function_arglist_common_reparse REPARSE SCM_ARG + { + $$ = check_scheme_arg (parser, @3, + $3, $1, $2); + } + | function_arglist_common_reparse REPARSE lyric_element_music + { + $$ = check_scheme_arg (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 duration_length + { + $$ = 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: EXPECT_NO_MORE_ARGS { - /* This is for 0-ary functions, so they don't need to - read a lookahead token */ +function_arglist_common_reparse: + EXPECT_SCM function_arglist_optional SCM_IDENTIFIER + { + $$ = $2; + SCM res = try_string_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 STRING + { + $$ = $2; + SCM res = try_string_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; + if (scm_is_true (scm_call_1 ($1, $3))) + MYREPARSE (@3, $1, SCM_ARG, $3); + 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 UNSIGNED + { + $$ = $2; + if (scm_is_true (scm_call_1 ($1, $3))) + MYREPARSE (@3, $1, REAL, $3); + else { + SCM d = make_duration ($3); + if (SCM_UNBNDP (d) || scm_is_false (scm_call_1 ($1, d))) + MYREPARSE (@3, $1, REAL, $3); + else + MYREPARSE (@3, $1, DURATION_IDENTIFIER, d); + } + } + | EXPECT_SCM function_arglist_optional DURATION_IDENTIFIER + { + $$ = $2; + MYREPARSE (@3, $1, DURATION_IDENTIFIER, $3); + } + | EXPECT_SCM function_arglist_optional '-' UNSIGNED + { + $$ = $2; + SCM n = scm_difference ($4, SCM_UNDEFINED); + if (scm_is_true (scm_call_1 ($1, n))) + MYREPARSE (@4, $1, REAL, n); + else { + Music *t = MY_MAKE_MUSIC ("FingeringEvent", @4); + t->set_property ("digit", $4); + SCM m = t->unprotect (); + if (scm_is_true (scm_call_1 ($1, m))) + MYREPARSE (@4, $1, SCM_ARG, m); + else + MYREPARSE (@4, $1, SCM_ARG, $4); + } + + } + | EXPECT_SCM function_arglist_optional '-' REAL + { + $$ = $2; + SCM n = scm_difference ($4, SCM_UNDEFINED); + MYREPARSE (@4, $1, REAL, n); + } + ; + +function_arglist_closed: + function_arglist_closed_nonbackup + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_nonbackup DEFAULT + { + $$ = scm_cons (loc_on_music (@4, $1), $3); + } + ; + +function_arglist_closed_common: + EXPECT_NO_MORE_ARGS { $$ = SCM_EOL; } - | function_arglist_music_last - | function_arglist_nonmusic_last + | EXPECT_SCM function_arglist_optional embedded_scm_arg_closed + { + $$ = check_scheme_arg (parser, @3, + $3, $2, $1); + } + | EXPECT_SCM function_arglist_optional bare_number_common_closed + { + $$ = check_scheme_arg (parser, @3, + $3, $2, $1); + } + | EXPECT_SCM function_arglist_optional '-' NUMBER_IDENTIFIER + { + $$ = check_scheme_arg (parser, @3, + scm_difference ($4, SCM_UNDEFINED), + $2, $1); + } + | EXPECT_SCM function_arglist_optional post_event_nofinger + { + $$ = 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_common_closed + { + $$ = check_scheme_arg (parser, @3, + $3, $1, $2); + } + | function_arglist_common_reparse REPARSE symbol_list_arg + { + $$ = check_scheme_arg (parser, @3, $3, $1, $2); + } ; -generic_prefix_music_scm: +function_arglist_optional: + function_arglist_backup + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_backup DEFAULT + { + $$ = scm_cons (loc_on_music (@4, $1), $3); + } + | function_arglist_skip_backup BACKUP + ; + +function_arglist_skip_backup: + function_arglist_backup + | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip_backup + { + $$ = scm_cons (loc_on_music (@3, $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); + } + ; + +music_function_call: MUSIC_FUNCTION function_arglist { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $2); } ; @@ -977,31 +2077,37 @@ optional_id: | '=' simple_string { $$ = $2; } - ; - + ; -prefix_composite_music: - generic_prefix_music_scm { - $$ = run_music_function (PARSER, $1); - } - | CONTEXT simple_string optional_id optional_context_mod music { - $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_F); - } - | NEWCONTEXT simple_string optional_id optional_context_mod music { - $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_T); +complex_music: + music_function_call + | repeated_music { $$ = $1; } + | re_rhythmed_music { $$ = $1; } + | complex_music_prefix music + { + $$ = FINISH_MAKE_SYNTAX ($1, @$, $2); } + ; - | TIMES fraction music { - $$ = MAKE_SYNTAX ("time-scaled-music", @$, $2, $3); +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); } - | repeated_music { $$ = $1; } - | TRANSPOSE pitch_also_in_chords pitch_also_in_chords music { - Pitch from = *unsmob_pitch ($2); - Pitch to = *unsmob_pitch ($3); - SCM pitch = pitch_interval (from, to).smobbed_copy (); - $$ = MAKE_SYNTAX ("transpose-music", @$, pitch, $4); + | 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); } - | mode_changing_head grouped_music_list { + ; + +mode_changed_music: + mode_changing_head grouped_music_list { if ($1 == ly_symbol2scm ("chords")) { $$ = MAKE_SYNTAX ("unrelativable-music", @$, $2); @@ -1010,160 +2116,201 @@ prefix_composite_music: { $$ = $2; } - PARSER->lexer_->pop_state (); + parser->lexer_->pop_state (); } | mode_changing_head_with_context optional_context_mod grouped_music_list { - $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, $2, SCM_BOOL_T); + 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")) { $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$); } - PARSER->lexer_->pop_state (); + parser->lexer_->pop_state (); } - | relative_music { $$ = $1; } - | re_rhythmed_music { $$ = $1; } ; -mode_changing_head: +mode_changing_head: NOTEMODE { - SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames"); - PARSER->lexer_->push_note_state (alist_to_hashq (nn)); + SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); + parser->lexer_->push_note_state (nn); $$ = ly_symbol2scm ("notes"); } - | DRUMMODE + | DRUMMODE { - SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames"); - PARSER->lexer_->push_note_state (alist_to_hashq (nn)); + SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames"); + parser->lexer_->push_note_state (nn); $$ = ly_symbol2scm ("drums"); } | FIGUREMODE { - PARSER->lexer_->push_figuredbass_state (); + parser->lexer_->push_figuredbass_state (); $$ = 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 (alist_to_hashq (nn)); + 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); $$ = ly_symbol2scm ("chords"); } | LYRICMODE - { PARSER->lexer_->push_lyric_state (); + { parser->lexer_->push_lyric_state (); $$ = ly_symbol2scm ("lyrics"); } ; -mode_changing_head_with_context: +mode_changing_head_with_context: DRUMS { - SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames"); - PARSER->lexer_->push_note_state (alist_to_hashq (nn)); + SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames"); + parser->lexer_->push_note_state (nn); $$ = ly_symbol2scm ("DrumStaff"); } | FIGURES { - PARSER->lexer_->push_figuredbass_state (); + parser->lexer_->push_figuredbass_state (); $$ = 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 (alist_to_hashq (nn)); + 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); $$ = ly_symbol2scm ("ChordNames"); } | LYRICS - { PARSER->lexer_->push_lyric_state (); + { parser->lexer_->push_lyric_state (); $$ = ly_symbol2scm ("Lyrics"); } ; - -relative_music: - RELATIVE absolute_pitch music { - Pitch start = *unsmob_pitch ($2); - $$ = make_music_relative (start, $3, @$); - } - | RELATIVE composite_music { - Pitch middle_c (0, 0, 0); - $$ = make_music_relative (middle_c, $2, @$); - } - ; - new_lyrics: - ADDLYRICS { PARSER->lexer_->push_lyric_state (); } + ADDLYRICS { parser->lexer_->push_lyric_state (); } /*cont */ - grouped_music_list { + composite_music { /* Can also use music at the expensive of two S/Rs similar to \repeat \alternative */ - PARSER->lexer_->pop_state (); + parser->lexer_->pop_state (); $$ = scm_cons ($3, SCM_EOL); } | new_lyrics ADDLYRICS { - PARSER->lexer_->push_lyric_state (); - } grouped_music_list { - PARSER->lexer_->pop_state (); + parser->lexer_->push_lyric_state (); + } composite_music { + parser->lexer_->pop_state (); $$ = scm_cons ($4, $1); } ; re_rhythmed_music: - grouped_music_list new_lyrics { + composite_music new_lyrics { $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); - } + } %prec COMPOSITE | LYRICSTO simple_string { - PARSER->lexer_->push_lyric_state (); + parser->lexer_->push_lyric_state (); } music { - PARSER->lexer_->pop_state (); + 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); } ; -property_path_revved: - embedded_scm { - $$ = scm_cons ($1, SCM_EOL); - } - | property_path_revved embedded_scm { - $$ = scm_cons ($2, $1); - } - ; - property_path: - property_path_revved { + symbol_list_rev { $$ = scm_reverse_x ($1, SCM_EOL); - } + } + | symbol_list_rev property_path { + $$ = scm_reverse_x ($1, $2); + } ; property_operation: - STRING '=' scalar { - $$ = scm_list_3 (ly_symbol2scm ("assign"), - scm_string_to_symbol ($1), $3); + symbol '=' scalar { + $$ = scm_list_3 (ly_symbol2scm ("assign"), $1, $3); + } + | UNSET symbol { + $$ = scm_list_2 (ly_symbol2scm ("unset"), $2); } - | UNSET simple_string { - $$ = scm_list_2 (ly_symbol2scm ("unset"), - scm_string_to_symbol ($2)); + | OVERRIDE property_path '=' scalar { + if (scm_ilength ($2) < 2) { + parser->parser_error (@2, _("bad grob property path")); + $$ = SCM_UNDEFINED; + } else { + $$ = scm_cons (ly_symbol2scm ("push"), + scm_cons2 (scm_car ($2), + $4, + scm_cdr ($2))); + } + } + | REVERT revert_arg { + $$ = scm_cons (ly_symbol2scm ("pop"), $2); + } + ; + +// This is all quite awkward for the sake of substantial backward +// compatibility while at the same time allowing a more "natural" form +// of specification not separating grob specification from grob +// property path. The purpose of this definition of revert_arg is to +// allow the symbol list which specifies grob and property to revert +// to be optionally be split into two parts after the grob (which in +// this case is just the first element of the list). symbol_list_part +// is only one path component, but it can be parsed without lookahead, +// so we can follow it with a synthetic BACKUP token when needed. If +// the first symbol_list_part already contains multiple elements (only +// possible if a Scheme expression provides them), we just parse for +// additional elements introduced by '.', which is what the +// SYMBOL_LIST backup in connection with the immediately following +// rule using symbol_list_arg does. +// +// As long as we don't have our coffers filled with both grob and at +// least one grob property specification, the rest of the required +// symbol list chain may be provided either with or without a leading +// dot. This is for both allowing the traditional +// \revert Accidental #'color +// as well as well as the "naive" form +// \revert Accidental.color + +revert_arg: + revert_arg_backup BACKUP symbol_list_arg + { + $$ = $3; } - | OVERRIDE simple_string property_path '=' embedded_scm { - $$ = scm_append (scm_list_2 (scm_list_3 (ly_symbol2scm ("push"), - scm_string_to_symbol ($2), $5), - $3)); + ; + +revert_arg_backup: + revert_arg_part + { + if (scm_is_null ($1) + || scm_is_null (scm_cdr ($1))) + MYBACKUP (SCM_ARG, $1, @1); + else + MYBACKUP (SYMBOL_LIST, scm_reverse_x ($1, SCM_EOL), @1); } - | REVERT simple_string embedded_scm { - $$ = scm_list_3 (ly_symbol2scm ("pop"), - scm_string_to_symbol ($2), $3); + ; + +// revert_arg_part delivers results in reverse +revert_arg_part: + symbol_list_part + | 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: @@ -1185,57 +2332,157 @@ context_mod: | context_def_mod STRING { $$ = scm_list_2 ($1, $2); } + | context_def_mod embedded_scm + { + if (!scm_is_string ($2) + && ly_symbol2scm ("consists") != $1 + && ly_symbol2scm ("remove") != $1) + { + $$ = SCM_EOL; + parser->parser_error (@1, _ ("only \\consists and \\remove take non-string argument.")); + } + else + { + $$ = scm_list_2 ($1, $2); + } + } ; -context_prop_spec: - simple_string { - if (!is_regular_identifier ($1)) +// If defined, at least two members. +grob_prop_spec: + symbol_list_rev + { + SCM l = scm_reverse_x ($1, SCM_EOL); + if (scm_is_pair (l) + && to_boolean + (scm_object_property (scm_car (l), + ly_symbol2scm ("is-grob?")))) + l = scm_cons (ly_symbol2scm ("Bottom"), l); + if (scm_is_null (l) || scm_is_null (scm_cdr (l))) { + parser->parser_error (@1, _ ("bad grob property path")); + l = SCM_UNDEFINED; + } + $$ = l; + } + ; + +// If defined, at least three members +grob_prop_path: + grob_prop_spec + { + if (!SCM_UNBNDP ($1) && scm_is_null (scm_cddr ($1))) { - @$.error (_("Grob name should be alphanumeric")); + parser->parser_error (@1, _ ("bad grob property path")); + $$ = SCM_UNDEFINED; + } + } + | grob_prop_spec property_path + { + if (!SCM_UNBNDP ($1)) { + $$ = scm_append_x (scm_list_2 ($1, $2)); + if (scm_is_null (scm_cddr ($$))) { + parser->parser_error (@$, _ ("bad grob property path")); + $$ = SCM_UNDEFINED; + } } - $$ = scm_list_2 (ly_symbol2scm ("Bottom"), - scm_string_to_symbol ($1)); } - | simple_string '.' simple_string { - $$ = scm_list_2 (scm_string_to_symbol ($1), - scm_string_to_symbol ($3)); + ; + +// Exactly two elements or undefined +context_prop_spec: + symbol_list_rev + { + SCM l = scm_reverse_x ($1, SCM_EOL); + switch (scm_ilength (l)) { + case 1: + l = scm_cons (ly_symbol2scm ("Bottom"), l); + case 2: + break; + default: + parser->parser_error (@1, _ ("bad context property path")); + l = SCM_UNDEFINED; + } + $$ = l; } ; simple_music_property_def: - OVERRIDE context_prop_spec property_path '=' scalar { - $$ = scm_append (scm_list_2 (scm_list_n (scm_car ($2), - ly_symbol2scm ("OverrideProperty"), - scm_cadr ($2), - $5, SCM_UNDEFINED), - $3)); - } - | REVERT context_prop_spec embedded_scm { - $$ = scm_list_4 (scm_car ($2), - ly_symbol2scm ("RevertProperty"), - scm_cadr ($2), - $3); + 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 { - $$ = scm_list_4 (scm_car ($2), - ly_symbol2scm ("PropertySet"), - scm_cadr ($2), - $4); + if (SCM_UNBNDP ($2)) + $$ = SCM_UNDEFINED; + else + $$ = scm_list_4 (scm_car ($2), + ly_symbol2scm ("PropertySet"), + scm_cadr ($2), + $4); } | UNSET context_prop_spec { - $$ = scm_list_3 (scm_car ($2), - ly_symbol2scm ("PropertyUnset"), - scm_cadr ($2)); + 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 +// of specification not separating grob specification from grob +// property path. The purpose of this definition of +// simple_revert_context is to allow the symbol list which specifies +// grob and property to revert to be optionally be split into two +// parts after the grob (which may be preceded by a context +// specification, a case which we distinguish by checking whether the +// first symbol is a valid grob symbol instead). +// +// See revert_arg above for the main work horse of this arrangement. +// simple_revert_context just caters for the context and delegates the +// rest of the job to revert_arg. + +simple_revert_context: + symbol_list_part + { + $1 = scm_reverse_x ($1, SCM_EOL); + if (scm_is_null ($1) + || to_boolean + (scm_object_property (scm_car ($1), + ly_symbol2scm ("is-grob?")))) { + $$ = ly_symbol2scm ("Bottom"); + parser->lexer_->push_extra_token (SCM_IDENTIFIER, $1); + } else { + $$ = scm_car ($1); + parser->lexer_->push_extra_token (SCM_IDENTIFIER, + scm_cdr ($1)); + } } ; music_property_def: simple_music_property_def { - $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons (PARSER->self_scm (), scm_cons2 (make_input (@$), SCM_BOOL_F, $1))); - } - | ONCE simple_music_property_def { - $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons (PARSER->self_scm (), scm_cons2 (make_input (@$), SCM_BOOL_T, $2))); + if (SCM_UNBNDP ($1)) + $$ = MAKE_SYNTAX ("void-music", @1); + else + $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons2 (parser->self_scm (), make_input (@$), $1)); } ; @@ -1243,63 +2490,104 @@ string: STRING { $$ = $1; } - | STRING_IDENTIFIER { - $$ = $1; - } - | string '+' string { - $$ = scm_string_append (scm_list_2 ($1, $3)); - } + | full_markup ; simple_string: STRING { $$ = $1; } - | LYRICS_STRING { - $$ = $1; - } - | STRING_IDENTIFIER { - $$ = $1; + | embedded_scm_bare + { + if (scm_is_string ($1)) { + $$ = $1; + } else { + parser->parser_error (@1, (_ ("simple string expected"))); + $$ = scm_string (SCM_EOL); + } } ; -scalar: string { - $$ = $1; - } - | LYRICS_STRING { - $$ = $1; - } - | bare_number { - $$ = $1; - } - | embedded_scm { - $$ = $1; +symbol: + STRING { + $$ = scm_string_to_symbol ($1); } - | full_markup { - $$ = $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); + if (SCM_UNBNDP ($$)) + { + parser->parser_error (@1, (_ ("symbol expected"))); + // Generate a unique symbol in case it is used + // for an assignment or similar + $$ = scm_make_symbol (ly_string2scm ("undefined")); + } } - | DIGIT { - $$ = scm_from_int ($1); + ; + +scalar: + embedded_scm_arg + | SCM_IDENTIFIER + | bare_number + // The following is a rather defensive variant of admitting + // negative numbers: the grammar would permit number_factor or + // even number_expression. However, function arguments allow + // only this simple kind of negative number, so to have things + // like \tweak and \override behave reasonably similar, it + // makes sense to rule out things like -- which are rather an + // accent in function argument contexts. + | '-' bare_number + { + $$ = scm_difference ($2, SCM_UNDEFINED); } + | STRING + | full_markup ; event_chord: - /* TODO: Create a special case that avoids the creation of - EventChords around simple_elements that have no post_events? - */ - simple_chord_elements post_events { - SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL)); - + 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")); + $$ = MAKE_SYNTAX ("void-music", @1); + } + } + } %prec ':' + | simple_chord_elements post_events { + if (scm_is_pair ($2)) { + if (unsmob_pitch ($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_pitch ($1)) + $$ = MAKE_SYNTAX ("event-chord", @1, $1); + // A mere pitch drops through. + } %prec ':' + | CHORD_REPETITION optional_notemode_duration post_events { Input i; - /* why is this giving wrong start location? -ns - * i = @$; */ - i.set_location (@1, @2); - $$ = MAKE_SYNTAX ("event-chord", i, elts); - } + i.set_location (@1, @3); + $$ = 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, $3); - } + $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, + scm_reverse_x ($3, SCM_EOL)); + } %prec ':' | command_element | note_chord_element ; @@ -1312,7 +2600,7 @@ note_chord_element: SCM dur = unsmob_duration ($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); es = ly_append2 (es, postevs); @@ -1320,7 +2608,7 @@ note_chord_element: m-> set_property ("elements", es); m->set_spot (@$); $$ = m->self_scm (); - } + } %prec ':' ; chord_body: @@ -1328,28 +2616,30 @@ chord_body: { $$ = MAKE_SYNTAX ("event-chord", @$, scm_reverse_x ($2, SCM_EOL)); } + | CHORD_BODY_IDENTIFIER ; chord_body_elements: /* empty */ { $$ = SCM_EOL; } | chord_body_elements chord_body_element { - $$ = scm_cons ($2, $1); + if (!SCM_UNBNDP ($2)) + $$ = scm_cons ($2, $1); } ; chord_body_element: pitch exclamations questions octave_check post_events { - int q = $3; - int ex = $2; + bool q = to_boolean ($3); + bool ex = to_boolean ($2); SCM check = $4; SCM post = $5; Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); n->set_property ("pitch", $1); - if (q % 2) + if (q) n->set_property ("cautionary", SCM_BOOL_T); - if (ex % 2 || q % 2) + if (ex || q) n->set_property ("force-accidental", SCM_BOOL_T); if (scm_is_pair (post)) { @@ -1366,7 +2656,6 @@ chord_body_element: } | DRUM_PITCH post_events { Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); - n->set_property ("duration", $2); n->set_property ("drum-type", $1); if (scm_is_pair ($2)) { @@ -1375,41 +2664,44 @@ chord_body_element: } $$ = n->unprotect (); } - | music_function_chord_body { - $$ = run_music_function (PARSER, $1); - } - ; + | music_function_chord_body + { + Music *m = unsmob_music ($1); -music_function_identifier_musicless_prefix: MUSIC_FUNCTION { - SCM sig = scm_object_property (yylval.scm, ly_symbol2scm ("music-function-signature")); - if (scm_is_pair (sig) && to_boolean (scm_memq (ly_music_p_proc, scm_cdr (scm_reverse (sig))))) - { - PARSER->parser_error (@$, "Music function applied to event may not have a Music argument, except as the last argument."); + while (m && m->is_mus_type ("music-wrapper-music")) { + $$ = m->get_property ("element"); + m = unsmob_music ($$); + } + + if (!(m && m->is_mus_type ("rhythmic-event"))) { + parser->parser_error (@$, _ ("not a rhythmic event")); + $$ = SCM_UNDEFINED; } } ; music_function_chord_body: - /* We could allow chord functions to have multiple music arguments, - but it's more consistent with music_function_event if we - prohibit it here too */ - music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic chord_body_element { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4))); - } - | music_function_identifier_musicless_prefix function_arglist_nonmusic { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); - } + music_function_call + | MUSIC_IDENTIFIER + | embedded_scm ; -music_function_event: - /* Post-events can only have the last argument as music, without this - restriction we get a shift/reduce conflict from e.g. - c8-\partcombine c8 -. */ - music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic post_event { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4))); +// 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); } - | music_function_identifier_musicless_prefix function_arglist_nonmusic { - $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); + ; + +event_function_event: + EVENT_FUNCTION function_arglist_closed { + $$ = MAKE_SYNTAX ("music-function", @$, + $1, $2); } ; @@ -1417,83 +2709,12 @@ command_element: command_event { $$ = $1; } - | SKIP duration_length { - $$ = MAKE_SYNTAX ("skip-music", @$, $2); - } - | E_BRACKET_OPEN { - Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$); - m->set_property ("span-direction", scm_from_int (START)); - $$ = m->unprotect(); - } - | E_BRACKET_CLOSE { - Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$); - m->set_property ("span-direction", scm_from_int (STOP)); - $$ = m->unprotect (); - } - | E_BACKSLASH { - $$ = MAKE_SYNTAX ("voice-separator", @$, SCM_UNDEFINED); - } - | '|' { - SCM pipe = PARSER->lexer_->lookup_identifier ("pipeSymbol"); - - Music *m = unsmob_music (pipe); - if (m) - { - m = m->clone (); - m->set_spot (@$); - $$ = m->unprotect (); - } - else - $$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED); - - } - | PARTIAL duration_length { - Moment m = - unsmob_duration ($2)->get_length (); - $$ = MAKE_SYNTAX ("property-operation", @$, SCM_BOOL_F, ly_symbol2scm ("Timing"), ly_symbol2scm ("PropertySet"), ly_symbol2scm ("measurePosition"), m.smobbed_copy ()); - $$ = MAKE_SYNTAX ("context-specification", @$, ly_symbol2scm ("Timing"), SCM_BOOL_F, $$, SCM_EOL, SCM_BOOL_F); - } - - | TIME_T fraction { - SCM proc = ly_lily_module_constant ("make-time-signature-set"); - - $$ = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL); - } - | MARK scalar { - SCM proc = ly_lily_module_constant ("make-mark-set"); - - $$ = scm_call_1 (proc, $2); - } ; command_event: - E_TILDE { - $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent", @$)->unprotect (); - } - | MARK DEFAULT { - Music *m = MY_MAKE_MUSIC ("MarkEvent", @$); - $$ = m->unprotect (); - } - | tempo_event { + tempo_event { $$ = $1; } - | KEY DEFAULT { - Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$); - $$ = key->unprotect (); - } - | KEY NOTENAME_PITCH SCM_IDENTIFIER { - - Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$); - if (scm_ilength ($3) > 0) - { - key->set_property ("pitch-alist", $3); - key->set_property ("tonic", Pitch (0, 0, 0).smobbed_copy ()); - key->transpose (* unsmob_pitch ($2)); - } else { - PARSER->parser_error (@3, _ ("second argument must be pitch list")); - } - - $$ = key->unprotect (); - } ; @@ -1502,165 +2723,159 @@ post_events: $$ = SCM_EOL; } | post_events post_event { - unsmob_music ($2)->set_spot (@2); - $$ = scm_cons ($2, $$); + $$ = $1; + if (Music *m = unsmob_music ($2)) + { + if (m->is_mus_type ("post-event-wrapper")) + { + for (SCM p = m->get_property ("elements"); + scm_is_pair (p); + p = scm_cdr (p)) + { + $$ = scm_cons (scm_car (p), $$); + } + } else { + m->set_spot (@2); + $$ = scm_cons ($2, $$); + } + } } ; - -post_event: + +post_event_nofinger: direction_less_event { $$ = $1; } - | '-' music_function_event { - $$ = run_music_function (PARSER, $2); + | script_dir music_function_call_closed { + $$ = $2; + if (!unsmob_music ($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); + } } | HYPHEN { - if (!PARSER->lexer_->is_lyric_state ()) - PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics")); + if (!parser->lexer_->is_lyric_state ()) + parser->parser_error (@1, _ ("have to be in Lyric mode for lyrics")); $$ = MY_MAKE_MUSIC ("HyphenEvent", @$)->unprotect (); } | EXTENDER { - if (!PARSER->lexer_->is_lyric_state ()) - PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics")); + if (!parser->lexer_->is_lyric_state ()) + parser->parser_error (@1, _ ("have to be in Lyric mode for lyrics")); $$ = MY_MAKE_MUSIC ("ExtenderEvent", @$)->unprotect (); } | script_dir direction_reqd_event { - if ($1) + if (!SCM_UNBNDP ($1)) { Music *m = unsmob_music ($2); - m->set_property ("direction", scm_from_int ($1)); + m->set_property ("direction", $1); } $$ = $2; } | script_dir direction_less_event { - if ($1) + if (!SCM_UNBNDP ($1)) { Music *m = unsmob_music ($2); - m->set_property ("direction", scm_from_int ($1)); + m->set_property ("direction", $1); } $$ = $2; } - | string_number_event + | '^' fingering + { + $$ = $2; + unsmob_music ($$)->set_property ("direction", scm_from_int (UP)); + } + | '_' fingering + { + $$ = $2; + unsmob_music ($$)->set_property ("direction", scm_from_int (DOWN)); + } + ; + +post_event: + post_event_nofinger + | '-' fingering { + $$ = $2; + } ; string_number_event: E_UNSIGNED { Music *s = MY_MAKE_MUSIC ("StringNumberEvent", @$); - s->set_property ("string-number", scm_from_int ($1)); + s->set_property ("string-number", $1); $$ = s->unprotect (); } ; -direction_less_char: - '[' { - $$ = ly_symbol2scm ("bracketOpenSymbol"); - } - | ']' { - $$ = ly_symbol2scm ("bracketCloseSymbol"); - } - | '~' { - $$ = ly_symbol2scm ("tildeSymbol"); - } - | '(' { - $$ = ly_symbol2scm ("parenthesisOpenSymbol"); - } - | ')' { - $$ = ly_symbol2scm ("parenthesisCloseSymbol"); - } - | E_EXCLAMATION { - $$ = ly_symbol2scm ("escapedExclamationSymbol"); - } - | E_OPEN { - $$ = ly_symbol2scm ("escapedParenthesisOpenSymbol"); - } - | E_CLOSE { - $$ = ly_symbol2scm ("escapedParenthesisCloseSymbol"); - } - | E_ANGLE_CLOSE { - $$ = ly_symbol2scm ("escapedBiggerSymbol"); - } - | E_ANGLE_OPEN { - $$ = ly_symbol2scm ("escapedSmallerSymbol"); - } - ; - direction_less_event: - direction_less_char { - SCM predefd = PARSER->lexer_->lookup_identifier_symbol ($1); - Music *m = 0; - if (unsmob_music (predefd)) - { - m = unsmob_music (predefd)->clone (); - m->set_spot (@$); - } - else - { - m = MY_MAKE_MUSIC ("Music", @$); - } - $$ = m->unprotect (); - } + string_number_event | EVENT_IDENTIFIER { $$ = $1; } | tremolo_type { Music *a = MY_MAKE_MUSIC ("TremoloEvent", @$); - a->set_property ("tremolo-type", scm_from_int ($1)); + a->set_property ("tremolo-type", $1); $$ = a->unprotect (); } - ; - + | event_function_event + ; + direction_reqd_event: gen_text_def { $$ = $1; } | script_abbreviation { - SCM s = PARSER->lexer_->lookup_identifier ("dash" + ly_scm2string ($1)); + SCM s = parser->lexer_->lookup_identifier ("dash" + ly_scm2string ($1)); Music *a = MY_MAKE_MUSIC ("ArticulationEvent", @$); if (scm_is_string (s)) a->set_property ("articulation-type", s); - else PARSER->parser_error (@1, _ ("expecting string as script definition")); + else parser->parser_error (@1, _ ("expecting string as script definition")); $$ = a->unprotect (); } ; octave_check: /**/ { $$ = SCM_EOL; } - | '=' { $$ = scm_from_int (0); } - | '=' sub_quotes { $$ = scm_from_int (-$2); } - | '=' sup_quotes { $$ = scm_from_int ($2); } + | '=' quotes { $$ = $2; } ; +quotes: + /* empty */ + { + $$ = SCM_INUM0; + } + | sub_quotes + | sup_quotes + ; + sup_quotes: '\'' { - $$ = 1; + $$ = scm_from_int (1); } | sup_quotes '\'' { - $$ ++; + $$ = scm_oneplus ($1); } ; sub_quotes: ',' { - $$ = 1; + $$ = scm_from_int (-1); } | sub_quotes ',' { - $$++; + $$ = scm_oneminus ($1); } ; steno_pitch: - NOTENAME_PITCH { - $$ = $1; - } - | NOTENAME_PITCH sup_quotes { - Pitch p = *unsmob_pitch ($1); - p = p.transposed (Pitch ($2,0,0)); - $$ = p.smobbed_copy (); - } - | NOTENAME_PITCH sub_quotes { - Pitch p =* unsmob_pitch ($1); - p = p.transposed (Pitch (-$2,0,0)); - $$ = p.smobbed_copy (); + 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)); + $$ = p.smobbed_copy (); + } } ; @@ -1669,31 +2884,37 @@ ugh. duplication */ steno_tonic_pitch: - TONICNAME_PITCH { - $$ = $1; - } - | TONICNAME_PITCH sup_quotes { - Pitch p = *unsmob_pitch ($1); - p = p.transposed (Pitch ($2,0,0)); - $$ = p.smobbed_copy (); - } - | TONICNAME_PITCH sub_quotes { - Pitch p = *unsmob_pitch ($1); - - p = p.transposed (Pitch (-$2,0,0)); - $$ = p.smobbed_copy (); + 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)); + $$ = p.smobbed_copy (); + } } ; pitch: - steno_pitch { - $$ = $1; + steno_pitch + | PITCH_IDENTIFIER quotes { + if (!scm_is_eq (SCM_INUM0, $2)) + { + Pitch p = *unsmob_pitch ($1); + p = p.transposed (Pitch (scm_to_int ($2),0,0)); + $$ = p.smobbed_copy (); + } } ; -pitch_also_in_chords: - pitch - | steno_tonic_pitch +pitch_arg: + PITCH_ARG quotes { + if (!scm_is_eq (SCM_INUM0, $2)) + { + Pitch p = *unsmob_pitch ($1); + p = p.transposed (Pitch (scm_to_int ($2),0,0)); + $$ = p.smobbed_copy (); + } + } ; gen_text_def: @@ -1702,15 +2923,30 @@ gen_text_def: t->set_property ("text", $1); $$ = t->unprotect (); } - | string { + | STRING { Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$); t->set_property ("text", make_simple_markup ($1)); $$ = t->unprotect (); } - | DIGIT { + | embedded_scm_closed + { + Music *m = unsmob_music ($1); + if (m && m->is_mus_type ("post-event")) + $$ = $1; + else if (Text_interface::is_markup ($1)) { + Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$); + t->set_property ("text", $1); + $$ = t->unprotect (); + } else + parser->parser_error (@1, _ ("not an articulation")); + } + ; + +fingering: + UNSIGNED { Music *t = MY_MAKE_MUSIC ("FingeringEvent", @$); - t->set_property ("digit", scm_from_int ($1)); + t->set_property ("digit", $1); $$ = t->unprotect (); } ; @@ -1725,8 +2961,8 @@ script_abbreviation: | '-' { $$ = scm_from_locale_string ("Dash"); } - | '|' { - $$ = scm_from_locale_string ("Bar"); + | '!' { + $$ = scm_from_locale_string ("Bang"); } | ANGLE_CLOSE { $$ = scm_from_locale_string ("Larger"); @@ -1740,16 +2976,9 @@ script_abbreviation: ; script_dir: - '_' { $$ = DOWN; } - | '^' { $$ = UP; } - | '-' { $$ = CENTER; } - ; - - -absolute_pitch: - steno_pitch { - $$ = $1; - } + '_' { $$ = scm_from_int (DOWN); } + | '^' { $$ = scm_from_int (UP); } + | '-' { $$ = SCM_UNDEFINED; } ; duration_length: @@ -1758,32 +2987,41 @@ duration_length: } ; -optional_notemode_duration: +maybe_notemode_duration: { - Duration dd = PARSER->default_duration_; - $$ = dd.smobbed_copy (); - } + $$ = SCM_UNDEFINED; + } %prec ':' | multiplied_duration { $$ = $1; - PARSER->default_duration_ = *unsmob_duration ($$); + parser->default_duration_ = *unsmob_duration ($$); + } +; + + +optional_notemode_duration: + maybe_notemode_duration + { + if (SCM_UNBNDP ($$)) + $$ = parser->default_duration_.smobbed_copy (); } ; steno_duration: - bare_unsigned dots { - int len = 0; - if (!is_duration ($1)) - PARSER->parser_error (@1, _f ("not a duration: %d", $1)); - else - len = intlog2 ($1); - - $$ = Duration (len, $2).smobbed_copy (); + UNSIGNED dots { + $$ = 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 () + $2); - *d = k; - $$ = $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 (); } ; @@ -1791,8 +3029,8 @@ multiplied_duration: steno_duration { $$ = $1; } - | multiplied_duration '*' bare_unsigned { - $$ = unsmob_duration ($$)->compressed ( $3) .smobbed_copy (); + | 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))); @@ -1801,42 +3039,42 @@ multiplied_duration: } ; -fraction: - FRACTION { $$ = $1; } - | UNSIGNED '/' UNSIGNED { - $$ = scm_cons (scm_from_int ($1), scm_from_int ($3)); - } - ; - dots: /* empty */ { - $$ = 0; + $$ = SCM_INUM0; } | dots '.' { - $$ ++; + $$ = scm_oneplus ($1); } ; tremolo_type: ':' { - $$ = 0; + $$ = SCM_INUM0; } - | ':' bare_unsigned { - if (!is_duration ($2)) - PARSER->parser_error (@2, _f ("not a duration: %d", $2)); + | ':' UNSIGNED { + if (SCM_UNBNDP (make_duration ($2))) + parser->parser_error (@2, _ ("not a duration")); $$ = $2; } ; bass_number: - DIGIT { - $$ = scm_from_int ($1); - } - | UNSIGNED { - $$ = scm_from_int ($1); - } + UNSIGNED { $$ = $1; } | STRING { $$ = $1; } | full_markup { $$ = $1; } + | embedded_scm_bare + { + // as an integer, it needs to be non-negative, and otherwise + // it needs to be suitable as a markup. + if (scm_is_integer ($1) + ? scm_is_true (scm_negative_p ($1)) + : !Text_interface::is_markup ($1)) + { + parser->parser_error (@1, _ ("bass number expected")); + $$ = SCM_INUM0; + } + } ; figured_bass_alteration: @@ -1878,31 +3116,23 @@ bass_figure: } | bass_figure figured_bass_modification { Music *m = unsmob_music ($1); - if ($2 == ly_symbol2scm ("plus")) - { - m->set_property ("augmented", SCM_BOOL_T); - } - else if ($2 == ly_symbol2scm ("slash")) - { - m->set_property ("diminished", SCM_BOOL_T); - } - else if ($2 == ly_symbol2scm ("exclamation")) - { - m->set_property ("no-continuation", SCM_BOOL_T); - } + m->set_property ($2, SCM_BOOL_T); } ; figured_bass_modification: E_PLUS { - $$ = ly_symbol2scm ("plus"); + $$ = ly_symbol2scm ("augmented"); } | E_EXCLAMATION { - $$ = ly_symbol2scm ("exclamation"); + $$ = ly_symbol2scm ("no-continuation"); } | '/' { - $$ = ly_symbol2scm ("slash"); + $$ = ly_symbol2scm ("diminished"); + } + | E_BACKSLASH { + $$ = ly_symbol2scm ("augmented-slash"); } ; @@ -1933,43 +3163,53 @@ figure_spec: optional_rest: - /**/ { $$ = 0; } - | REST { $$ = 1; } + /**/ { $$ = SCM_BOOL_F; } + | REST { $$ = SCM_BOOL_T; } ; simple_element: - pitch exclamations questions octave_check optional_notemode_duration optional_rest { - if (!PARSER->lexer_->is_note_state ()) - PARSER->parser_error (@1, _ ("have to be in Note mode for notes")); - - Music *n = 0; - if ($6) - n = MY_MAKE_MUSIC ("RestEvent", @$); - else - n = MY_MAKE_MUSIC ("NoteEvent", @$); - - n->set_property ("pitch", $1); - n->set_property ("duration", $5); - - if (scm_is_number ($4)) + pitch exclamations questions octave_check maybe_notemode_duration optional_rest { + 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)) { - int q = scm_to_int ($4); - n->set_property ("absolute-octave", scm_from_int (q-1)); + 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); + + $$ = n->unprotect (); } - - if ($3 % 2) - n->set_property ("cautionary", SCM_BOOL_T); - if ($2 % 2 || $3 % 2) - n->set_property ("force-accidental", SCM_BOOL_T); - - $$ = n->unprotect (); } | DRUM_PITCH optional_notemode_duration { Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); n->set_property ("duration", $2); n->set_property ("drum-type", $1); - $$ = n->unprotect (); + $$ = n->unprotect (); } | RESTNAME optional_notemode_duration { Music *ev = 0; @@ -1979,29 +3219,18 @@ simple_element: } else { ev = MY_MAKE_MUSIC ("RestEvent", @$); - + } ev->set_property ("duration", $2); $$ = ev->unprotect (); } - | lyric_element optional_notemode_duration { - if (!PARSER->lexer_->is_lyric_state ()) - PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics")); - - Music *levent = MY_MAKE_MUSIC ("LyricEvent", @$); - levent->set_property ("text", $1); - levent->set_property ("duration",$2); - $$= levent->unprotect (); - } ; +// Can return a single pitch rather than a list. simple_chord_elements: - simple_element { - $$ = scm_list_1 ($1); - } - | new_chord { - if (!PARSER->lexer_->is_chord_state ()) - PARSER->parser_error (@1, _ ("have to be in Chord mode for chords")); + 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 { @@ -2010,31 +3239,49 @@ simple_chord_elements: unsmob_music (scm_car (s))->set_property ("duration", $2); } $$ = $1; - } + } ; lyric_element: - lyric_markup { + full_markup { + if (!parser->lexer_->is_lyric_state ()) + parser->parser_error (@1, _ ("markup outside of text script or \\lyricmode")); $$ = $1; } - | LYRICS_STRING { + | STRING { + if (!parser->lexer_->is_lyric_state ()) + parser->parser_error (@1, _ ("unrecognized string, not in text script or \\lyricmode")); $$ = $1; } + | LYRIC_ELEMENT ; +lyric_element_music: + lyric_element optional_notemode_duration post_events { + $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2); + if (scm_is_pair ($3)) + unsmob_music ($$)->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)); - } + $$ = make_chord_elements (@$, $1, $2, scm_cons ($3, its)); + } %prec ':' ; chord_items: /**/ { - $$ = SCM_EOL; + $$ = SCM_EOL; } | chord_items chord_item { $$ = scm_cons ($2, $$); @@ -2076,16 +3323,25 @@ step_numbers: ; step_number: - bare_unsigned { + UNSIGNED { $$ = make_chord_step ($1, 0); } - | bare_unsigned '+' { + | UNSIGNED '+' { $$ = make_chord_step ($1, SHARP_ALTERATION); } - | bare_unsigned CHORD_MINUS { + | UNSIGNED CHORD_MINUS { $$ = make_chord_step ($1, FLAT_ALTERATION); } - ; + ; + +tempo_range: + unsigned_number { + $$ = $1; + } %prec ':' + | unsigned_number '-' unsigned_number { + $$ = scm_cons ($1, $3); + } + ; /* UTILITIES @@ -2122,106 +3378,147 @@ number_factor: | bare_number ; +bare_number_common: + bare_number_common_closed + | REAL NUMBER_IDENTIFIER + { + $$ = scm_product ($1, $2); + } + ; + +bare_number_common_closed: + REAL + | NUMBER_IDENTIFIER + ; bare_number: - UNSIGNED { - $$ = scm_from_int ($1); - } - | REAL { - $$ = $1; - } - | NUMBER_IDENTIFIER { - $$ = $1; - } - | REAL NUMBER_IDENTIFIER { - $$ = scm_from_double (scm_to_double ($1) *scm_to_double ($2)); - } + bare_number_common + | UNSIGNED | UNSIGNED NUMBER_IDENTIFIER { - $$ = scm_from_double ($1 *scm_to_double ($2)); + $$ = scm_product ($1, $2); } ; - -bare_unsigned: - UNSIGNED { - $$ = $1; - } - | DIGIT { - $$ = $1; - } +bare_number_closed: + UNSIGNED + | bare_number_common_closed ; unsigned_number: - bare_unsigned { $$ = scm_from_int ($1); } - | NUMBER_IDENTIFIER { - $$ = $1; + 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: - { $$ = 0; } - | exclamations '!' { $$ ++; } + { $$ = SCM_UNDEFINED; } + | exclamations '!' + { + if (SCM_UNBNDP ($1)) + $$ = SCM_BOOL_T; + else + $$ = scm_not ($1); + } ; questions: - { $$ = 0; } - | questions '?' { $$ ++; } + { $$ = SCM_UNDEFINED; } + | questions '?' + { + if (SCM_UNBNDP ($1)) + $$ = SCM_BOOL_T; + else + $$ = scm_not ($1); + } ; -/* -This should be done more dynamically if possible. -*/ - -lyric_markup: - LYRIC_MARKUP_IDENTIFIER { - $$ = $1; - } - | LYRIC_MARKUP - { PARSER->lexer_->push_markup_state (); } - markup_top { +full_markup_list: + MARKUPLIST + { parser->lexer_->push_markup_state (); } + markup_list { $$ = $3; - PARSER->lexer_->pop_state (); + parser->lexer_->pop_state (); } ; full_markup: - MARKUP_IDENTIFIER { - $$ = $1; - } - | MARKUP - { PARSER->lexer_->push_markup_state (); } + MARKUP + { parser->lexer_->push_markup_state (); } markup_top { $$ = $3; - PARSER->lexer_->pop_state (); + parser->lexer_->pop_state (); } ; markup_top: - markup_list { - $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1); + markup_list { + $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1); } - | markup_head_1_list simple_markup { - $$ = scm_car (scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, scm_list_1 ($2))); + | markup_head_1_list simple_markup + { + $$ = scm_car (MAKE_SYNTAX ("composed-markup-list", + @2, $1, scm_list_1 ($2))); } | simple_markup { $$ = $1; } ; +markup_scm: + embedded_scm_bare + { + if (Text_interface::is_markup ($1)) + MYBACKUP (MARKUP_IDENTIFIER, $1, @1); + else if (Text_interface::is_markup_list ($1)) + MYBACKUP (MARKUPLIST_IDENTIFIER, $1, @1); + else { + parser->parser_error (@1, _ ("not a markup")); + MYBACKUP (MARKUP_IDENTIFIER, scm_string (SCM_EOL), @1); + } + } BACKUP + ; + + markup_list: markup_composed_list { $$ = $1; } - | markup_braced_list { + | markup_uncomposed_list + ; + +markup_uncomposed_list: + markup_braced_list { $$ = $1; } + | markup_command_list { + $$ = scm_list_1 ($1); + } + | markup_scm MARKUPLIST_IDENTIFIER + { + $$ = $2; + } ; markup_composed_list: - markup_head_1_list markup_braced_list { - $$ = scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, $2); - + markup_head_1_list markup_uncomposed_list { + $$ = MAKE_SYNTAX ("composed-markup-list", + @2, $1, $2); } ; @@ -2237,19 +3534,38 @@ markup_braced_list_body: $$ = scm_cons ($2, $1); } | markup_braced_list_body markup_list { - $$ = scm_append_x (scm_list_2 (scm_reverse_x ($2, SCM_EOL), $1)); + $$ = scm_reverse_x ($2, $1); } ; -markup_head_1_item: - MARKUP_HEAD_MARKUP0 { - $$ = scm_list_1 ($1); +markup_command_list: + MARKUP_LIST_FUNCTION markup_command_list_arguments { + $$ = scm_cons ($1, scm_reverse_x($2, SCM_EOL)); } - | MARKUP_HEAD_SCM0_MARKUP1 embedded_scm { - $$ = scm_list_2 ($1, $2); + ; + +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 { + $$ = check_scheme_arg (parser, @3, $3, $2, $1); + } + | EXPECT_NO_MORE_ARGS { + $$ = SCM_EOL; } - | MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm { - $$ = scm_list_3 ($1, $2, $3); + ; + +markup_command_list_arguments: + markup_command_basic_arguments { $$ = $1; } + | EXPECT_MARKUP markup_command_list_arguments markup { + $$ = scm_cons ($3, $2); + } + ; + +markup_head_1_item: + MARKUP_FUNCTION EXPECT_MARKUP markup_command_list_arguments { + $$ = scm_cons ($1, scm_reverse_x ($3, SCM_EOL)); } ; @@ -2266,48 +3582,28 @@ simple_markup: STRING { $$ = make_simple_markup ($1); } - | MARKUP_IDENTIFIER { - $$ = $1; - } - | LYRIC_MARKUP_IDENTIFIER { - $$ = $1; - } - | STRING_IDENTIFIER { - $$ = $1; - } | SCORE { - SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames"); - PARSER->lexer_->push_note_state (alist_to_hashq (nn)); + SCM nn = parser->lexer_->lookup_identifier ("pitchnames"); + parser->lexer_->push_note_state (nn); } '{' score_body '}' { - Score * sc = $4; - $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ()); - sc->unprotect (); - PARSER->lexer_->pop_state (); - } - | MARKUP_HEAD_SCM0 embedded_scm { - $$ = scm_list_2 ($1, $2); - } - | MARKUP_HEAD_SCM0_SCM1_SCM2 embedded_scm embedded_scm embedded_scm { - $$ = scm_list_4 ($1, $2, $3, $4); - } - | MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm { - $$ = scm_list_3 ($1, $2, $3); + unsmob_score ($4)->origin ()->set_spot (@$); + $$ = scm_list_2 (ly_lily_module_constant ("score-markup"), $4); + parser->lexer_->pop_state (); } - | MARKUP_HEAD_EMPTY { - $$ = scm_list_1 ($1); - } - | MARKUP_HEAD_LIST0 markup_list { - $$ = scm_list_2 ($1,$2); + | MARKUP_FUNCTION markup_command_basic_arguments { + $$ = scm_cons ($1, scm_reverse_x ($2, SCM_EOL)); } - | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup { - $$ = scm_list_3 ($1, $2, $3); + | markup_scm MARKUP_IDENTIFIER + { + $$ = $2; } ; - + markup: - markup_head_1_list simple_markup { - SCM mapper = ly_lily_module_constant ("map-markup-command-list"); - $$ = scm_car (scm_call_2 (mapper, $1, scm_list_1 ($2))); + markup_head_1_list simple_markup + { + $$ = scm_car (MAKE_SYNTAX ("composed-markup-list", + @2, $1, scm_list_1 ($2))); } | simple_markup { $$ = $1; @@ -2322,10 +3618,12 @@ Lily_parser::set_yydebug (bool x) yydebug = x; } -void +SCM Lily_parser::do_yyparse () { - yyparse ((void*)this); + SCM retval = SCM_UNDEFINED; + yyparse (this, &retval); + return retval; } @@ -2341,10 +3639,7 @@ otherwise, we have to import music classes into the lexer. int Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) { - if (scm_is_string (sid)) { - *destination = sid; - return STRING_IDENTIFIER; - } else if (unsmob_book (sid)) { + if (unsmob_book (sid)) { Book *book = unsmob_book (sid)->clone (); *destination = book->self_scm (); book->unprotect (); @@ -2353,48 +3648,42 @@ 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 (); + } 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_score (sid)) { - Score *score = new Score (*unsmob_score (sid)); - *destination = score->self_scm (); + *destination = def->self_scm (); + def->unprotect (); + + return CONTEXT_DEF_IDENTIFIER; + } else if (unsmob_context_mod (sid)) { + *destination = unsmob_context_mod (sid)->smobbed_copy (); - score->unprotect (); - return SCORE_IDENTIFIER; + return CONTEXT_MOD_IDENTIFIER; } else if (Music *mus = unsmob_music (sid)) { mus = mus->clone (); *destination = mus->self_scm (); - unsmob_music (*destination)-> - set_property ("origin", make_input (last_input_)); - - bool is_event = scm_memq (ly_symbol2scm ("event"), mus->get_property ("types")) - != SCM_BOOL_F; - + 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 (); + return PITCH_IDENTIFIER; } else if (unsmob_duration (sid)) { *destination = unsmob_duration (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 (Text_interface::is_markup (sid)) { - *destination = sid; - if (is_lyric_state ()) - return LYRIC_MARKUP_IDENTIFIER; - return MARKUP_IDENTIFIER; + } else if (unsmob_score (sid)) { + *destination = unsmob_score (sid)->clone ()->unprotect (); + return SCM_IDENTIFIER; } - return -1; + return -1; } SCM @@ -2413,44 +3702,149 @@ get_next_unique_lyrics_context_id () return scm_from_locale_string (s); } +// check_scheme_arg checks one argument with a given predicate for use +// in an argument list and throws a syntax error if it is unusable. +// The argument is prepended to the argument list in any case. After +// throwing a syntax error, the argument list is terminated with #f as +// its last cdr in order to mark it as uncallable while not losing +// track of its total length. +// +// There are a few special considerations: if optional argument disp +// is given (otherwise it defaults to SCM_UNDEFINED), it will be used +// instead of arg in a prospective error message. This is useful if +// arg is not the actual argument but rather a transformation of it. +// +// If arg itself is SCM_UNDEFINED, the predicate is considered false +// and an error message using disp is produced unconditionally. + +SCM check_scheme_arg (Lily_parser *parser, Input loc, + SCM arg, SCM args, SCM pred, SCM disp) +{ + if (SCM_UNBNDP (arg)) + args = scm_cons (disp, args); + else { + args = scm_cons (arg, args); + if (scm_is_true (scm_call_1 (pred, arg))) + return args; + } + scm_set_cdr_x (scm_last_pair (args), SCM_EOL); + 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) +{ + if (Music *m = unsmob_music (arg)) + { + m = m->clone (); + m->set_spot (loc); + return m->unprotect (); + } + return arg; +} SCM -run_music_function (Lily_parser *parser, SCM expr) +try_string_variants (SCM pred, SCM str) { - SCM func = scm_car (expr); - Input *loc = unsmob_input (scm_cadr (expr)); - SCM args = scm_cddr (expr); - SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature")); + // 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)) { + str = scm_list_1 (str); + if (scm_is_true (scm_call_1 (pred, str))) + return str; + return SCM_UNDEFINED; + } + + // If this cannot be a string representation of a symbol list, + // we are through. + + if (!is_regular_identifier (str, true)) + 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_to_symbol (scm_car (p))); - SCM type_check_proc = ly_lily_module_constant ("type-check-list"); + // Let's attempt the symbol list interpretation first. - if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr (expr), sig, args))) + if (scm_is_true (scm_call_1 (pred, str))) + return str; + + // If there is just one symbol in the list, we might interpret + // it as a single symbol + + if (scm_is_null (scm_cdr (str))) { - parser->error_level_ = 1; - return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("void-music"), scm_list_2 (parser->self_scm (), make_input (*loc))); + str = scm_car (str); + if (scm_is_true (scm_call_1 (pred, str))) + return str; } - SCM syntax_args = scm_list_4 (parser->self_scm (), make_input (*loc), func, args); - return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("music-function"), syntax_args); + return SCM_UNDEFINED; } bool -is_regular_identifier (SCM id) +is_regular_identifier (SCM id, bool multiple) { + if (!scm_is_string (id)) + return false; + string str = ly_scm2string (id); - char const *s = str.c_str (); - bool v = true; -#if 0 - isalpha (*s); - s++; -#endif - while (*s && v) - { - v = v && isalnum (*s); - s++; - } - return v; + bool middle = false; + + for (string::iterator it=str.begin(); it != str.end (); it++) + { + int c = *it & 0xff; + if ((c >= 'a' && c <= 'z') + || (c >= 'A' && c <= 'Z') + || c > 0x7f) + middle = true; + else if (middle && (c == '-' || c == '_' || (multiple && c == '.'))) + middle = false; + else + return false; + } + return middle; +} + +SCM +make_music_from_simple (Lily_parser *parser, Input loc, SCM simple) +{ + if (unsmob_music (simple)) + return simple; + if (parser->lexer_->is_note_state ()) { + if (scm_is_symbol (simple)) { + Music *n = MY_MAKE_MUSIC ("NoteEvent", loc); + n->set_property ("duration", parser->default_duration_.smobbed_copy ()); + n->set_property ("drum-type", simple); + return n->unprotect (); + } + if (unsmob_pitch (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 (); + } + return simple; + } else if (parser->lexer_->is_lyric_state ()) { + if (Text_interface::is_markup (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_SYNTAX + ("event-chord", + loc, + make_chord_elements (loc, simple, + parser->default_duration_.smobbed_copy (), + SCM_EOL)); + } + return simple; } Music * @@ -2461,42 +3855,27 @@ make_music_with_input (SCM name, Input where) return m; } -SCM -get_first_context_id (SCM type, Music *m) -{ - SCM id = m->get_property ("context-id"); - if (SCM_BOOL_T == scm_equal_p (m->get_property ("context-type"), type) - && scm_is_string (m->get_property ("context-id")) - && scm_c_string_length (id) > 0) - { - return id; - } - return SCM_EOL; -} - SCM make_simple_markup (SCM a) { return a; } -bool -is_duration (int t) -{ - return t && t == 1 << intlog2 (t); -} - -void -set_music_properties (Music *p, SCM a) +SCM +make_duration (SCM d, int dots) { - for (SCM k = a; scm_is_pair (k); k = scm_cdr (k)) - p->set_property (scm_caar (k), scm_cdar (k)); + int t = scm_to_int (d); + if (t > 0 && (t & (t-1)) == 0) + return Duration (intlog2 (t), dots).smobbed_copy (); + else + return SCM_UNDEFINED; } - SCM -make_chord_step (int step, Rational alter) +make_chord_step (SCM step_scm, Rational alter) { + int step = scm_to_int (step_scm); + if (step == 7) alter += FLAT_ALTERATION; @@ -2508,42 +3887,24 @@ make_chord_step (int step, Rational alter) SCM -make_chord_elements (SCM pitch, SCM dur, SCM modification_list) +make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list) { SCM chord_ctor = ly_lily_module_constant ("construct-chord-elements"); - return scm_call_3 (chord_ctor, pitch, dur, modification_list); -} - - -/* Todo: actually also use apply iso. call too ... */ -bool -ly_input_procedure_p (SCM x) -{ - return ly_is_procedure (x) - || (scm_is_pair (x) && ly_is_procedure (scm_car (x))); -} - -SCM -make_music_relative (Pitch start, SCM music, Input loc) -{ - Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic", loc); - relative->set_property ("element", music); - - Music *m = unsmob_music (music); - Pitch last = m->to_relative_octave (start); - if (lily_1_8_relative) - m->set_property ("last-pitch", last.smobbed_copy ()); - return relative->unprotect (); + SCM res = scm_call_3 (chord_ctor, pitch, dur, modification_list); + for (SCM s = res; scm_is_pair (s); s = scm_cdr (s)) + { + unsmob_music (scm_car (s))->set_spot (loc); + } + return res; } int -yylex (YYSTYPE *s, YYLTYPE *loc, void *v) +yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser) { - Lily_parser *pars = (Lily_parser*) v; - Lily_lexer *lex = pars->lexer_; + Lily_lexer *lex = parser->lexer_; - lex->lexval = (void*) s; - lex->lexloc = loc; + lex->lexval_ = s; + lex->lexloc_ = loc; lex->prepare_for_next_token (); return lex->yylex (); }