+/* -*- mode: c++; c-file-style: "linux" -*- */
/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
LilyPond is free software: you can redistribute it and/or modify
along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
+/* 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
%}
+%parse-param {Lily_parser *parser}
+%lex-param {Lily_parser *parser}
+
/* 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_BOT
#include "text-interface.hh"
#include "warn.hh"
+void
+Lily_parser::parser_error (Input const *i, Lily_parser *parser, 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); \
+ parser->lexer_->push_extra_token (Token, Value); \
+ parser->lexer_->push_extra_token (BACKUP); \
} else { \
- PARSER->parser_error \
+ parser->parser_error \
(Location, _("Too much lookahead")); \
} \
while (0)
do \
if (yychar == YYEMPTY) \
{ \
- PARSER->lexer_->push_extra_token (Token, Value); \
- PARSER->lexer_->push_extra_token (REPARSE, \
+ parser->lexer_->push_extra_token (Token, Value); \
+ parser->lexer_->push_extra_token (REPARSE, \
Pred); \
} else { \
- PARSER->parser_error \
+ parser->parser_error \
(Location, _("Too much lookahead")); \
} \
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)))))
+ 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 ();
SCM check_scheme_arg (Lily_parser *parser, Input loc,
SCM arg, SCM args, SCM pred);
SCM loc_on_music (Input loc, SCM arg);
-SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list);
+SCM make_chord_elements (Input loc, SCM pitch, SCM dur, SCM modification_list);
SCM make_chord_step (int step, Rational alter);
SCM make_simple_markup (SCM a);
bool is_duration (int t);
bool is_regular_identifier (SCM id);
-int yylex (YYSTYPE *s, YYLTYPE *loc, void *v);
+int yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser);
void set_music_properties (Music *p, SCM a);
%}
%type <scm> music
%type <scm> music_bare
%type <scm> music_arg
+%type <scm> music_assign
%type <scm> complex_music
%type <scm> complex_music_prefix
%type <scm> mode_changed_music
%type <scm> context_def_spec_block
%type <scm> context_def_spec_body
%type <scm> context_mod
+%type <scm> context_mod_arg
+%type <scm> context_mod_embedded
%type <scm> context_mod_list
%type <scm> context_prop_spec
%type <scm> direction_less_char
%type <scm> embedded_scm_bare
%type <scm> embedded_scm_bare_arg
%type <scm> embedded_scm_closed
-%type <scm> embedded_scm_chord_body
%type <scm> event_function_event
%type <scm> figure_list
%type <scm> figure_spec
%type <scm> markup_head_1_list
%type <scm> markup_list
%type <scm> markup_top
+%type <scm> maybe_notemode_duration
%type <scm> mode_changing_head
%type <scm> mode_changing_head_with_context
%type <scm> multiplied_duration
%type <scm> music_function_event
%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
start_symbol:
lilypond
| EMBEDDED_LILY {
- 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 (alist_to_hashq (nn));
} embedded_lilypond {
- PARSER->lexer_->pop_state ();
- PARSER->lexer_->set_identifier (ly_symbol2scm ("parseStringResult"), $3);
+ parser->lexer_->pop_state ();
+ parser->lexer_->set_identifier (ly_symbol2scm ("parseStringResult"), $3);
}
;
| lilypond assignment {
}
| lilypond error {
- PARSER->error_level_ = 1;
+ parser->error_level_ = 1;
}
| lilypond INVALID {
- PARSER->error_level_ = 1;
+ parser->error_level_ = 1;
}
;
toplevel_expression:
lilypond_header {
- PARSER->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
+ parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
}
| book_block {
Book *book = $1;
- SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-book-handler");
- scm_call_2 (proc, PARSER->self_scm (), book->self_scm ());
+ SCM proc = parser->lexer_->lookup_identifier ("toplevel-book-handler");
+ 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 ());
+ 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 ());
+ SCM proc = parser->lexer_->lookup_identifier ("toplevel-score-handler");
+ scm_call_2 (proc, parser->self_scm (), score->self_scm ());
score->unprotect ();
}
| 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 (), 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));
+ 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 proc = parser->lexer_->lookup_identifier ("toplevel-text-handler");
+ scm_call_2 (proc, parser->self_scm (), $1);
}
| output_def {
SCM id = SCM_EOL;
else if ($1->c_variable ("is-layout") == SCM_BOOL_T)
id = ly_symbol2scm ("$defaultlayout");
- PARSER->lexer_->set_identifier (id, od->self_scm ());
+ parser->lexer_->set_identifier (id, od->self_scm ());
od->unprotect();
}
;
embedded_scm_bare:
SCM_TOKEN
{
- $$ = PARSER->lexer_->eval_scm ($1);
+ $$ = parser->lexer_->eval_scm ($1);
}
| SCM_IDENTIFIER
;
scm_cons2 ($1, $2, scm_reverse_x ($3, SCM_EOL)));
}
| error {
- PARSER->error_level_ = 1;
+ parser->error_level_ = 1;
}
| INVALID embedded_lilypond {
- PARSER->error_level_ = 1;
+ parser->error_level_ = 1;
}
;
lilypond_header_body:
{
- $$ = get_header (PARSER);
- PARSER->lexer_->add_scope ($$);
+ $$ = get_header (parser);
+ parser->lexer_->add_scope ($$);
}
| lilypond_header_body assignment {
lilypond_header:
HEADER '{' lilypond_header_body '}' {
- $$ = PARSER->lexer_->remove_scope ();
+ $$ = parser->lexer_->remove_scope ();
}
;
assignment:
assignment_id '=' identifier_init {
- PARSER->lexer_->set_identifier ($1, $3);
+ 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);
+ parser->lexer_->set_identifier (path, $4);
;
/*
TODO: devise standard for protection in parser.
| 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;
- else
- $$ = MAKE_SYNTAX ("event-chord", @$, scm_list_1 ($1));
+ | music_assign {
+ $$ = $1;
}
| post_event_nofinger {
$$ = $1;
| number_expression {
$$ = $1;
}
+ | FRACTION {
+ $$ = $1;
+ }
| string {
$$ = $1;
}
}
;
+context_mod_arg:
+ embedded_scm
+ | composite_music
+ ;
+
+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_def_spec_body:
/**/ {
$$ = Context_def::make_scm ();
$$ = $1;
unsmob_context_def ($$)->origin ()->set_spot (@$);
}
- | context_def_spec_body embedded_scm {
- if (Context_mod *cm = unsmob_context_mod ($2)) {
- SCM p = cm->get_mods ();
- Context_def*td = unsmob_context_def ($$);
-
- for (; scm_is_pair (p); p = scm_cdr (p)) {
- td->add_context_mod (scm_car (p));
- }
- } else {
- PARSER->parser_error (@2, _ ("not a context mod"));
- }
- }
| context_def_spec_body context_mod {
unsmob_context_def ($$)->add_context_mod ($2);
}
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));
+ }
+ }
;
book_block:
BOOK '{' book_body '}' {
$$ = $3;
- pop_paper (PARSER);
- PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-book"), SCM_BOOL_F);
+ pop_paper (parser);
+ parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), SCM_BOOL_F);
}
;
book_body:
{
$$ = new Book;
- init_papers (PARSER);
+ init_papers (parser);
$$->origin ()->set_spot (@$);
- $$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (PARSER->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
+ $$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
$$->paper_->unprotect ();
- 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);
+ push_paper (parser, $$->paper_);
+ $$->header_ = parser->lexer_->lookup_identifier ("$defaultheader");
+ parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $$->self_scm ());
}
| BOOK_IDENTIFIER {
$$ = unsmob_book ($1);
$$->protect ();
$$->origin ()->set_spot (@$);
- PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $1);
+ parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $1);
}
| book_body paper_block {
$$->paper_ = $2;
$2->unprotect ();
- set_paper (PARSER, $2);
+ set_paper (parser, $2);
}
| book_body bookpart_block {
Book *bookpart = $2;
- SCM proc = PARSER->lexer_->lookup_identifier ("book-bookpart-handler");
+ SCM proc = parser->lexer_->lookup_identifier ("book-bookpart-handler");
scm_call_2 (proc, $$->self_scm (), bookpart->self_scm ());
bookpart->unprotect ();
}
| book_body score_block {
Score *score = $2;
- SCM proc = PARSER->lexer_->lookup_identifier ("book-score-handler");
+ 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 ());
+ 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 {
- SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler");
+ 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 proc = parser->lexer_->lookup_identifier ("book-text-handler");
scm_call_2 (proc, $$->self_scm (), $2);
}
| book_body lilypond_header {
bookpart_block:
BOOKPART '{' bookpart_body '}' {
$$ = $3;
- PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), SCM_BOOL_F);
+ parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), SCM_BOOL_F);
}
;
{
$$ = new Book;
$$->origin ()->set_spot (@$);
- PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $$->self_scm ());
+ 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);
+ parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $1);
}
| bookpart_body paper_block {
$$->paper_ = $2;
}
| bookpart_body score_block {
Score *score = $2;
- SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-score-handler");
+ 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 ());
+ 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 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 proc = parser->lexer_->lookup_identifier ("bookpart-text-handler");
scm_call_2 (proc, $$->self_scm (), $2);
}
| bookpart_body lilypond_header {
music {
SCM m = $1;
SCM scorify = ly_lily_module_constant ("scorify-music");
- SCM score = scm_call_2 (scorify, m, PARSER->self_scm ());
+ SCM score = scm_call_2 (scorify, m, parser->self_scm ());
// pass ownernship to C++ again.
$$ = unsmob_score (score);
| 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"));
+ parser->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead"));
}
else
$$ = $1;
if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T)
{
- PARSER->parser_error (@1, _ ("need \\paper for paper block"));
+ parser->parser_error (@1, _ ("need \\paper for paper block"));
$1->unprotect ();
- $$ = get_paper (PARSER);
+ $$ = get_paper (parser);
}
}
;
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);
+ $$ = get_paper (parser);
$$->input_origin_ = @$;
- PARSER->lexer_->add_scope ($$->scope_);
+ parser->lexer_->add_scope ($$->scope_);
}
| MIDI {
- Output_def *p = get_midi (PARSER);
+ Output_def *p = get_midi (parser);
$$ = p;
- PARSER->lexer_->add_scope (p->scope_);
+ 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_);
+ parser->lexer_->add_scope (p->scope_);
$$ = p;
}
;
output_def_head_with_mode_switch:
output_def_head {
- PARSER->lexer_->push_initial_state ();
+ parser->lexer_->push_initial_state ();
$$ = $1;
}
;
o->input_origin_.set_spot (@$);
$$ = o;
$$->protect ();
- PARSER->lexer_->remove_scope ();
- PARSER->lexer_->add_scope (o->scope_);
+ 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 music_arg {
+ SCM proc = parser->lexer_->lookup_identifier ("output-def-music-handler");
+ scm_call_3 (proc, parser->self_scm (), $1->self_scm (), $2);
+ }
| output_def_body error {
}
}
;
-music: simple_music
+music: music_arg
| lyric_element_music
- | composite_music %prec COMPOSITE
;
music_arg:
simple_music
+ {
+ if (unsmob_pitch ($1)) {
+ Music *n = MY_MAKE_MUSIC ("NoteEvent", @1);
+ n->set_property ("pitch", $1);
+ n->set_property ("duration",
+ parser->default_duration_.smobbed_copy ());
+ $$ = n->unprotect ();
+ }
+ }
| composite_music %prec COMPOSITE
;
+music_assign:
+ simple_music
+ | composite_music %prec COMPOSITE
+ | lyric_element_music
+ ;
+
repeated_music:
REPEAT simple_string unsigned_number music
{
;
context_modification:
- WITH { PARSER->lexer_->push_initial_state (); } '{' context_mod_list '}'
+ WITH { parser->lexer_->push_initial_state (); } '{' context_mod_list '}'
{
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
$$ = $4;
}
| WITH CONTEXT_MOD_IDENTIFIER
if (unsmob_context_mod ($2))
$$ = $2;
else {
- PARSER->parser_error (@2, _ ("not a context mod"));
+ parser->parser_error (@2, _ ("not a context mod"));
$$ = Context_mod ().smobbed_copy ();
}
}
if (md)
unsmob_context_mod ($1)->add_context_mods (md->get_mods ());
}
- | context_mod_list embedded_scm {
- Context_mod *md = unsmob_context_mod ($2);
- if (md)
- unsmob_context_mod ($1)->add_context_mods (md->get_mods ());
- else
- PARSER->parser_error (@2, _ ("not a context mod"));
+ | context_mod_list context_mod_embedded {
+ unsmob_context_mod ($1)->add_context_mods
+ (unsmob_context_mod ($2)->get_mods ());
}
;
{
$$ = scm_cons ($1, $3);
} %prec FUNCTION_ARGLIST
- | EXPECT_SCM EXPECT_DURATION function_arglist_skip
+ | EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip
{
$$ = scm_cons ($1, $3);
} %prec FUNCTION_ARGLIST
}
| EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg_closed
{
- $$ = check_scheme_arg (PARSER, @4, $4, $3, $2);
+ $$ = check_scheme_arg (parser, @4, $4, $3, $2);
}
| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number_closed
{
- $$ = check_scheme_arg (PARSER, @4, $4, $3, $2);
+ $$ = check_scheme_arg (parser, @4, $4, $3, $2);
}
| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed FRACTION
{
- $$ = check_scheme_arg (PARSER, @4, $4, $3, $2);
+ $$ = check_scheme_arg (parser, @4, $4, $3, $2);
}
| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed post_event_nofinger
{
- $$ = check_scheme_arg (PARSER, @4, $4, $3, $2);
+ $$ = check_scheme_arg (parser, @4, $4, $3, $2);
}
| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' UNSIGNED
{
if (scm_is_true (scm_call_1 ($2, $$)))
$$ = scm_cons ($$, $3);
else
- $$ = check_scheme_arg (PARSER, @4, n, $3, $2);
+ $$ = check_scheme_arg (parser, @4, n, $3, $2);
}
}
| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' REAL
{
- $$ = check_scheme_arg (PARSER, @4,
+ $$ = check_scheme_arg (parser, @4,
scm_difference ($5, SCM_UNDEFINED),
$3, $2);
}
| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' NUMBER_IDENTIFIER
{
- $$ = check_scheme_arg (PARSER, @4,
+ $$ = check_scheme_arg (parser, @4,
scm_difference ($5, SCM_UNDEFINED),
$3, $2);
}
else {
$$ = scm_cons (loc_on_music (@3, $1), $3);
MYBACKUP (UNSIGNED, $5, @5);
- PARSER->lexer_->push_extra_token ('-');
+ parser->lexer_->push_extra_token ('-');
}
}
}
| function_arglist_backup REPARSE embedded_scm_arg_closed
{
- $$ = check_scheme_arg (PARSER, @3,
+ $$ = check_scheme_arg (parser, @3,
$3, $1, $2);
}
| function_arglist_backup REPARSE bare_number
{
- $$ = check_scheme_arg (PARSER, @3,
+ $$ = check_scheme_arg (parser, @3,
$3, $1, $2);
}
| function_arglist_backup REPARSE fraction
{
- $$ = check_scheme_arg (PARSER, @3,
+ $$ = check_scheme_arg (parser, @3,
$3, $1, $2);
}
;
function_arglist_bare
| EXPECT_SCM function_arglist_optional embedded_scm_arg
{
- $$ = check_scheme_arg (PARSER, @3,
+ $$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
| EXPECT_SCM function_arglist_closed_optional bare_number
{
- $$ = check_scheme_arg (PARSER, @3,
+ $$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
| EXPECT_SCM function_arglist_closed_optional fraction
{
- $$ = check_scheme_arg (PARSER, @3,
+ $$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
| EXPECT_SCM function_arglist_closed_optional post_event_nofinger
{
- $$ = check_scheme_arg (PARSER, @3,
+ $$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
| function_arglist_common_minus
// something looking like a duration or post event
// follows, we take the event, otherwise the string).
SCM lyric_event = MAKE_SYNTAX ("lyric-event", @3, $3,
- PARSER->default_duration_.smobbed_copy ());
+ parser->default_duration_.smobbed_copy ());
if (scm_is_true (scm_call_1 ($1, $3)))
if (scm_is_true (scm_call_1 ($1, lyric_event)))
{
} else {
// This is going to flag a syntax error, we
// know the predicate to be false.
- check_scheme_arg (PARSER, @3,
+ check_scheme_arg (parser, @3,
$3, $2, $1);
}
}
| function_arglist_common_lyric REPARSE lyric_element_arg
{
// This should never be false
- $$ = check_scheme_arg (PARSER, @3,
+ $$ = check_scheme_arg (parser, @3,
$3, $1, $2);
}
;
if (scm_is_true (scm_call_1 ($1, $$)))
$$ = scm_cons ($$, $2);
else
- $$ = check_scheme_arg (PARSER, @3, n, $2, $1);
+ $$ = check_scheme_arg (parser, @3, n, $2, $1);
}
}
| EXPECT_SCM function_arglist_closed_optional '-' NUMBER_IDENTIFIER
{
SCM n = scm_difference ($4, SCM_UNDEFINED);
- $$ = check_scheme_arg (PARSER, @4, n, $2, $1);
+ $$ = check_scheme_arg (parser, @4, n, $2, $1);
}
| function_arglist_common_minus REPARSE bare_number
{
- $$ = check_scheme_arg (PARSER, @3, $3, $1, $2);
+ $$ = check_scheme_arg (parser, @3, $3, $1, $2);
}
;
function_arglist_bare
| EXPECT_SCM function_arglist_optional embedded_scm_arg_closed
{
- $$ = check_scheme_arg (PARSER, @3,
+ $$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
| EXPECT_SCM function_arglist_closed_optional bare_number
{
- $$ = check_scheme_arg (PARSER, @3,
+ $$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
| EXPECT_SCM function_arglist_closed_optional '-' UNSIGNED
if (scm_is_true (scm_call_1 ($1, $$)))
$$ = scm_cons ($$, $2);
else
- $$ = check_scheme_arg (PARSER, @3, n, $2, $1);
+ $$ = check_scheme_arg (parser, @3, n, $2, $1);
}
}
| EXPECT_SCM function_arglist_closed_optional '-' REAL
{
- $$ = check_scheme_arg (PARSER, @3,
+ $$ = check_scheme_arg (parser, @3,
scm_difference ($4, SCM_UNDEFINED),
$2, $1);
}
| EXPECT_SCM function_arglist_closed_optional '-' NUMBER_IDENTIFIER
{
- $$ = check_scheme_arg (PARSER, @3,
+ $$ = check_scheme_arg (parser, @3,
scm_difference ($4, SCM_UNDEFINED),
$2, $1);
}
| EXPECT_SCM function_arglist_closed_optional post_event_nofinger
{
- $$ = check_scheme_arg (PARSER, @3,
+ $$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
| EXPECT_SCM function_arglist_closed_optional fraction
{
- $$ = check_scheme_arg (PARSER, @3,
+ $$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
| EXPECT_SCM function_arglist_optional lyric_element
{
- $$ = check_scheme_arg (PARSER, @3,
+ $$ = check_scheme_arg (parser, @3,
$3, $2, $1);
}
;
{
$$ = $2;
}
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
}
| mode_changing_head_with_context optional_context_mod grouped_music_list {
Context_mod *ctxmod = unsmob_context_mod ($2);
{
$$ = MAKE_SYNTAX ("unrelativable-music", @$, $$);
}
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
}
;
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 (alist_to_hashq (nn));
$$ = ly_symbol2scm ("notes");
}
| 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 (alist_to_hashq (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 (alist_to_hashq (nn));
$$ = ly_symbol2scm ("chords");
}
| LYRICMODE
- { PARSER->lexer_->push_lyric_state ();
+ { parser->lexer_->push_lyric_state ();
$$ = ly_symbol2scm ("lyrics");
}
;
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 (alist_to_hashq (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 (alist_to_hashq (nn));
$$ = ly_symbol2scm ("ChordNames");
}
| LYRICS
- { PARSER->lexer_->push_lyric_state ();
+ { parser->lexer_->push_lyric_state ();
$$ = ly_symbol2scm ("Lyrics");
}
;
new_lyrics:
- ADDLYRICS { PARSER->lexer_->push_lyric_state (); }
+ ADDLYRICS { parser->lexer_->push_lyric_state (); }
/*cont */
composite_music {
/* Can also use music at the expensive of two S/Rs similar to
\repeat \alternative */
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
$$ = scm_cons ($3, SCM_EOL);
}
| new_lyrics ADDLYRICS {
- PARSER->lexer_->push_lyric_state ();
+ parser->lexer_->push_lyric_state ();
} composite_music {
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
$$ = scm_cons ($4, $1);
}
;
$$ = 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_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_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);
+ }
}
;
music_property_def:
simple_music_property_def {
- $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons2 (PARSER->self_scm (), make_input (@$), $1));
+ $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons2 (parser->self_scm (), make_input (@$), $1));
}
;
scalar:
embedded_scm_arg
| bare_number
+ | FRACTION
| lyric_element
;
scalar_closed:
embedded_scm_arg_closed
| bare_number
+ | FRACTION
| lyric_element
;
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 {
+ simple_element post_events {
+ // Let the rhythmic music iterator sort this mess out.
+ if (scm_is_pair ($2)) {
+ if (unsmob_pitch ($1)) {
+ Music *n = MY_MAKE_MUSIC ("NoteEvent", @1);
+ n->set_property ("pitch", $1);
+ n->set_property ("duration",
+ parser->default_duration_.smobbed_copy ());
+ $$ = n->unprotect ();
+ }
+ unsmob_music ($$)->set_property ("articulations",
+ scm_reverse_x ($2, SCM_EOL));
+ }
+ }
+ | simple_chord_elements post_events {
SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL));
Input i;
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 {
scm_reverse_x ($3, SCM_EOL));
}
| command_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_ = $$;
- }
+ | note_chord_element
;
chord_body_elements:
/* empty */ { $$ = SCM_EOL; }
| chord_body_elements chord_body_element {
- $$ = scm_cons ($2, $1);
+ if (!SCM_UNBNDP ($2))
+ $$ = scm_cons ($2, $1);
}
;
$$ = n->unprotect ();
}
| 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,
- $3, $2, $1);
- }
- ;
+ Music *m = unsmob_music ($1);
-embedded_scm_chord_body:
- embedded_scm_bare_arg
- | SCM_FUNCTION music_function_chord_body_arglist {
- $$ = MAKE_SYNTAX ("music-function", @$,
- $1, $2);
+ 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;
+ }
}
- | bare_number
- | fraction
- | lyric_element
- | chord_body_element
;
music_function_chord_body:
- MUSIC_FUNCTION music_function_chord_body_arglist {
- $$ = MAKE_SYNTAX ("music-function", @$,
- $1, $2);
- }
+ music_function_call
+ | MUSIC_IDENTIFIER
;
// Event functions may only take closed arglists, otherwise it would
$$ = MAKE_SYNTAX ("voice-separator", @$);
}
| '|' {
- SCM pipe = PARSER->lexer_->lookup_identifier ("pipeSymbol");
+ SCM pipe = parser->lexer_->lookup_identifier ("pipeSymbol");
Music *m = unsmob_music (pipe);
if (m)
}
}
| 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 {
direction_less_event:
direction_less_char {
- SCM predefd = PARSER->lexer_->lookup_identifier_symbol ($1);
+ SCM predefd = parser->lexer_->lookup_identifier_symbol ($1);
Music *m = 0;
if (unsmob_music (predefd))
{
$$ = $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 ();
}
;
}
;
-optional_notemode_duration:
+maybe_notemode_duration:
{
- Duration dd = PARSER->default_duration_;
- $$ = dd.smobbed_copy ();
+ $$ = SCM_UNDEFINED;
}
| 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 ();
}
;
bare_unsigned dots {
int len = 0;
if (!is_duration ($1))
- PARSER->parser_error (@1, _f ("not a duration: %d", $1));
+ parser->parser_error (@1, _f ("not a duration: %d", $1));
else
len = intlog2 ($1);
}
| ':' bare_unsigned {
if (!is_duration ($2))
- PARSER->parser_error (@2, _f ("not a duration: %d", $2));
+ parser->parser_error (@2, _f ("not a duration: %d", $2));
$$ = $2;
}
;
;
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 ($2 || $3 || scm_is_number ($4) || !SCM_UNBNDP ($5) || $6)
{
- int q = scm_to_int ($4);
- n->set_property ("absolute-octave", scm_from_int (q-1));
+ Music *n = 0;
+ if ($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 ($3 % 2)
+ n->set_property ("cautionary", SCM_BOOL_T);
+ if ($2 % 2 || $3 % 2)
+ 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", @$);
;
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 {
lyric_element_arg:
lyric_element
| lyric_element multiplied_duration post_events {
- SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
- $$ = MAKE_SYNTAX ("event-chord", @$,
- scm_cons (lyric_event,
- scm_reverse_x ($3, SCM_EOL)));
+ $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
+ if (scm_is_pair ($3))
+ unsmob_music ($$)->set_property
+ ("articulations", scm_reverse_x ($3, SCM_EOL));
}
| lyric_element post_event post_events {
- SCM lyric_event =
- MAKE_SYNTAX ("lyric-event", @$, $1,
- PARSER->default_duration_.smobbed_copy ());
- $$ = MAKE_SYNTAX ("event-chord", @$,
- scm_cons2 (lyric_event, $2,
- scm_reverse_x ($3, SCM_EOL)));
-
+ $$ = MAKE_SYNTAX ("lyric-event", @$, $1,
+ parser->default_duration_.smobbed_copy ());
+ unsmob_music ($$)->set_property
+ ("articulations", scm_cons ($2, scm_reverse_x ($3, SCM_EOL)));
}
| LYRIC_ELEMENT optional_notemode_duration post_events {
- SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
- $$ = MAKE_SYNTAX ("event-chord", @$,
- scm_cons (lyric_event,
- scm_reverse_x ($3, SCM_EOL)));
+ $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
+ if (scm_is_pair ($3))
+ unsmob_music ($$)->set_property
+ ("articulations", scm_reverse_x ($3, SCM_EOL));
}
;
lyric_element_music:
lyric_element optional_notemode_duration post_events {
- SCM lyric_event = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
- $$ = MAKE_SYNTAX ("event-chord", @$,
- scm_cons (lyric_event,
- scm_reverse_x ($3, SCM_EOL)));
+ $$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
+ if (scm_is_pair ($3))
+ unsmob_music ($$)->set_property
+ ("articulations", scm_reverse_x ($3, SCM_EOL));
}
;
new_chord:
steno_tonic_pitch optional_notemode_duration {
- $$ = make_chord_elements ($1, $2, SCM_EOL);
+ $$ = 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));
}
;
bare_number:
bare_number_closed
| UNSIGNED NUMBER_IDENTIFIER {
- $$ = scm_product ($1, $2)
+ $$ = scm_product ($1, $2);
}
| REAL NUMBER_IDENTIFIER {
- $$ = scm_product ($1, $2)
+ $$ = scm_product ($1, $2);
}
;
$$ = $1;
}
| LYRIC_MARKUP
- { PARSER->lexer_->push_markup_state (); }
+ { parser->lexer_->push_markup_state (); }
markup_top {
$$ = $3;
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
}
;
$$ = $1;
}
| MARKUPLIST
- { PARSER->lexer_->push_markup_state (); }
+ { parser->lexer_->push_markup_state (); }
markup_list {
$$ = $3;
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
}
;
$$ = $1;
}
| MARKUP
- { PARSER->lexer_->push_markup_state (); }
+ { parser->lexer_->push_markup_state (); }
markup_top {
$$ = $3;
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
}
;
else if (Text_interface::is_markup_list ($1))
MYBACKUP (MARKUPLIST_IDENTIFIER, $1, @1);
else {
- PARSER->parser_error (@1, _ ("not a markup"));
+ parser->parser_error (@1, _ ("not a markup"));
MYBACKUP (MARKUP_IDENTIFIER, scm_string (SCM_EOL), @1);
}
} BACKUP
$$ = scm_cons ($3, $2);
}
| EXPECT_SCM markup_command_list_arguments embedded_scm_closed {
- $$ = check_scheme_arg (PARSER, @3, $3, $2, $1);
+ $$ = check_scheme_arg (parser, @3, $3, $2, $1);
}
| EXPECT_NO_MORE_ARGS {
$$ = SCM_EOL;
$$ = $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 (alist_to_hashq (nn));
} '{' score_body '}' {
Score * sc = $4;
$$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ());
sc->unprotect ();
- PARSER->lexer_->pop_state ();
+ parser->lexer_->pop_state ();
}
| MARKUP_FUNCTION markup_command_basic_arguments {
$$ = scm_cons ($1, scm_reverse_x ($2, SCM_EOL));
void
Lily_parser::do_yyparse ()
{
- yyparse ((void*)this);
+ yyparse (this);
}
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)) {
return scm_from_locale_string (s);
}
-SCM check_scheme_arg (Lily_parser *my_lily_parser, Input loc,
+SCM check_scheme_arg (Lily_parser *parser, Input loc,
SCM arg, SCM args, SCM pred)
{
args = scm_cons (arg, args);
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);
+ 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->lexval_ = s;
lex->lexloc_ = loc;
lex->prepare_for_next_token ();
return lex->yylex ();
projects / lilypond.git / blobdiff