/*
- 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 <hanwen@xs4all.nl>
+ Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
+
+ 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 <http://www.gnu.org/licenses/>.
*/
%{
deleting them. Let's hope that a stack overflow doesnt trigger a move
of the parse stack onto the heap. */
-%left PREC_TOP
-%left ADDLYRICS
%left PREC_BOT
+%nonassoc REPEAT
+%nonassoc ALTERNATIVE
-%expect 1
-
-/* One shift/reduce problem
+/* The above precedences tackle the shift/reduce problem
1. \repeat
\repeat .. \alternative
or
- \repeat { \repeat } \alternative
+ \repeat { \repeat } \alternative
*/
+%right FUNCTION_ARGUMENTS
+ MARKUP LYRICS_STRING MARKUP_IDENTIFIER STRING STRING_IDENTIFIER
+ MARKUPLIST WITH CONTEXT_MOD_IDENTIFIER MARKUPLIST_IDENTIFIER
+ SCORE BOOK BOOKPART PAPER LAYOUT MIDI
+ SEQUENTIAL SIMULTANEOUS DOUBLE_ANGLE_OPEN MUSIC_IDENTIFIER '{'
+ PITCH_IDENTIFIER NOTENAME_PITCH TONICNAME_PITCH
+ SCM_FUNCTION SCM_IDENTIFIER SCM_TOKEN
+ UNSIGNED DURATION_IDENTIFIER
+ CHORDMODE CHORDS DRUMMODE DRUMS FIGUREMODE FIGURES LYRICMODE LYRICS
+ NOTEMODE
+ CONTEXT TIMES NEWCONTEXT
+
+ /* The above are the symbols that can start function arguments */
+
+%left ADDLYRICS
+%left PREC_TOP
+
+
+
%pure_parser
%locations
#include "book.hh"
#include "context-def.hh"
+#include "context-mod.hh"
#include "dimensions.hh"
#include "file-path.hh"
#include "input.hh"
#include "main.hh"
#include "misc.hh"
#include "music.hh"
-#include "music.hh"
#include "output-def.hh"
#include "paper-book.hh"
-#include "program-option.hh"
#include "scm-hash.hh"
#include "score.hh"
#include "text-interface.hh"
#include "warn.hh"
+#define MYBACKUP(Token, Value, Location) \
+ do \
+ if (yychar == YYEMPTY) \
+ PARSER->lexer_->push_extra_token (Token, Value); \
+ else \
+ PARSER->parser_error \
+ (Location, _("cannot backup token")); \
+ while (0)
+
%}
scm_apply_0 (proc, args)
/* Syntactic Sugar. */
#define MAKE_SYNTAX(name, location, ...) \
- LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (PARSER->self_scm (), make_input (location), __VA_ARGS__, SCM_UNDEFINED));
+ LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (PARSER->self_scm (), make_input (location), ##__VA_ARGS__, SCM_UNDEFINED));
+#define START_MAKE_SYNTAX(name, ...) \
+ scm_list_n (ly_lily_module_constant (name), ##__VA_ARGS__, SCM_UNDEFINED)
+#define FINISH_MAKE_SYNTAX(start, location, ...) \
+ LOWLEVEL_MAKE_SYNTAX (scm_car (start), scm_cons2 (PARSER->self_scm (), make_input (location), scm_append_x (scm_list_2 (scm_cdr (start), scm_list_n (__VA_ARGS__, SCM_UNDEFINED)))))
SCM get_next_unique_context_id ();
SCM get_next_unique_lyrics_context_id ();
static Music *make_music_with_input (SCM name, Input where);
-SCM make_music_relative (Pitch start, SCM music, Input loc);
-SCM run_music_function (Lily_parser *, SCM expr);
+SCM check_scheme_arg (Lily_parser *parser, Input loc, SCM fallback,
+ SCM arg, SCM args, SCM pred);
+SCM loc_on_music (Input loc, SCM arg);
SCM get_first_context_id (SCM type, Music *m);
SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list);
SCM make_chord_step (int step, Rational alter);
SCM make_simple_markup (SCM a);
+SCM try_unpack_lyrics (SCM pred, SCM arg);
bool is_duration (int t);
bool is_regular_identifier (SCM id);
bool ly_input_procedure_p (SCM x);
FIXME: Bison needs to translate some of these, eg, STRING.
-*/
-
+*/
+
/* Keyword tokens with plain escaped name. */
%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"
%token FIGURES "\\figures"
%token GROBDESCRIPTIONS "\\grobdescriptions"
%token HEADER "\\header"
-%token INVALID "\\invalid"
+%token INVALID "\\version-error"
%token KEY "\\key"
%token LAYOUT "\\layout"
%token LYRICMODE "\\lyricmode"
%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"
%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"
%token MULTI_MEASURE_REST
-%token <i> DIGIT
%token <i> E_UNSIGNED
%token <i> UNSIGNED
/* Artificial tokens, for more generic function syntax */
-%token <i> EXPECT_MARKUP;
-%token <i> EXPECT_MUSIC;
-%token <i> EXPECT_SCM;
+%token <i> EXPECT_MARKUP "markup?"
+%token <i> EXPECT_PITCH "ly:pitch?"
+%token <i> EXPECT_DURATION "ly:duration?"
+%token <scm> EXPECT_SCM "scheme?"
+%token <scm> SKIPPED_SCM "(scheme?)"
+%token <i> EXPECT_MARKUP_LIST "markup-list?"
+%token <scm> EXPECT_OPTIONAL "optional?"
/* After the last argument. */
%token <i> EXPECT_NO_MORE_ARGS;
+/* An artificial token for parsing embedded Lilypond */
+%token <i> EMBEDDED_LILY "#{"
+
%token <scm> BOOK_IDENTIFIER
%token <scm> CHORDMODIFIER_PITCH
%token <scm> CHORD_MODIFIER
+%token <scm> CHORD_REPETITION
%token <scm> CONTEXT_DEF_IDENTIFIER
+%token <scm> CONTEXT_MOD_IDENTIFIER
%token <scm> DRUM_PITCH
+%token <scm> PITCH_IDENTIFIER
%token <scm> DURATION_IDENTIFIER
%token <scm> EVENT_IDENTIFIER
+%token <scm> EVENT_FUNCTION
%token <scm> FRACTION
%token <scm> LYRICS_STRING
%token <scm> LYRIC_MARKUP_IDENTIFIER
-%token <scm> MARKUP_HEAD_EMPTY
-%token <scm> MARKUP_HEAD_LIST0
-%token <scm> MARKUP_HEAD_MARKUP0
-%token <scm> MARKUP_HEAD_MARKUP0_MARKUP1
-%token <scm> MARKUP_HEAD_SCM0
-%token <scm> MARKUP_HEAD_SCM0_MARKUP1
-%token <scm> MARKUP_HEAD_SCM0_SCM1
-%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2
-%token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
+%token <scm> MARKUP_FUNCTION
+%token <scm> MARKUP_LIST_FUNCTION
%token <scm> MARKUP_IDENTIFIER
+%token <scm> MARKUPLIST_IDENTIFIER
%token <scm> MUSIC_FUNCTION
%token <scm> MUSIC_IDENTIFIER
%token <scm> NOTENAME_PITCH
%token <scm> OUTPUT_DEF_IDENTIFIER
%token <scm> REAL
%token <scm> RESTNAME
+%token <scm> SCM_FUNCTION
%token <scm> SCM_IDENTIFIER
%token <scm> SCM_TOKEN
%token <scm> SCORE_IDENTIFIER
%type <book> book_block
%type <book> book_body
+%type <book> bookpart_block
+%type <book> bookpart_body
%type <i> bare_unsigned
%type <scm> figured_bass_alteration
/* Music */
%type <scm> composite_music
%type <scm> grouped_music_list
+%type <scm> braced_music_list
+%type <scm> closed_music
%type <scm> music
-%type <scm> prefix_composite_music
+%type <scm> music_bare
+%type <scm> complex_music
+%type <scm> complex_music_prefix
+%type <scm> mode_changed_music
%type <scm> repeated_music
%type <scm> sequential_music
%type <scm> simple_music
%type <scm> chord_body_element
%type <scm> command_element
%type <scm> command_event
+%type <scm> context_modification
%type <scm> context_change
%type <scm> direction_less_event
%type <scm> direction_reqd_event
+%type <scm> embedded_lilypond
%type <scm> event_chord
+%type <scm> fingering
%type <scm> gen_text_def
%type <scm> music_property_def
%type <scm> note_chord_element
%type <scm> post_event
+%type <scm> post_event_nofinger
%type <scm> re_rhythmed_music
-%type <scm> relative_music
%type <scm> simple_element
%type <scm> simple_music_property_def
+%type <scm> start_symbol
%type <scm> string_number_event
%type <scm> tempo_event
%type <outputdef> output_def_head
%type <outputdef> output_def_head_with_mode_switch
%type <outputdef> output_def
-%type <outputdef> paper_block
+%type <outputdef> paper_block
-%type <scm> alternative_music
-%type <scm> generic_prefix_music_scm
+%type <scm> music_function_call
%type <scm> music_list
-%type <scm> absolute_pitch
%type <scm> assignment_id
%type <scm> bare_number
%type <scm> unsigned_number
%type <scm> direction_less_char
%type <scm> duration_length
%type <scm> embedded_scm
+%type <scm> embedded_scm_arg
+%type <scm> embedded_scm_arg_closed
+%type <scm> embedded_scm_bare
+%type <scm> embedded_scm_bare_arg
+%type <scm> embedded_scm_closed
+%type <scm> embedded_scm_chord_body
+%type <scm> embedded_scm_event
+%type <scm> event_function_event
%type <scm> figure_list
%type <scm> figure_spec
%type <scm> fraction
%type <scm> full_markup
-%type <scm> function_scm_argument
+%type <scm> full_markup_list
%type <scm> function_arglist
-%type <scm> function_arglist_music_last
-%type <scm> function_arglist_nonmusic_last
-%type <scm> function_arglist_nonmusic
+%type <scm> function_arglist_optional
+%type <scm> function_arglist_keep
+%type <scm> function_arglist_bare
+%type <scm> function_arglist_closed
+%type <scm> function_arglist_closed_optional
+%type <scm> function_arglist_closed_keep
%type <scm> identifier_init
+%type <scm> lilypond
%type <scm> lilypond_header
%type <scm> lilypond_header_body
%type <scm> lyric_element
%type <scm> lyric_markup
%type <scm> markup
%type <scm> markup_braced_list
-%type <scm> markup_braced_list_body
+%type <scm> markup_braced_list_body
%type <scm> markup_composed_list
+%type <scm> markup_command_list
+%type <scm> markup_command_list_arguments
+%type <scm> markup_command_basic_arguments
%type <scm> markup_head_1_item
%type <scm> markup_head_1_list
%type <scm> markup_list
%type <scm> mode_changing_head
%type <scm> mode_changing_head_with_context
%type <scm> multiplied_duration
-%type <scm> music_function_identifier_musicless_prefix
%type <scm> music_function_event
+%type <scm> music_function_event_arglist
%type <scm> music_function_chord_body
+%type <scm> music_function_chord_body_arglist
%type <scm> new_chord
%type <scm> new_lyrics
%type <scm> number_expression
%type <scm> number_factor
%type <scm> number_term
-%type <scm> object_id_setting
%type <scm> octave_check
%type <scm> optional_context_mod
%type <scm> optional_id
%type <scm> property_operation
%type <scm> property_path property_path_revved
%type <scm> scalar
+%type <scm> scalar_bare
+%type <scm> scalar_closed
+%type <scm> scm_function_call
+%type <scm> scm_function_call_closed
%type <scm> script_abbreviation
%type <scm> simple_chord_elements
%type <scm> simple_markup
%type <scm> steno_pitch
%type <scm> steno_tonic_pitch
%type <scm> step_number
-%type <scm> step_numbers
+%type <scm> step_numbers
%type <scm> string
+%type <scm> tempo_range
%type <score> score_block
%type <score> score_body
%%
-lilypond: /* empty */
+start_symbol:
+ lilypond
+ | EMBEDDED_LILY {
+ SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames");
+ PARSER->lexer_->push_note_state (alist_to_hashq (nn));
+ } embedded_lilypond {
+ PARSER->lexer_->pop_state ();
+ PARSER->lexer_->set_identifier (ly_symbol2scm ("parseStringResult"), $3);
+ }
+ ;
+
+lilypond: /* empty */ { }
| lilypond toplevel_expression {
}
| lilypond assignment {
;
-object_id_setting:
- OBJECTID STRING { $$ = $2; }
- ;
-
toplevel_expression:
lilypond_header {
PARSER->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
scm_call_2 (proc, PARSER->self_scm (), book->self_scm ());
book->unprotect ();
}
+ | bookpart_block {
+ Book *bookpart = $1;
+ SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-bookpart-handler");
+ scm_call_2 (proc, PARSER->self_scm (), bookpart->self_scm ());
+ bookpart->unprotect ();
+ }
| 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_call_2 (proc, PARSER->self_scm (), music->self_scm ());
}
| full_markup {
+ 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);
}
}
;
-embedded_scm:
+embedded_scm_bare:
SCM_TOKEN
| SCM_IDENTIFIER
;
+embedded_scm_bare_arg:
+ embedded_scm_bare
+ | STRING
+ | STRING_IDENTIFIER
+ | full_markup
+ | full_markup_list
+ | context_modification
+ | score_block
+ {
+ $$ = $1->self_scm ();
+ $1->unprotect ();
+ }
+ | context_def_spec_block
+ | book_block
+ {
+ $$ = $1->self_scm ();
+ $1->unprotect ();
+ }
+ | bookpart_block
+ {
+ $$ = $1->self_scm ();
+ $1->unprotect ();
+ }
+ | output_def
+ {
+ $$ = $1->self_scm ();
+ $1->unprotect ();
+ }
+ ;
+
+/* The generic version may end in music, or not */
+
+embedded_scm:
+ embedded_scm_bare
+ | scm_function_call
+ ;
+
+embedded_scm_arg:
+ embedded_scm_bare_arg
+ | scm_function_call
+ | music
+ ;
+
+scm_function_call:
+ SCM_FUNCTION function_arglist {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
+ }
+ ;
+
+embedded_lilypond:
+ /* empty */
+ {
+ $$ = MAKE_SYNTAX ("void-music", @$);
+ }
+ | identifier_init
+ | music music music_list {
+ $$ = MAKE_SYNTAX ("sequential-music", @$,
+ scm_cons2 ($1, $2, scm_reverse_x ($3, SCM_EOL)));
+ }
+ | error {
+ PARSER->error_level_ = 1;
+ }
+ | INVALID embedded_lilypond {
+ PARSER->error_level_ = 1;
+ }
+ ;
+
lilypond_header_body:
{
PARSER->lexer_->add_scope ($$);
}
| lilypond_header_body assignment {
-
+
}
;
assignment:
assignment_id '=' identifier_init {
PARSER->lexer_->set_identifier ($1, $3);
-
+ }
+ | assignment_id property_path '=' identifier_init {
+ SCM path = scm_cons (scm_string_to_symbol ($1), $2);
+ PARSER->lexer_->set_identifier (path, $4);
+ ;
/*
TODO: devise standard for protection in parser.
$$ = $1->self_scm ();
$1->unprotect ();
}
+ | bookpart_block {
+ $$ = $1->self_scm ();
+ $1->unprotect ();
+ }
| output_def {
$$ = $1->self_scm ();
$1->unprotect ();
else
$$ = MAKE_SYNTAX ("event-chord", @$, scm_list_1 ($1));
}
- | post_event {
+ | post_event_nofinger {
$$ = $1;
}
| number_expression {
| full_markup {
$$ = $1;
}
- | DIGIT {
- $$ = scm_from_int ($1);
+ | full_markup_list {
+ $$ = $1;
}
+ | context_modification {
+ $$ = $1;
+ }
;
context_def_spec_block:
}
}
| context_def_spec_body context_mod {
- unsmob_context_def ($$)->add_context_mod ($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));
+ }
}
;
book_block:
BOOK '{' book_body '}' {
$$ = $3;
+ pop_paper (PARSER);
+ PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-book"), SCM_BOOL_F);
}
;
book_body:
{
$$ = new Book;
+ init_papers (PARSER);
$$->origin ()->set_spot (@$);
$$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (PARSER->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
$$->paper_->unprotect ();
- $$->header_ = PARSER->lexer_->lookup_identifier ("$defaultheader");
+ push_paper (PARSER, $$->paper_);
+ $$->header_ = PARSER->lexer_->lookup_identifier ("$defaultheader");
+ PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $$->self_scm ());
+ PARSER->lexer_->set_identifier (ly_symbol2scm ("book-output-suffix"), SCM_BOOL_F);
+ PARSER->lexer_->set_identifier (ly_symbol2scm ("book-filename"), SCM_BOOL_F);
}
| 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 ();
+ set_paper (PARSER, $2);
+ }
+ | book_body bookpart_block {
+ Book *bookpart = $2;
+ SCM proc = PARSER->lexer_->lookup_identifier ("book-bookpart-handler");
+ scm_call_2 (proc, $$->self_scm (), bookpart->self_scm ());
+ bookpart->unprotect ();
}
| book_body score_block {
- SCM s = $2->self_scm ();
- $$->add_score (s);
- $2->unprotect();
+ Score *score = $2;
+ SCM proc = PARSER->lexer_->lookup_identifier ("book-score-handler");
+ scm_call_2 (proc, $$->self_scm (), score->self_scm ());
+ score->unprotect ();
+ }
+ | 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 ());
}
| book_body full_markup {
- $$->add_score ($2);
+ SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler");
+ scm_call_2 (proc, $$->self_scm (), scm_list_1 ($2));
+ }
+ | book_body full_markup_list {
+ SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler");
+ scm_call_2 (proc, $$->self_scm (), $2);
}
| book_body lilypond_header {
$$->header_ = $2;
}
+ | book_body embedded_scm { }
| book_body error {
$$->paper_ = 0;
$$->scores_ = SCM_EOL;
+ $$->bookparts_ = SCM_EOL;
}
- | book_body object_id_setting {
- $$->user_key_ = ly_scm2string ($2);
+ ;
+
+bookpart_block:
+ BOOKPART '{' bookpart_body '}' {
+ $$ = $3;
+ PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), SCM_BOOL_F);
+ }
+ ;
+
+bookpart_body:
+ {
+ $$ = new Book;
+ $$->origin ()->set_spot (@$);
+ PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $$->self_scm ());
+ }
+ | BOOK_IDENTIFIER {
+ $$ = unsmob_book ($1);
+ $$->protect ();
+ $$->origin ()->set_spot (@$);
+ PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $1);
+ }
+ | bookpart_body paper_block {
+ $$->paper_ = $2;
+ $2->unprotect ();
+ }
+ | bookpart_body score_block {
+ Score *score = $2;
+ SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-score-handler");
+ scm_call_2 (proc, $$->self_scm (), score->self_scm ());
+ score->unprotect ();
+ }
+ | bookpart_body composite_music {
+ Music *music = unsmob_music ($2);
+ SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-music-handler");
+ scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ());
+ }
+ | bookpart_body full_markup {
+ SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-text-handler");
+ scm_call_2 (proc, $$->self_scm (), scm_list_1 ($2));
+ }
+ | bookpart_body full_markup_list {
+ SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-text-handler");
+ scm_call_2 (proc, $$->self_scm (), $2);
+ }
+ | bookpart_body lilypond_header {
+ $$->header_ = $2;
+ }
+ | bookpart_body embedded_scm { }
+ | bookpart_body error {
+ $$->paper_ = 0;
+ $$->scores_ = SCM_EOL;
}
;
$$->protect ();
$$->origin ()->set_spot (@$);
}
- | score_body object_id_setting {
- $$->user_key_ = ly_scm2string ($2);
- }
| score_body lilypond_header {
- $$->header_ = $2;
+ $$->set_header ($2);
}
| score_body output_def {
if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T)
{
PARSER->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead"));
-
+
}
else
{
;
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_closed steno_duration '=' tempo_range {
+ $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, $5);
+ }
+ | TEMPO scalar {
+ $$ = MAKE_SYNTAX ("tempo", @$, $2);
+ }
;
/*
-The representation of a list is the
-
- (LIST . LAST-CONS)
-
- to have efficient append. */
+The representation of a list is reversed to have efficient append. */
music_list:
/* empty */ {
- $$ = scm_cons (SCM_EOL, SCM_EOL);
+ $$ = SCM_EOL;
}
| music_list music {
- SCM s = $$;
- SCM c = scm_cons ($2, SCM_EOL);
-
- if (scm_is_pair (scm_cdr (s)))
- scm_set_cdr_x (scm_cdr (s), c); /* append */
- else
- scm_set_car_x (s, c); /* set first cons */
- scm_set_cdr_x (s, c); /* remember last cell */
+ $$ = scm_cons ($2, $1);
}
| music_list embedded_scm {
}
| 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
- ;
-
-alternative_music:
- /* empty */ {
- $$ = SCM_EOL;
- }
- | ALTERNATIVE '{' music_list '}' {
- $$ = scm_car ($3);
- }
+ | composite_music %prec FUNCTION_ARGUMENTS
;
repeated_music:
- REPEAT simple_string unsigned_number music alternative_music
+ REPEAT simple_string unsigned_number music
{
- $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $5);
+ $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, SCM_EOL);
+ }
+ | REPEAT simple_string unsigned_number music ALTERNATIVE braced_music_list
+ {
+ $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $6);
}
;
sequential_music:
- SEQUENTIAL '{' music_list '}' {
- $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($3));
+ SEQUENTIAL braced_music_list {
+ $$ = MAKE_SYNTAX ("sequential-music", @$, $2);
}
- | '{' music_list '}' {
- $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($2));
+ | braced_music_list {
+ $$ = MAKE_SYNTAX ("sequential-music", @$, $1);
}
;
simultaneous_music:
- SIMULTANEOUS '{' music_list '}'{
- $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($3));
+ SIMULTANEOUS braced_music_list {
+ $$ = MAKE_SYNTAX ("simultaneous-music", @$, $2);
}
| DOUBLE_ANGLE_OPEN music_list DOUBLE_ANGLE_CLOSE {
- $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($2));
+ $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_reverse_x ($2, SCM_EOL));
}
;
simple_music:
event_chord
- | MUSIC_IDENTIFIER
| music_property_def
| context_change
;
+context_modification:
+ WITH { PARSER->lexer_->push_initial_state (); } '{' context_mod_list '}'
+ {
+ PARSER->lexer_->pop_state ();
+ $$ = $4;
+ }
+ | WITH CONTEXT_MOD_IDENTIFIER
+ {
+ $$ = $2;
+ }
+ | CONTEXT_MOD_IDENTIFIER
+ {
+ $$ = $1;
+ }
+ ;
+
optional_context_mod:
- /**/ { $$ = SCM_EOL; }
- | WITH { PARSER->lexer_->push_initial_state (); }
- '{' context_mod_list '}'
- {
- PARSER->lexer_->pop_state ();
- $$ = $4;
- }
- ;
+ /**/ {
+ $$ = SCM_EOL;
+ }
+ | context_modification
+ {
+ $$ = $1;
+ }
+ ;
context_mod_list:
- /* */ { $$ = SCM_EOL; }
- | context_mod_list context_mod {
- $$ = scm_cons ($2, $1);
+ /**/ {
+ $$ = Context_mod ().smobbed_copy ();
+ }
+ | context_mod_list context_mod {
+ 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 ());
+ }
+ ;
+
+composite_music:
+ 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);
}
;
-composite_music:
- prefix_composite_music { $$ = $1; }
- | grouped_music_list { $$ = $1; }
+music_bare:
+ mode_changed_music
+ | MUSIC_IDENTIFIER
+ | grouped_music_list
;
grouped_music_list:
| sequential_music { $$ = $1; }
;
-function_scm_argument:
- embedded_scm
- | simple_string
+/* An argument list. If a function \foo expects scm scm pitch, then the lexer expands \foo into the token sequence:
+ MUSIC_FUNCTION EXPECT_PITCH EXPECT_SCM EXPECT_SCM EXPECT_NO_MORE_ARGS
+and this rule returns the reversed list of arguments. */
+
+
+function_arglist:
+ function_arglist_bare
+ | EXPECT_SCM function_arglist_optional embedded_scm_arg
+ {
+ $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+ $3, $2, $1);
+ }
+ | EXPECT_SCM function_arglist_optional SKIPPED_SCM
+ {
+ $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+ $3, $2, $1);
+ }
;
-/* 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_optional:
+ function_arglist_keep %prec FUNCTION_ARGUMENTS
+ | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_optional
+ {
+ $$ = scm_cons ($1, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_optional
+ {
+ $$ = scm_cons ($1, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_optional
+ {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ }
+ ;
-function_arglist_music_last:
- EXPECT_MUSIC function_arglist music {
- $$ = scm_cons ($3, $2);
+function_arglist_keep:
+ EXPECT_OPTIONAL EXPECT_PITCH function_arglist_keep pitch_also_in_chords {
+ $$ = scm_cons ($4, $3);
}
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_keep duration_length {
+ $$ = scm_cons ($4, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep embedded_scm_arg_closed
+ {
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ {
+ $$ = scm_cons ($4, $3);
+ } else {
+ $$ = try_unpack_lyrics ($2, $4);
+ if (!SCM_UNBNDP ($$))
+ $$ = scm_cons ($$, $3);
+ else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (SKIPPED_SCM, $4, @4);
+ }
+ }
+ }
+ | function_arglist
;
-function_arglist_nonmusic_last:
- EXPECT_MARKUP function_arglist full_markup {
- $$ = scm_cons ($3, $2);
+
+function_arglist_closed:
+ function_arglist_bare
+ | EXPECT_SCM function_arglist_optional embedded_scm_arg_closed
+ {
+ $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+ $3, $2, $1);
}
- | EXPECT_SCM function_arglist function_scm_argument {
- $$ = scm_cons ($3, $2);
+ | EXPECT_SCM function_arglist_optional SKIPPED_SCM
+ {
+ $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+ $3, $2, $1);
}
;
-function_arglist_nonmusic: EXPECT_NO_MORE_ARGS {
- $$ = SCM_EOL;
+function_arglist_closed_optional:
+ function_arglist_closed_keep %prec FUNCTION_ARGUMENTS
+ | EXPECT_OPTIONAL EXPECT_PITCH function_arglist_closed_optional
+ {
+ $$ = scm_cons ($1, $3);
}
- | EXPECT_MARKUP function_arglist_nonmusic full_markup {
- $$ = scm_cons ($3, $2);
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_optional
+ {
+ $$ = scm_cons ($1, $3);
}
- | EXPECT_SCM function_arglist_nonmusic function_scm_argument {
- $$ = scm_cons ($3, $2);
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_optional
+ {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ }
+ ;
+
+function_arglist_closed_keep:
+ EXPECT_OPTIONAL EXPECT_PITCH function_arglist_keep pitch_also_in_chords {
+ $$ = scm_cons ($4, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_keep duration_length {
+ $$ = scm_cons ($4, $3);
+ }
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep embedded_scm_arg_closed
+ {
+ if (scm_is_true (scm_call_1 ($2, $4)))
+ {
+ $$ = scm_cons ($4, $3);
+ } else {
+ $$ = try_unpack_lyrics ($2, $4);
+ if (!SCM_UNBNDP ($$))
+ $$ = scm_cons ($$, $3);
+ else {
+ $$ = scm_cons (loc_on_music (@3, $1), $3);
+ MYBACKUP (SKIPPED_SCM, $4, @4);
+ }
+ }
+ }
+ | function_arglist_closed
+ ;
+
+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);
}
;
-function_arglist: EXPECT_NO_MORE_ARGS {
- /* This is for 0-ary functions, so they don't need to
- read a lookahead token */
+function_arglist_bare:
+ EXPECT_NO_MORE_ARGS {
$$ = SCM_EOL;
}
- | function_arglist_music_last
- | function_arglist_nonmusic_last
+ | EXPECT_PITCH function_arglist_optional pitch_also_in_chords {
+ $$ = scm_cons ($3, $2);
+ }
+ | EXPECT_DURATION function_arglist_closed_optional duration_length {
+ $$ = scm_cons ($3, $2);
+ }
;
-generic_prefix_music_scm:
+music_function_call:
MUSIC_FUNCTION function_arglist {
- $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
}
;
| '=' simple_string {
$$ = $2;
}
- ;
+ ;
+complex_music:
+ music_function_call
+ | repeated_music { $$ = $1; }
+ | re_rhythmed_music { $$ = $1; }
+ | complex_music_prefix music
+ {
+ $$ = FINISH_MAKE_SYNTAX ($1, @$, $2);
+ }
+ ;
-prefix_composite_music:
- generic_prefix_music_scm {
- $$ = run_music_function (PARSER, $1);
+complex_music_prefix:
+ CONTEXT simple_string optional_id optional_context_mod {
+ Context_mod *ctxmod = unsmob_context_mod ($4);
+ SCM mods = SCM_EOL;
+ if (ctxmod)
+ mods = ctxmod->get_mods ();
+ $$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_F);
}
- | 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 {
+ 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);
}
- | NEWCONTEXT simple_string optional_id optional_context_mod music {
- $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_T);
+ | TIMES fraction {
+ $$ = START_MAKE_SYNTAX ("time-scaled-music", $2);
}
+ ;
- | TIMES fraction music {
- $$ = MAKE_SYNTAX ("time-scaled-music", @$, $2, $3);
- }
- | repeated_music { $$ = $1; }
- | TRANSPOSE pitch_also_in_chords pitch_also_in_chords music {
- Pitch from = *unsmob_pitch ($2);
- Pitch to = *unsmob_pitch ($3);
- SCM pitch = pitch_interval (from, to).smobbed_copy ();
- $$ = MAKE_SYNTAX ("transpose-music", @$, pitch, $4);
- }
- | mode_changing_head grouped_music_list {
+mode_changed_music:
+ mode_changing_head grouped_music_list {
if ($1 == ly_symbol2scm ("chords"))
{
$$ = MAKE_SYNTAX ("unrelativable-music", @$, $2);
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 ();
}
- | 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));
$$ = ly_symbol2scm ("notes");
}
- | DRUMMODE
+ | DRUMMODE
{
SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames");
PARSER->lexer_->push_note_state (alist_to_hashq (nn));
}
;
-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));
}
;
-
-relative_music:
- RELATIVE absolute_pitch music {
- Pitch start = *unsmob_pitch ($2);
- $$ = make_music_relative (start, $3, @$);
- }
- | RELATIVE composite_music {
- Pitch middle_c (0, 0, 0);
- $$ = make_music_relative (middle_c, $2, @$);
- }
- ;
-
new_lyrics:
ADDLYRICS { PARSER->lexer_->push_lyric_state (); }
/*cont */
- grouped_music_list {
+ composite_music {
/* Can also use music at the expensive of two S/Rs similar to
\repeat \alternative */
PARSER->lexer_->pop_state ();
}
| new_lyrics ADDLYRICS {
PARSER->lexer_->push_lyric_state ();
- } grouped_music_list {
+ } 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 FUNCTION_ARGUMENTS
| LYRICSTO simple_string {
PARSER->lexer_->push_lyric_state ();
} music {
property_path_revved:
- embedded_scm {
+ embedded_scm_closed {
$$ = scm_cons ($1, SCM_EOL);
}
- | property_path_revved embedded_scm {
+ | property_path_revved embedded_scm_closed {
$$ = scm_cons ($2, $1);
}
;
property_path:
property_path_revved {
$$ = scm_reverse_x ($1, SCM_EOL);
- }
+ }
;
property_operation:
$$ = scm_list_2 (ly_symbol2scm ("unset"),
scm_string_to_symbol ($2));
}
- | OVERRIDE simple_string property_path '=' embedded_scm {
+ | OVERRIDE simple_string property_path '=' scalar {
$$ = scm_append (scm_list_2 (scm_list_3 (ly_symbol2scm ("push"),
scm_string_to_symbol ($2), $5),
$3));
| context_def_mod STRING {
$$ = scm_list_2 ($1, $2);
}
+ | context_def_mod embedded_scm {
+ if (ly_symbol2scm ("consists") != $1)
+ {
+ $$ = SCM_EOL;
+ PARSER->parser_error (@1, _ ("only \\consists takes non-string argument."));
+ }
+ else
+ {
+ $$ = scm_list_2 ($1, $2);
+ }
+ }
;
context_prop_spec:
simple_music_property_def:
OVERRIDE context_prop_spec property_path '=' scalar {
- $$ = scm_append (scm_list_2 (scm_list_n (scm_car ($2),
+ $$ = scm_append (scm_list_2 (scm_list_n (scm_car ($2),
ly_symbol2scm ("OverrideProperty"),
scm_cadr ($2),
$5, SCM_UNDEFINED),
}
;
-scalar: string {
+scalar_bare:
+ string {
$$ = $1;
}
- | LYRICS_STRING {
+ | lyric_element {
$$ = $1;
}
| bare_number {
$$ = $1;
}
- | embedded_scm {
+ | embedded_scm_bare {
$$ = $1;
}
| full_markup {
$$ = $1;
}
- | DIGIT {
- $$ = scm_from_int ($1);
+ | full_markup_list
+ {
+ $$ = $1;
}
;
+scalar:
+ scalar_bare |
+ scm_function_call
+ ;
+
+scalar_closed:
+ scalar_bare |
+ scm_function_call_closed
+ ;
+
+
event_chord:
/* TODO: Create a special case that avoids the creation of
EventChords around simple_elements that have no post_events?
i.set_location (@1, @2);
$$ = MAKE_SYNTAX ("event-chord", i, elts);
}
+ | CHORD_REPETITION optional_notemode_duration post_events {
+ Input i;
+ i.set_location (@1, @3);
+ $$ = MAKE_SYNTAX ("repetition-chord", i,
+ PARSER->lexer_->chord_repetition_.last_chord_,
+ PARSER->lexer_->chord_repetition_.repetition_function_,
+ $2, scm_reverse_x ($3, SCM_EOL));
+ }
| 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));
}
| command_element
- | note_chord_element
+ /* note chord elements are memorized into
+ PARSER->lexer_->chord_repetition_ so that the chord repetition
+ mechanism copy them when a chord repetition symbol is found
+ */
+ | note_chord_element {
+ PARSER->lexer_->chord_repetition_.last_chord_ = $$;
+ }
;
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);
}
| 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)) {
}
$$ = n->unprotect ();
}
- | music_function_chord_body {
- $$ = run_music_function (PARSER, $1);
+ | music_function_chord_body
+ ;
+
+/* We can't accept a music argument, not even a closed one,
+ * immediately before chord_body_elements, otherwise a function \fun
+ * with a signature of two music arguments can't be sorted out
+ * properly in a construct like
+ * <\fun { c } \fun { c } c>
+ * The second call could be interpreted either as a chord constituent
+ * or a music expression.
+ */
+
+music_function_chord_body_arglist:
+ function_arglist_bare
+ | EXPECT_SCM music_function_chord_body_arglist embedded_scm_chord_body
+ {
+ $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+ $3, $2, $1);
}
;
-music_function_identifier_musicless_prefix: MUSIC_FUNCTION {
- SCM sig = scm_object_property (yylval.scm, ly_symbol2scm ("music-function-signature"));
- if (scm_is_pair (sig) && to_boolean (scm_memq (ly_music_p_proc, scm_cdr (scm_reverse (sig)))))
- {
- PARSER->parser_error (@$, "Music function applied to event may not have a Music argument, except as the last argument.");
- }
+embedded_scm_chord_body:
+ embedded_scm_bare_arg
+ | SCM_FUNCTION music_function_chord_body_arglist {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
}
+ | chord_body_element
+ | SKIPPED_SCM
;
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 music_function_chord_body_arglist {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
+ }
+ ;
+
+/* We could accept a closed music argument before the post events
+ * indicated by a trailing argument list. For symmetry with chord
+ * bodies and in order to avoid too tricky and complex behavior, we
+ * refrain from doing so.
+ */
+music_function_event_arglist:
+ function_arglist_bare
+ | EXPECT_SCM music_function_event_arglist embedded_scm_event
+ {
+ $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+ $3, $2, $1);
}
- | music_function_identifier_musicless_prefix function_arglist_nonmusic {
- $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
+ ;
+
+embedded_scm_event:
+ embedded_scm_bare_arg
+ | SCM_FUNCTION music_function_event_arglist {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
}
+ | post_event
+ | SKIPPED_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)));
+ MUSIC_FUNCTION music_function_event_arglist {
+ $$ = 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 music_function_event_arglist {
+ $$ = MAKE_SYNTAX ("music-function", @$,
+ $1, $2);
}
;
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_BACKSLASH {
- $$ = MAKE_SYNTAX ("voice-separator", @$, SCM_UNDEFINED);
+ $$ = MAKE_SYNTAX ("voice-separator", @$);
}
| '|' {
SCM pipe = PARSER->lexer_->lookup_identifier ("pipeSymbol");
$$ = m->unprotect ();
}
else
- $$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED);
+ $$ = MAKE_SYNTAX ("bar-check", @$);
}
- | 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);
+ $$ = MAKE_SYNTAX ("make-mark-set", @$, $2);
}
;
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));
$$ = scm_cons ($2, $$);
}
;
-
-post_event:
+
+post_event_nofinger:
direction_less_event {
$$ = $1;
}
- | '-' music_function_event {
- $$ = run_music_function (PARSER, $2);
+ | script_dir music_function_event {
+ $$ = $2;
+ if ($1)
+ {
+ unsmob_music ($$)->set_property ("direction", scm_from_int ($1));
+ }
}
| HYPHEN {
if (!PARSER->lexer_->is_lyric_state ())
| string_number_event
;
+post_event:
+ post_event_nofinger
+ | script_dir fingering {
+ if ($1)
+ {
+ Music *m = unsmob_music ($2);
+ m->set_property ("direction", scm_from_int ($1));
+ }
+ $$ = $2;
+ }
+ ;
+
string_number_event:
E_UNSIGNED {
Music *s = MY_MAKE_MUSIC ("StringNumberEvent", @$);
$$ = ly_symbol2scm ("bracketOpenSymbol");
}
| ']' {
- $$ = ly_symbol2scm ("bracketCloseSymbol");
+ $$ = ly_symbol2scm ("bracketCloseSymbol");
}
| '~' {
$$ = ly_symbol2scm ("tildeSymbol");
a->set_property ("tremolo-type", scm_from_int ($1));
$$ = a->unprotect ();
}
- ;
-
+ | event_function_event
+ ;
+
direction_reqd_event:
gen_text_def {
$$ = $1;
steno_pitch {
$$ = $1;
}
+ | PITCH_IDENTIFIER
;
pitch_also_in_chords:
make_simple_markup ($1));
$$ = t->unprotect ();
}
- | DIGIT {
+ ;
+
+fingering:
+ UNSIGNED {
Music *t = MY_MAKE_MUSIC ("FingeringEvent", @$);
t->set_property ("digit", scm_from_int ($1));
$$ = t->unprotect ();
| '-' { $$ = CENTER; }
;
-
-absolute_pitch:
- steno_pitch {
- $$ = $1;
- }
- ;
-
duration_length:
multiplied_duration {
$$ = $1;
| DURATION_IDENTIFIER dots {
Duration *d = unsmob_duration ($1);
Duration k (d->duration_log (), d->dot_count () + $2);
+ k = k.compressed (d->factor ());
*d = k;
$$ = $1;
}
;
bass_number:
- DIGIT {
- $$ = scm_from_int ($1);
- }
- | UNSIGNED {
+ UNSIGNED {
$$ = scm_from_int ($1);
}
| STRING { $$ = $1; }
{
m->set_property ("no-continuation", SCM_BOOL_T);
}
+ else if ($2 == ly_symbol2scm ("backslash"))
+ {
+ m->set_property ("augmented-slash", SCM_BOOL_T);
+ }
}
;
| '/' {
$$ = ly_symbol2scm ("slash");
}
+ | E_BACKSLASH {
+ $$ = ly_symbol2scm ("backslash");
+ }
;
br_bass_figure:
n = MY_MAKE_MUSIC ("RestEvent", @$);
else
n = MY_MAKE_MUSIC ("NoteEvent", @$);
-
+
n->set_property ("pitch", $1);
n->set_property ("duration", $5);
n->set_property ("duration", $2);
n->set_property ("drum-type", $1);
- $$ = n->unprotect ();
+ $$ = n->unprotect ();
}
| RESTNAME optional_notemode_duration {
Music *ev = 0;
}
else {
ev = MY_MAKE_MUSIC ("RestEvent", @$);
-
+
}
ev->set_property ("duration", $2);
$$ = ev->unprotect ();
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"));
unsmob_music (scm_car (s))->set_property ("duration", $2);
}
$$ = $1;
- }
+ }
;
lyric_element:
chord_items:
/**/ {
- $$ = SCM_EOL;
+ $$ = SCM_EOL;
}
| chord_items chord_item {
$$ = scm_cons ($2, $$);
| bare_unsigned CHORD_MINUS {
$$ = make_chord_step ($1, FLAT_ALTERATION);
}
- ;
+ ;
+
+tempo_range:
+ bare_unsigned {
+ $$ = scm_from_int ($1);
+ }
+ | bare_unsigned '~' bare_unsigned {
+ $$ = scm_cons (scm_from_int ($1), scm_from_int ($3));
+ }
+ ;
/*
UTILITIES
UNSIGNED {
$$ = $1;
}
- | DIGIT {
- $$ = $1;
- }
;
unsigned_number:
$$ = $1;
}
;
-
exclamations:
{ $$ = 0; }
}
;
+full_markup_list:
+ MARKUPLIST_IDENTIFIER {
+ $$ = $1;
+ }
+ | MARKUPLIST
+ { PARSER->lexer_->push_markup_state (); }
+ markup_list {
+ $$ = $3;
+ PARSER->lexer_->pop_state ();
+ }
+ ;
+
full_markup:
MARKUP_IDENTIFIER {
$$ = $1;
;
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_list:
- markup_composed_list {
+ MARKUPLIST_IDENTIFIER {
+ $$ = $1;
+ }
+ | markup_composed_list {
$$ = $1;
}
| markup_braced_list {
$$ = $1;
}
+ | markup_command_list {
+ $$ = scm_list_1 ($1);
+ }
;
markup_composed_list:
markup_head_1_list markup_braced_list {
$$ = scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, $2);
-
+
}
;
$$ = 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, SCM_UNDEFINED, $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));
}
;
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);
- }
- | MARKUP_HEAD_EMPTY {
- $$ = scm_list_1 ($1);
- }
- | MARKUP_HEAD_LIST0 markup_list {
- $$ = scm_list_2 ($1,$2);
- }
- | MARKUP_HEAD_MARKUP0_MARKUP1 markup markup {
- $$ = scm_list_3 ($1, $2, $3);
+ | MARKUP_FUNCTION markup_command_basic_arguments {
+ $$ = scm_cons ($1, scm_reverse_x ($2, SCM_EOL));
}
;
-
+
markup:
markup_head_1_list simple_markup {
SCM mapper = ly_lily_module_constant ("map-markup-command-list");
} 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;
+ *destination = def->self_scm ();
+ def->unprotect ();
+
+ return CONTEXT_DEF_IDENTIFIER;
+ } else if (unsmob_context_mod (sid)) {
+ *destination = unsmob_context_mod (sid)->smobbed_copy ();
+
+ return CONTEXT_MOD_IDENTIFIER;
} else if (unsmob_score (sid)) {
Score *score = new Score (*unsmob_score (sid));
*destination = score->self_scm ();
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;
if (is_lyric_state ())
return LYRIC_MARKUP_IDENTIFIER;
return MARKUP_IDENTIFIER;
+ } else if (Text_interface::is_markup_list (sid)) {
+ *destination = sid;
+ return MARKUPLIST_IDENTIFIER;
}
- return -1;
+ return -1;
}
SCM
return scm_from_locale_string (s);
}
-
-SCM
-run_music_function (Lily_parser *parser, SCM expr)
+SCM check_scheme_arg (Lily_parser *my_lily_parser, Input loc, SCM fallback,
+ SCM arg, SCM args, SCM pred)
{
- SCM func = scm_car (expr);
- Input *loc = unsmob_input (scm_cadr (expr));
- SCM args = scm_cddr (expr);
- SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature"));
-
- SCM type_check_proc = ly_lily_module_constant ("type-check-list");
+ SCM unwrap = SCM_UNDEFINED;
+ if (scm_is_true (scm_call_1 (pred, arg)))
+ return scm_cons (arg, args);
+ unwrap = try_unpack_lyrics (pred, arg);
+ if (!SCM_UNBNDP (unwrap))
+ return scm_cons (unwrap, args);
+ if (SCM_UNBNDP (fallback)) {
+ args = scm_cons (SCM_BOOL_F, args);
+ fallback = SCM_BOOL_F;
+ } else {
+ args = scm_cons (loc_on_music (loc, fallback), args);
+ fallback = SCM_CDR (scm_last_pair (args));
+ }
+ scm_set_cdr_x (scm_last_pair (args), SCM_EOL);
+ MAKE_SYNTAX ("argument-error", loc, scm_length (args), pred, arg);
+ scm_set_cdr_x (scm_last_pair (args), fallback);
+ return args;
+}
- if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr (expr), sig, args)))
+SCM loc_on_music (Input loc, SCM arg)
+{
+ if (Music *m = unsmob_music (arg))
{
- parser->error_level_ = 1;
- return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("void-music"), scm_list_2 (parser->self_scm (), make_input (*loc)));
+ m = m->clone ();
+ m->set_spot (loc);
+ return m->unprotect ();
}
-
- SCM syntax_args = scm_list_4 (parser->self_scm (), make_input (*loc), func, args);
- return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("music-function"), syntax_args);
+ return arg;
}
bool
return scm_call_3 (chord_ctor, pitch, dur, modification_list);
}
+SCM
+try_unpack_lyrics (SCM pred, SCM arg)
+{
+ if (Music *m = unsmob_music (arg))
+ if (m->is_mus_type ("lyric-event")) {
+ SCM text = m->get_property ("text");
+ if (scm_is_true (scm_call_1 (pred, text)))
+ return text;
+ }
+ return SCM_UNDEFINED;
+}
/* Todo: actually also use apply iso. call too ... */
bool
|| (scm_is_pair (x) && ly_is_procedure (scm_car (x)));
}
-SCM
-make_music_relative (Pitch start, SCM music, Input loc)
-{
- Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic", loc);
- relative->set_property ("element", music);
-
- Music *m = unsmob_music (music);
- Pitch last = m->to_relative_octave (start);
- if (lily_1_8_relative)
- m->set_property ("last-pitch", last.smobbed_copy ());
- return relative->unprotect ();
-}
-
int
yylex (YYSTYPE *s, YYLTYPE *loc, void *v)
{
Lily_parser *pars = (Lily_parser*) v;
Lily_lexer *lex = pars->lexer_;
- lex->lexval = (void*) s;
- lex->lexloc = loc;
+ lex->lexval_ = (void*) s;
+ lex->lexloc_ = loc;
lex->prepare_for_next_token ();
return lex->yylex ();
}
projects / lilypond.git / blobdiff