#define YYERROR_VERBOSE 1
#define YYPARSE_PARAM my_lily_parser
#define YYLEX_PARAM my_lily_parser
-#define THIS\
- ((Lily_parser *) my_lily_parser)
+#define PARSER ((Lily_parser *) my_lily_parser)
-#define yyerror THIS->parser_error
+#define yyerror PARSER->parser_error
/* We use custom location type: Input objects */
#define YYLTYPE Input
#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x))
+/* ES TODO:
+- Don't use lily module, create a new module instead.
+- delay application of the function
+*/
+#define MAKE_SYNTAX(name, location, ...) \
+ scm_apply_0 (ly_lily_module_constant (name), scm_list_n (make_input (location), __VA_ARGS__, SCM_UNDEFINED));
+
Music *property_op_to_music (SCM op);
-Music *context_spec_music (SCM type, SCM id, Music *m, SCM ops);
+SCM context_spec_music (SCM type, SCM id, SCM m, SCM ops, bool create_new);
SCM get_next_unique_context_id ();
SCM get_next_unique_lyrics_context_id ();
-Music *make_lyric_combine_music (SCM name, Music *music);
-Music *make_music_relative (Pitch start, Music *music);
+SCM make_lyric_combine_music (SCM name, SCM music);
+SCM make_music_relative (Pitch start, SCM music);
Music *run_music_function (Lily_parser *, SCM expr);
Music *set_property_music (SCM sym, SCM value);
SCM get_first_context_id (SCM type, Music *m);
%token <scm> MUSIC_FUNCTION_SCM
%token <scm> MUSIC_FUNCTION_SCM_MUSIC
%token <scm> MUSIC_FUNCTION_SCM_MUSIC_MUSIC
+%token <scm> MUSIC_FUNCTION_SCM_SCM_MUSIC_MUSIC
%token <scm> MUSIC_FUNCTION_SCM_SCM
%token <scm> MUSIC_FUNCTION_SCM_SCM_MUSIC
%token <scm> MUSIC_FUNCTION_SCM_SCM_SCM
+%token <scm> MUSIC_FUNCTION_SCM_SCM_SCM_MUSIC
+%token <scm> MUSIC_FUNCTION_SCM_SCM_SCM_SCM_MUSIC
%token <scm> MUSIC_IDENTIFIER
%token <scm> NOTENAME_PITCH
%token <scm> NUMBER_IDENTIFIER
%type <i> sup_quotes
%type <i> tremolo_type
-%type <music> Composite_music
-%type <music> Grouped_music_list
-%type <music> Music
-%type <music> Prefix_composite_music
-%type <music> Repeated_music
-%type <music> Sequential_music
-%type <music> Simple_music
-%type <music> Simultaneous_music
-%type <music> chord_body
-%type <music> chord_body_element
-%type <music> command_element
-%type <music> command_event
-%type <music> context_change
-%type <music> direction_less_event
-%type <music> direction_reqd_event
-%type <music> event_chord
-%type <music> gen_text_def
-%type <music> music_property_def
-%type <music> note_chord_element
-%type <music> post_event
-%type <music> re_rhythmed_music
-%type <music> relative_music
-%type <music> simple_element
-%type <music> string_number_event
-%type <music> tempo_event
-%type <music> toplevel_music
+/* Music */
+%type <scm> Composite_music
+%type <scm> Grouped_music_list
+%type <scm> Music
+%type <scm> Prefix_composite_music
+%type <scm> Repeated_music
+%type <scm> Sequential_music
+%type <scm> Simple_music
+%type <scm> Simultaneous_music
+%type <scm> chord_body
+%type <scm> chord_body_element
+%type <scm> command_element
+%type <scm> command_event
+%type <scm> context_change
+%type <scm> direction_less_event
+%type <scm> direction_reqd_event
+%type <scm> event_chord
+%type <scm> gen_text_def
+%type <scm> music_property_def
+%type <scm> note_chord_element
+%type <scm> post_event
+%type <scm> re_rhythmed_music
+%type <scm> relative_music
+%type <scm> simple_element
+%type <scm> string_number_event
+%type <scm> tempo_event
+%type <scm> toplevel_music
%type <outputdef> output_def_body
%type <outputdef> output_def_head
%type <scm> bare_number
%type <scm> music_function_event
%type <scm> music_function_chord_body
+%type <scm> music_function_musicless_prefix
%type <scm> bass_figure
%type <scm> figured_bass_modification
%type <scm> br_bass_figure
%type <scm> object_id_setting
%type <scm> octave_check
%type <scm> optional_context_mod
+%type <scm> optional_id
%type <scm> optional_notemode_duration
%type <scm> pitch
%type <scm> pitch_also_in_chords
| lilypond assignment {
}
| lilypond error {
- THIS->error_level_ = 1;
+ PARSER->error_level_ = 1;
}
| lilypond INVALID {
- THIS->error_level_ = 1;
+ PARSER->error_level_ = 1;
}
;
toplevel_expression:
lilypond_header {
- THIS->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
- }
- | add_quote {
-
+ PARSER->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
}
| book_block {
Book *book = $1;
- SCM proc = THIS->lexer_->lookup_identifier ("toplevel-book-handler");
- scm_call_2 (proc, THIS->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 ();
}
| score_block {
Score *score = $1;
- SCM proc = THIS->lexer_->lookup_identifier ("toplevel-score-handler");
- scm_call_2 (proc, THIS->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 ();
}
| toplevel_music {
- Music *music = $1;
- SCM proc = THIS->lexer_->lookup_identifier ("toplevel-music-handler");
- scm_call_2 (proc, THIS->self_scm (), music->self_scm ());
- music->unprotect ();
+ Music *music = unsmob_music ($1);
+ SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-music-handler");
+ scm_call_2 (proc, PARSER->self_scm (), music->self_scm ());
}
| full_markup {
- SCM proc = THIS->lexer_->lookup_identifier ("toplevel-text-handler");
- scm_call_2 (proc, THIS->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");
- THIS->lexer_->set_identifier (id, od->self_scm ());
+ PARSER->lexer_->set_identifier (id, od->self_scm ());
od->unprotect();
}
;
lilypond_header_body:
{
- $$ = get_header(THIS);
- THIS->lexer_->add_scope ($$);
+ $$ = get_header(PARSER);
+ PARSER->lexer_->add_scope ($$);
}
| lilypond_header_body assignment {
lilypond_header:
HEADER '{' lilypond_header_body '}' {
- $$ = THIS->lexer_->remove_scope ();
+ $$ = PARSER->lexer_->remove_scope ();
}
;
}
- THIS->lexer_->set_identifier ($1, $3);
+ PARSER->lexer_->set_identifier ($1, $3);
/*
TODO: devise standard for protection in parser.
$$ = $1;
}
| Music {
- $$ = $1->self_scm ();
- $1->unprotect();
+ $$ = $1;
}
| post_event {
- $$ = $1->self_scm ();
- $1->unprotect();
+ $$ = $1;
}
| number_expression {
$$ = $1;
{
$$ = new Book;
$$->set_spot (@$);
- $$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
+ $$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (PARSER->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
$$->paper_->unprotect ();
- $$->header_ = THIS->lexer_->lookup_identifier ("$defaultheader");
+ $$->header_ = PARSER->lexer_->lookup_identifier ("$defaultheader");
}
| BOOK_IDENTIFIER {
$$ = unsmob_book ($1);
score_body:
Music {
- SCM m = $1->self_scm ();
- $1->unprotect();
+ SCM m = $1;
SCM scorify = ly_lily_module_constant ("scorify-music");
- SCM score = scm_call_2 (scorify, m, THIS->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)
{
- THIS->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)
{
- THIS->parser_error (@1, _ ("need \\paper for paper block"));
- $$ = get_paper (THIS);
+ PARSER->parser_error (@1, _ ("need \\paper for paper block"));
+ $$ = get_paper (PARSER);
}
}
;
output_def_body '}' {
$$ = $1;
- THIS->lexer_->remove_scope ();
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->remove_scope ();
+ PARSER->lexer_->pop_state ();
}
;
output_def_head:
PAPER {
- $$ = get_paper (THIS);
+ $$ = get_paper (PARSER);
$$->input_origin_ = @$;
- THIS->lexer_->add_scope ($$->scope_);
+ PARSER->lexer_->add_scope ($$->scope_);
}
| MIDI {
- Output_def *p = get_midi (THIS);
+ Output_def *p = get_midi (PARSER);
$$ = p;
- THIS->lexer_->add_scope (p->scope_);
+ PARSER->lexer_->add_scope (p->scope_);
}
| LAYOUT {
- Output_def *p = get_layout (THIS);
+ Output_def *p = get_layout (PARSER);
- THIS->lexer_->add_scope (p->scope_);
+ PARSER->lexer_->add_scope (p->scope_);
$$ = p;
}
;
output_def_head_with_mode_switch:
output_def_head {
- THIS->lexer_->push_initial_state ();
+ PARSER->lexer_->push_initial_state ();
$$ = $1;
}
;
Output_def *o = unsmob_output_def ($3);
o->input_origin_.set_spot (@$);
$$ = o;
- THIS->lexer_->remove_scope ();
- THIS->lexer_->add_scope (o->scope_);
+ PARSER->lexer_->remove_scope ();
+ PARSER->lexer_->add_scope (o->scope_);
}
| output_def_body assignment {
junk this ? there already is tempo stuff in
music.
*/
- int m = scm_to_int ($2->get_property ("metronome-count"));
- Duration *d = unsmob_duration ($2->get_property ("tempo-unit"));
+ int m = scm_to_int (unsmob_music($2)->get_property ("metronome-count"));
+ Duration *d = unsmob_duration (unsmob_music($2)->get_property ("tempo-unit"));
set_tempo ($$, d->get_length (), m);
- $2->unprotect ();
}
| output_def_body error {
tempo_event:
TEMPO steno_duration '=' bare_unsigned {
- $$ = MY_MAKE_MUSIC ("MetronomeChangeEvent");
- $$->set_property ("tempo-unit", $2);
- $$->set_property ("metronome-count", scm_from_int ( $4));
+ Music *m = MY_MAKE_MUSIC ("MetronomeChangeEvent");
+ m->set_property ("tempo-unit", $2);
+ m->set_property ("metronome-count", scm_from_int ( $4));
+ $$ = m->unprotect ();
}
;
}
| Music_list Music {
SCM s = $$;
- SCM c = scm_cons ($2->self_scm (), SCM_EOL);
- $2->unprotect (); /* UGH */
+ SCM c = scm_cons ($2, SCM_EOL);
if (scm_is_pair (scm_cdr (s)))
scm_set_cdr_x (scm_cdr (s), c); /* append */
}
| Music_list error {
- Music * m = MY_MAKE_MUSIC("Music");
+ Music *m = MY_MAKE_MUSIC("Music");
// ugh. code dup
m->set_property ("error-found", SCM_BOOL_T);
SCM s = $$;
$$ = SCM_EOL;
}
| ALTERNATIVE '{' Music_list '}' {
- $$ = $3;
+ $$ = scm_car ($3);
}
;
Repeated_music:
REPEAT simple_string bare_unsigned Music Alternative_music
{
- Music *beg = $4;
- int times = $3;
- SCM alts = scm_is_pair ($5) ? scm_car ($5) : SCM_EOL;
- if (times < scm_ilength (alts)) {
- unsmob_music (scm_car (alts))
- ->origin ()->warning (
- _ ("more alternatives than repeats"));
- warning ("junking excess alternatives");
- alts = ly_truncate_list (times, alts);
- }
-
-
- SCM proc = ly_lily_module_constant ("make-repeated-music");
-
- SCM mus = scm_call_1 (proc, $2);
- Music *r = unsmob_music (mus);
- r->protect ();
- if (beg)
- {
- r-> set_property ("element", beg->self_scm ());
- beg->unprotect ();
- }
- r->set_property ("repeat-count", scm_from_int (max (times, 1)));
-
- r-> set_property ("elements",alts);
- if (ly_is_equal ($2, scm_makfrom0str ("tremolo"))) {
- /*
- TODO: move this code to Scheme.
- */
-
- /* we cannot get durations and other stuff
- correct down the line,
- so we have to add to the duration log here. */
- SCM func = ly_lily_module_constant ("shift-duration-log");
-
- int dots = ($3 % 3) ? 0 : 1;
- int shift = -intlog2 ((dots) ? ($3*2/3) : $3);
-
-
- if ($4->is_mus_type ("sequential-music"))
- {
- int list_len = scm_ilength ($4->get_property ("elements"));
- if (list_len != 2)
- $4->origin ()->warning (_f ("expect 2 elements for Chord tremolo, found %d", list_len));
- shift -= 1;
- r->compress (Moment (Rational (1, list_len)));
- }
- scm_call_3 (func, r->self_scm (), scm_from_int (shift), scm_from_int (dots));
-
- }
- r->set_spot (*$4->origin ());
-
- $$ = r;
+ $$ = MAKE_SYNTAX ("repeat", @$, $2, scm_int2num ($3), $4, $5);
}
;
Sequential_music:
SEQUENTIAL '{' Music_list '}' {
- $$ = MY_MAKE_MUSIC ("SequentialMusic");
- $$->set_property ("elements", scm_car ($3));
- $$->set_spot (@$);
+ $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($3));
}
| '{' Music_list '}' {
- $$ = MY_MAKE_MUSIC ("SequentialMusic");
- $$->set_property ("elements", scm_car ($2));
- $$->set_spot (@$);
+ $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($2));
}
;
Simultaneous_music:
SIMULTANEOUS '{' Music_list '}'{
- $$ = MY_MAKE_MUSIC ("SimultaneousMusic");
- $$->set_property ("elements", scm_car ($3));
- $$->set_spot (@$);
-
+ $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($3));
}
| simul_open Music_list simul_close {
- $$ = MY_MAKE_MUSIC ("SimultaneousMusic");
- $$->set_property ("elements", scm_car ($2));
- $$->set_spot (@$);
+ $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($2));
}
;
Simple_music:
- event_chord { $$ = $1; }
- | MUSIC_IDENTIFIER {
- $$ = unsmob_music ($1);
- }
+ event_chord
+ | MUSIC_IDENTIFIER
| music_property_def
| context_change
;
optional_context_mod:
/**/ { $$ = SCM_EOL; }
- | WITH { THIS->lexer_->push_initial_state (); }
+ | WITH { PARSER->lexer_->push_initial_state (); }
'{' context_mod_list '}'
{
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->pop_state ();
$$ = $4;
}
;
| simple_string
;
+/*
+TODO: use code generation for this
+*/
Generic_prefix_music_scm:
MUSIC_FUNCTION {
$$ = scm_list_2 ($1, make_input (@$));
| MUSIC_FUNCTION_MARKUP full_markup {
$$ = scm_list_3 ($1, make_input (@$), $2);
}
-
- | MUSIC_FUNCTION_SCM_MUSIC function_scm_argument Music {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ());
- $3->unprotect ();
+ | music_function_musicless_prefix Music {
+ $$ = ly_append2 ($1, scm_list_1 ($2));
}
| MUSIC_FUNCTION_SCM_SCM function_scm_argument function_scm_argument {
$$ = scm_list_4 ($1, make_input (@$), $2, $3);
| MUSIC_FUNCTION_SCM_SCM_SCM function_scm_argument function_scm_argument function_scm_argument {
$$ = scm_list_5 ($1, make_input (@$), $2, $3, $4);
}
- | MUSIC_FUNCTION_MUSIC Music {
- $$ = scm_list_3 ($1, make_input (@$), $2->self_scm ());
- $2->unprotect ();
- }
- | MUSIC_FUNCTION_SCM_SCM_MUSIC function_scm_argument function_scm_argument Music {
- $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4->self_scm ());
- }
| MUSIC_FUNCTION_MARKUP_MUSIC full_markup Music {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ());
- $3->unprotect ();
+ $$ = scm_list_4 ($1, make_input (@$), $2, $3);
}
| MUSIC_FUNCTION_MARKUP_MARKUP full_markup full_markup {
$$ = scm_list_4 ($1, make_input (@$), $2, $3);
}
| MUSIC_FUNCTION_MUSIC_MUSIC Music Music {
- $$ = scm_list_4 ($1, make_input (@$), $2->self_scm (), $3->self_scm ());
- $2->unprotect ();
- $3->unprotect ();
+ $$ = scm_list_4 ($1, make_input (@$), $2, $3);
}
| MUSIC_FUNCTION_SCM_MUSIC_MUSIC function_scm_argument Music Music {
- $$ = scm_list_5 ($1, make_input (@$), $2, $3->self_scm (), $4->self_scm ());
- $4->unprotect ();
- $3->unprotect ();
+ $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4);
+ }
+ | MUSIC_FUNCTION_SCM_SCM_MUSIC_MUSIC function_scm_argument function_scm_argument Music Music {
+ $$ = scm_list_n ($1, make_input (@$), $2, $3, $4, $5, SCM_UNDEFINED);
}
| MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC full_markup Music Music {
- $$ = scm_list_5 ($1, make_input (@$), $2, $3->self_scm (), $4->self_scm ());
- $3->unprotect ();
- $4->unprotect ();
+ $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4);
}
;
-Prefix_composite_music:
- Generic_prefix_music_scm {
- $$ = run_music_function (THIS, $1);
+optional_id:
+ /**/ { $$ = SCM_EOL; }
+ | '=' simple_string {
+ $$ = $2;
}
- | CONTEXT simple_string '=' simple_string optional_context_mod Music {
- $$ = context_spec_music ($2, $4, $6, $5);
+ ;
+
+Prefix_composite_music:
+ Generic_prefix_music_scm {
+ $$ = run_music_function (PARSER, $1)->unprotect ();
}
- | CONTEXT simple_string optional_context_mod Music {
- $$ = context_spec_music ($2, SCM_UNDEFINED, $4, $3);
+ | CONTEXT simple_string optional_id optional_context_mod Music {
+ $$ = context_spec_music ($2, $3, $5, $4, false);
}
- | NEWCONTEXT simple_string optional_context_mod Music {
- $$ = context_spec_music ($2, get_next_unique_context_id (), $4,
- $3);
+ | NEWCONTEXT simple_string optional_id optional_context_mod Music {
+ $$ = context_spec_music ($2, $3, $5, $4, true);
}
| TIMES fraction Music
-
{
- int n = scm_to_int (scm_car ($2)); int d = scm_to_int (scm_cdr ($2));
- Music *mp = $3;
-
- $$= MY_MAKE_MUSIC ("TimeScaledMusic");
- $$->set_spot (@$);
+ int n = scm_to_int (scm_car ($2));
+ int d = scm_to_int (scm_cdr ($2));
- $$->set_property ("element", mp->self_scm ());
- mp->unprotect();
- $$->set_property ("numerator", scm_from_int (n));
- $$->set_property ("denominator", scm_from_int (d));
- $$->compress (Moment (Rational (n,d)));
+ Music *m = MY_MAKE_MUSIC ("TimeScaledMusic");
+ m->set_spot (@$);
+ m->set_property ("element", $3);
+ m->set_property ("numerator", scm_from_int (n));
+ m->set_property ("denominator", scm_from_int (d));
+ m->compress (Moment (Rational (n,d)));
+ $$ = m->unprotect ();
}
| Repeated_music { $$ = $1; }
| TRANSPOSE pitch_also_in_chords pitch_also_in_chords Music {
- $$ = MY_MAKE_MUSIC ("TransposedMusic");
- Music *p = $4;
+ Music *m = MY_MAKE_MUSIC ("TransposedMusic");
Pitch from = *unsmob_pitch ($2);
Pitch to = *unsmob_pitch ($3);
+ Music *p = unsmob_music ($4);
p->transpose (pitch_interval (from, to));
- $$->set_property ("element", p->self_scm ());
- p->unprotect();
+ m->set_property ("element", $4);
+ $$ = m->unprotect ();
}
| mode_changing_head Grouped_music_list {
if ($1 == ly_symbol2scm ("chords"))
{
Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
- chm->set_property ("element", $2->self_scm ());
- $$ = chm;
- $2->unprotect();
+ chm->set_property ("element", $2);
+ $$ = chm->unprotect ();
}
else
{
$$ = $2;
}
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->pop_state ();
}
| mode_changing_head_with_context optional_context_mod Grouped_music_list {
- $$ = context_spec_music ($1, get_next_unique_context_id (),
- $3, $2);
+ $$ = context_spec_music ($1, SCM_UNDEFINED, $3, $2, true);
if ($1 == ly_symbol2scm ("ChordNames"))
{
Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
- chm->set_property ("element", $$->self_scm ());
- $$->unprotect();
- $$ = chm;
+ chm->set_property ("element", $$);
+ $$ = chm->unprotect ();
}
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->pop_state ();
}
| relative_music { $$ = $1; }
| re_rhythmed_music { $$ = $1; }
mode_changing_head:
NOTEMODE {
- SCM nn = THIS->lexer_->lookup_identifier ("pitchnames");
- THIS->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 = THIS->lexer_->lookup_identifier ("drumPitchNames");
- THIS->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 {
- THIS->lexer_->push_figuredbass_state ();
+ PARSER->lexer_->push_figuredbass_state ();
$$ = ly_symbol2scm ("figures");
}
| CHORDMODE {
- SCM nn = THIS->lexer_->lookup_identifier ("chordmodifiers");
- THIS->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
- nn = THIS->lexer_->lookup_identifier ("pitchnames");
- THIS->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
- { THIS->lexer_->push_lyric_state ();
+ { PARSER->lexer_->push_lyric_state ();
$$ = ly_symbol2scm ("lyrics");
}
;
mode_changing_head_with_context:
DRUMS {
- SCM nn = THIS->lexer_->lookup_identifier ("drumPitchNames");
- THIS->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 {
- THIS->lexer_->push_figuredbass_state ();
+ PARSER->lexer_->push_figuredbass_state ();
$$ = ly_symbol2scm ("FiguredBass");
}
| CHORDS {
- SCM nn = THIS->lexer_->lookup_identifier ("chordmodifiers");
- THIS->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
- nn = THIS->lexer_->lookup_identifier ("pitchnames");
- THIS->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
- { THIS->lexer_->push_lyric_state ();
+ { PARSER->lexer_->push_lyric_state ();
$$ = ly_symbol2scm ("Lyrics");
}
;
relative_music:
RELATIVE absolute_pitch Music {
- Music *m = $3;
Pitch start = *unsmob_pitch ($2);
- $$ = make_music_relative (start, m);
- m->unprotect();
+ $$ = make_music_relative (start, $3);
}
| RELATIVE Composite_music {
- Music *m = $2;
-
Pitch middle_c (0, 0, 0);
- $$ = make_music_relative (middle_c, m);
- m->unprotect();
+ $$ = make_music_relative (middle_c, $2);
}
;
new_lyrics:
- ADDLYRICS { THIS->lexer_->push_lyric_state (); }
+ ADDLYRICS { PARSER->lexer_->push_lyric_state (); }
/*cont */
Grouped_music_list {
/* Can also use Music at the expensive of two S/Rs similar to
\repeat \alternative */
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->pop_state ();
- $$ = scm_cons ($3->self_scm (), SCM_EOL);
+ $$ = scm_cons ($3, SCM_EOL);
}
| new_lyrics ADDLYRICS {
- THIS->lexer_->push_lyric_state ();
+ PARSER->lexer_->push_lyric_state ();
} Grouped_music_list {
- THIS->lexer_->pop_state ();
- $$ = scm_cons ($4->self_scm (), $1);
+ PARSER->lexer_->pop_state ();
+ $$ = scm_cons ($4, $1);
}
;
re_rhythmed_music:
Grouped_music_list new_lyrics {
- Music * voice = $1;
- SCM name = get_first_context_id (scm_makfrom0str ("Voice"), voice);
+ SCM voice = $1;
+ SCM name = get_first_context_id (scm_makfrom0str ("Voice"), unsmob_music (voice));
if (!scm_is_string (name))
{
name = get_next_unique_lyrics_context_id ();
voice = context_spec_music (scm_makfrom0str ("Voice"),
name,
- voice, SCM_EOL);
+ voice, SCM_EOL, false);
}
SCM context = scm_makfrom0str ("Lyrics");
SCM lst = SCM_EOL;
for (SCM s = $2; scm_is_pair (s); s = scm_cdr (s))
{
- Music *music = unsmob_music (scm_car (s));
- Music *com = make_lyric_combine_music (name, music);
- Music *csm = context_spec_music (context,
- get_next_unique_context_id (), com, SCM_EOL);
- lst = scm_cons (csm->self_scm (), lst);
+ SCM com = make_lyric_combine_music (name, scm_car (s));
+ SCM csm = context_spec_music (context,
+ SCM_UNDEFINED, com, SCM_EOL, true);
+ lst = scm_cons (csm, lst);
}
- all->set_property ("elements", scm_cons (voice->self_scm (),
+ all->set_property ("elements", scm_cons (voice,
lst));
- $$ = all;
- voice->unprotect ();
+ $$ = all->unprotect ();
}
| LYRICSTO simple_string {
- THIS->lexer_->push_lyric_state ();
+ PARSER->lexer_->push_lyric_state ();
} Music {
- THIS->lexer_->pop_state ();
- Music *music = $4;
+ PARSER->lexer_->pop_state ();
SCM name = $2;
- $$ = make_lyric_combine_music (name, music);
- music->unprotect();
+ $$ = make_lyric_combine_music (name, $4);
}
;
context_change:
CHANGE STRING '=' STRING {
- Music*t = MY_MAKE_MUSIC ("ContextChange");
+ Music *t = MY_MAKE_MUSIC ("ContextChange");
t-> set_property ("change-to-type", scm_string_to_symbol ($2));
t-> set_property ("change-to-id", $4);
+ t->set_spot (@$);
- $$ = t;
- $$->set_spot (@$);
+ $$ = t->unprotect ();
}
;
music_property_def:
OVERRIDE context_prop_spec embedded_scm '=' scalar {
- $$ = property_op_to_music (scm_list_4 (
+ Music *m = property_op_to_music (scm_list_4 (
ly_symbol2scm ("push"),
scm_cadr ($2),
$5, $3));
- $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, m->unprotect (), SCM_EOL, false);
}
| OVERRIDE context_prop_spec embedded_scm embedded_scm '=' scalar {
- $$ = property_op_to_music (scm_list_5 (
+ Music *m = property_op_to_music (scm_list_5 (
ly_symbol2scm ("push"),
scm_cadr ($2),
$6, $4, $3));
- $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, m->unprotect (), SCM_EOL, false);
}
| REVERT context_prop_spec embedded_scm {
- $$ = property_op_to_music (scm_list_3 (
+ Music *m = property_op_to_music (scm_list_3 (
ly_symbol2scm ("pop"),
scm_cadr ($2),
$3));
- $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, m->unprotect (), SCM_EOL, false);
}
| SET context_prop_spec '=' scalar {
- $$ = property_op_to_music (scm_list_3 (
+ Music *m = property_op_to_music (scm_list_3 (
ly_symbol2scm ("assign"),
scm_cadr ($2),
$4));
- $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, m->unprotect (), SCM_EOL, false);
}
| UNSET context_prop_spec {
- $$ = property_op_to_music (scm_list_2 (
+ Music *m = property_op_to_music (scm_list_2 (
ly_symbol2scm ("unset"),
scm_cadr ($2)));
- $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+ $$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, m->unprotect (), SCM_EOL, false);
}
| ONCE music_property_def {
- SCM e = $2->get_property ("element");
+ Music *m = unsmob_music ($2);
+ SCM e = m->get_property ("element");
unsmob_music (e)->set_property ("once", SCM_BOOL_T);
$$ = $2;
-
}
;
event_chord:
pre_events simple_element post_events {
- SCM elts = $2-> get_property ("elements");
+ Music *m = unsmob_music ($2);
+ m->protect ();
+ SCM elts = m->get_property ("elements");
elts = ly_append2 (elts, scm_reverse_x ($3, SCM_EOL));
- $2->set_property ("elements", elts);
+ m->set_property ("elements", elts);
/* why is this giving wrong start location? -ns
* $2->set_spot (@$); */
Input i;
i.set_location (@2, @3);
- $2->set_spot (i);
- $$ = $2;
+ m->set_spot (i);
+ $$ = m->unprotect ();
}
- | command_element
+ | command_element { $$ = $1; }
| note_chord_element
;
note_chord_element:
chord_body optional_notemode_duration post_events
{
+ Music *m = unsmob_music ($1);
SCM dur = unsmob_duration ($2)->smobbed_copy ();
- SCM es = $1->get_property ("elements");
+ 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);
- $1-> set_property ("elements", es);
- $1->set_spot (@$);
- $$ = $1;
+ m-> set_property ("elements", es);
+ m->set_spot (@$);
+ $$ = m->self_scm ();
}
;
chord_body:
chord_open chord_body_elements chord_close
{
- $$ = MY_MAKE_MUSIC ("EventChord");
- $$->set_spot (@$);
- $$->set_property ("elements",
+ Music *m = MY_MAKE_MUSIC ("EventChord");
+ m->set_spot (@$);
+ m->set_property ("elements",
scm_reverse_x ($2, SCM_EOL));
+ $$ = m->unprotect ();
}
;
chord_body_elements:
/* empty */ { $$ = SCM_EOL; }
| chord_body_elements chord_body_element {
- $$ = scm_cons ($2->self_scm (), $1);
- $2->unprotect ();
+ $$ = scm_cons ($2, $1);
}
;
n->set_property ("absolute-octave", scm_from_int (q-1));
}
-
- $$ = n;
+ $$ = n->unprotect ();
}
| DRUM_PITCH post_events {
Music *n = MY_MAKE_MUSIC ("NoteEvent");
SCM arts = scm_reverse_x ($2, SCM_EOL);
n->set_property ("articulations", arts);
}
- $$ = n;
+ $$ = n->unprotect ();
}
| music_function_chord_body {
- $$ = run_music_function (THIS, $1);
- $$->set_spot (@$);
+ Music *m = run_music_function (PARSER, $1);
+ m->set_spot (@$);
+ $$ = m->unprotect ();
}
;
MUSIC_FUNCTION {
$$ = scm_list_2 ($1, make_input (@$));
}
- | MUSIC_FUNCTION_MUSIC chord_body_element {
- $$ = scm_list_3 ($1, make_input (@$),
- $2->self_scm ());
+ | music_function_musicless_prefix chord_body_element {
+ $$ = ly_append2 ($1, scm_list_1 ($2));
}
- | MUSIC_FUNCTION_SCM_MUSIC function_scm_argument chord_body_element {
- $$ = scm_list_4 ($1, make_input (@$),
- $2, $3->self_scm ());
- }
- | MUSIC_FUNCTION_SCM_SCM_MUSIC function_scm_argument function_scm_argument
- chord_body_element {
+ ;
- $$ = scm_list_5 ($1, make_input (@$),
- $2, $3, $4->self_scm ());
+music_function_event:
+ music_function_musicless_prefix post_event {
+ $$ = ly_append2 ($1, scm_list_1 ($2));
}
;
-
-add_quote:
- ADDQUOTE string Music {
- SCM adder = ly_lily_module_constant ("add-quotable");
-
- scm_call_2 (adder, $2, $3->self_scm ());
- $3->unprotect();
+/*
+TODO: use code generation for this
+*/
+music_function_musicless_prefix:
+ MUSIC_FUNCTION_MUSIC {
+ $$ = scm_list_2 ($1, make_input (@$));
+ }
+ | MUSIC_FUNCTION_SCM_MUSIC function_scm_argument {
+ $$ = scm_list_3 ($1, make_input (@$), $2);
+ }
+ | MUSIC_FUNCTION_SCM_SCM_MUSIC function_scm_argument function_scm_argument {
+ $$ = scm_list_4 ($1, make_input (@$), $2, $3);
+ }
+ | MUSIC_FUNCTION_SCM_SCM_SCM_MUSIC function_scm_argument function_scm_argument function_scm_argument {
+ $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4);
+ }
+ | MUSIC_FUNCTION_SCM_SCM_SCM_SCM_MUSIC function_scm_argument function_scm_argument function_scm_argument function_scm_argument {
+ $$ = scm_list_n ($1, make_input (@$), $2, $3, $4, $5, SCM_UNDEFINED);
}
;
+
command_element:
command_event {
- $$ = MY_MAKE_MUSIC ("EventChord");
- $$->set_property ("elements", scm_cons ($1->self_scm (), SCM_EOL));
- $1->unprotect();
-
- $$-> set_spot (@$);
- $1-> set_spot (@$);
+ Music *m = MY_MAKE_MUSIC ("EventChord");
+ m->set_property ("elements", scm_cons ($1, SCM_EOL));
+ Music *e = unsmob_music ($1);
+ e-> set_spot (@$);
+ m-> set_spot (@$);
+ $$ = m->unprotect ();
}
| SKIP duration_length {
Music *skip = MY_MAKE_MUSIC ("SkipMusic");
skip->set_property ("duration", $2);
skip->set_spot (@$);
- $$ = skip;
- }
- | OCTAVE pitch {
- Music *m = MY_MAKE_MUSIC ("RelativeOctaveCheck");
- $$ = m;
- $$->set_spot (@$);
- $$->set_property ("pitch", $2);
+ $$ = skip->unprotect ();
}
| E_BRACKET_OPEN {
Music *m = MY_MAKE_MUSIC ("LigatureEvent");
m->set_property ("span-direction", scm_from_int (START));
m->set_spot (@$);
- $$ = MY_MAKE_MUSIC ("EventChord");
- $$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL));
+ Music *chord = MY_MAKE_MUSIC ("EventChord");
+ chord->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL));
m->unprotect();
- $$->set_spot (@$);
+ chord->set_spot (@$);
+ $$ = chord->unprotect ();
}
| E_BRACKET_CLOSE {
Music *m = MY_MAKE_MUSIC ("LigatureEvent");
m->set_property ("span-direction", scm_from_int (STOP));
m->set_spot (@$);
- $$ = MY_MAKE_MUSIC ("EventChord");
- $$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL));
- $$->set_spot (@$);
+ Music *chord = MY_MAKE_MUSIC ("EventChord");
+ chord->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL));
+ chord->set_spot (@$);
m->unprotect ();
+ $$ = chord->unprotect ();
}
| E_BACKSLASH {
- $$ = MY_MAKE_MUSIC ("VoiceSeparator");
- $$->set_spot (@$);
+ Music *m = MY_MAKE_MUSIC ("VoiceSeparator");
+ m->set_spot (@$);
+ $$ = m->unprotect ();
}
| '|' {
- SCM pipe = THIS->lexer_->lookup_identifier ("pipeSymbol");
+ SCM pipe = PARSER->lexer_->lookup_identifier ("pipeSymbol");
- if (Music * m = unsmob_music (pipe))
- $$ = m->clone ();
+ Music *m = unsmob_music (pipe);
+ if (m)
+ m = m->clone ();
else
- $$ = MY_MAKE_MUSIC ("BarCheck");
+ m = MY_MAKE_MUSIC ("BarCheck");
- $$->set_spot (@$);
+ m->set_spot (@$);
+ $$ = m->unprotect ();
}
| TRANSPOSITION pitch {
Pitch middle_c;
Pitch sounds_as_c = pitch_interval (*unsmob_pitch ($2), middle_c);
- $$ = set_property_music (ly_symbol2scm ("instrumentTransposition"),
+ Music *m = set_property_music (ly_symbol2scm ("instrumentTransposition"),
sounds_as_c.smobbed_copy());
- $$->set_spot (@$);
+ m->set_spot (@$);
$$ = context_spec_music (ly_symbol2scm ("Staff"), SCM_UNDEFINED,
- $$, SCM_EOL);
+ m->unprotect (), SCM_EOL, false);
}
| PARTIAL duration_length {
Moment m = - unsmob_duration ($2)->get_length ();
Music *p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ());
p->set_spot (@$);
- p = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED,
- p, SCM_EOL);
- p = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED,
- p, SCM_EOL);
- $$ = p;
+ SCM ps = p->unprotect ();
+ ps = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED,
+ ps, SCM_EOL, false);
+ $$ = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED,
+ ps, SCM_EOL, false);
}
| TIME_T fraction {
SCM proc = ly_lily_module_constant ("make-time-signature-set");
- SCM result = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL);
- $$ = unsmob_music (result);
- $$->protect ();
+ $$ = scm_apply_2 (proc, scm_car ($2), scm_cdr ($2), SCM_EOL);
}
| MARK scalar {
SCM proc = ly_lily_module_constant ("make-mark-set");
- SCM result = scm_call_1 (proc, $2);
- $$ = unsmob_music (result);
- $$->protect ();
+ $$ = scm_call_1 (proc, $2);
}
;
command_event:
E_TILDE {
- $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent");
+ $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent")->unprotect ();
}
| MARK DEFAULT {
Music *m = MY_MAKE_MUSIC ("MarkEvent");
- $$ = m;
+ $$ = m->unprotect ();
}
| tempo_event {
$$ = $1;
}
| KEY DEFAULT {
Music *key = MY_MAKE_MUSIC ("KeyChangeEvent");
- $$ = key;
+ $$ = key->unprotect ();
}
| KEY NOTENAME_PITCH SCM_IDENTIFIER {
key->set_property ("tonic", Pitch (0, 0, 0).smobbed_copy ());
key->transpose (* unsmob_pitch ($2));
} else {
- THIS->parser_error (@3, _ ("second argument must be pitch list"));
+ PARSER->parser_error (@3, _ ("second argument must be pitch list"));
}
- $$ = key;
+ $$ = key->unprotect ();
}
;
$$ = SCM_EOL;
}
| post_events post_event {
- $2->set_spot (@2);
- $$ = scm_cons ($2->self_scm (), $$);
- $2->unprotect ();
- }
- ;
-
-music_function_event:
- MUSIC_FUNCTION_MUSIC post_event {
- $$ = scm_list_3 ($1, make_input (@$), $2->self_scm ());
- }
- | MUSIC_FUNCTION_SCM_MUSIC function_scm_argument post_event {
- $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ());
- }
- | MUSIC_FUNCTION_SCM_SCM_MUSIC function_scm_argument function_scm_argument post_event {
- $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4->self_scm ());
+ unsmob_music ($2)->set_spot (@2);
+ $$ = scm_cons ($2, $$);
}
;
-
post_event:
direction_less_event {
$$ = $1;
}
| '-' music_function_event {
- Music *mus = run_music_function (THIS, $2);
+ Music *mus = run_music_function (PARSER, $2);
mus->set_spot (@1);
- $$ = mus;
+ $$ = mus->unprotect ();
}
| HYPHEN {
- if (!THIS->lexer_->is_lyric_state ())
- THIS->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
- $$ = MY_MAKE_MUSIC ("HyphenEvent");
+ 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 (!THIS->lexer_->is_lyric_state ())
- THIS->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
- $$ = MY_MAKE_MUSIC ("ExtenderEvent");
+ if (!PARSER->lexer_->is_lyric_state ())
+ PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
+ $$ = MY_MAKE_MUSIC ("ExtenderEvent")->unprotect ();
}
| script_dir direction_reqd_event {
if ($1)
- $2->set_property ("direction", scm_from_int ($1));
+ {
+ Music *m = unsmob_music ($2);
+ m->set_property ("direction", scm_from_int ($1));
+ }
$$ = $2;
}
| script_dir direction_less_event {
if ($1)
- $2->set_property ("direction", scm_from_int ($1));
+ {
+ Music *m = unsmob_music ($2);
+ m->set_property ("direction", scm_from_int ($1));
+ }
$$ = $2;
}
| string_number_event
Music *s = MY_MAKE_MUSIC ("StringNumberEvent");
s->set_property ("string-number", scm_from_int ($1));
s->set_spot (@$);
- $$ = s;
+ $$ = s->unprotect ();
}
;
direction_less_event:
direction_less_char {
- SCM predefd = THIS->lexer_->lookup_identifier_symbol ($1);
- Music * m = 0;
+ SCM predefd = PARSER->lexer_->lookup_identifier_symbol ($1);
+ Music *m = 0;
if (unsmob_music (predefd))
{
m = unsmob_music (predefd)->clone ();
m = MY_MAKE_MUSIC ("Music");
}
m->set_spot (@$);
- $$ = m;
+ $$ = m->unprotect ();
}
| EVENT_IDENTIFIER {
- $$ = unsmob_music ($1);
+ $$ = $1;
}
| tremolo_type {
Music *a = MY_MAKE_MUSIC ("TremoloEvent");
a->set_spot (@$);
a->set_property ("tremolo-type", scm_from_int ($1));
- $$ = a;
+ $$ = a->unprotect ();
}
;
$$ = $1;
}
| script_abbreviation {
- SCM s = THIS->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 THIS->parser_error (@1, _ ("expecting string as script definition"));
- $$ = a;
+ else PARSER->parser_error (@1, _ ("expecting string as script definition"));
+ $$ = a->unprotect ();
}
;
Music *t = MY_MAKE_MUSIC ("TextScriptEvent");
t->set_property ("text", $1);
t->set_spot (@$);
- $$ = t;
+ $$ = t->unprotect ();
}
| string {
Music *t = MY_MAKE_MUSIC ("TextScriptEvent");
t->set_property ("text",
make_simple_markup ($1));
t->set_spot (@$);
- $$ = t;
-
+ $$ = t->unprotect ();
}
| DIGIT {
Music *t = MY_MAKE_MUSIC ("FingerEvent");
t->set_property ("digit", scm_from_int ($1));
t->set_spot (@$);
- $$ = t;
+ $$ = t->unprotect ();
}
;
optional_notemode_duration:
{
- Duration dd = THIS->default_duration_;
+ Duration dd = PARSER->default_duration_;
$$ = dd.smobbed_copy ();
}
| multiplied_duration {
$$ = $1;
- THIS->default_duration_ = *unsmob_duration ($$);
+ PARSER->default_duration_ = *unsmob_duration ($$);
}
;
bare_unsigned dots {
int len = 0;
if (!is_duration ($1))
- THIS->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))
- THIS->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 (!THIS->lexer_->is_note_state ())
- THIS->parser_error (@1, _ ("have to be in Note mode for notes"));
+ if (!PARSER->lexer_->is_note_state ())
+ PARSER->parser_error (@1, _ ("have to be in Note mode for notes"));
Music *n = 0;
if ($6)
v->set_spot (@$);
n->set_spot (@$);
- $$ = v;
+ $$ = v->unprotect ();
}
| DRUM_PITCH optional_notemode_duration {
Music *n = MY_MAKE_MUSIC ("NoteEvent");
n->unprotect ();
v->set_spot (@$);
n->set_spot (@$);
- $$ = v;
+ $$ = v->unprotect ();
}
| figure_spec optional_notemode_duration {
{
unsmob_music (scm_car (s))->set_property ("duration", $2);
}
- $$ = m;
+ $$ = m->unprotect ();
}
| RESTNAME optional_notemode_duration {
Music *ev = 0;
ev->unprotect();
- $$ = velt;
+ $$ = velt->unprotect ();
}
| MULTI_MEASURE_REST optional_notemode_duration {
SCM proc = ly_lily_module_constant ("make-multi-measure-rest");
- SCM mus = scm_call_2 (proc, $2, make_input (@$));
- $$ = unsmob_music (mus);
- $$->protect ();
+ $$ = scm_call_2 (proc, $2, make_input (@$));
}
-
| lyric_element optional_notemode_duration {
- if (!THIS->lexer_->is_lyric_state ())
- THIS->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"));
Music *levent = MY_MAKE_MUSIC ("LyricEvent");
levent->set_property ("text", $1);
Music *velt = MY_MAKE_MUSIC ("EventChord");
velt->set_property ("elements", scm_list_1 (levent->self_scm ()));
- $$= velt;
+ $$= velt->unprotect ();
}
| new_chord {
- if (!THIS->lexer_->is_chord_state ())
- THIS->parser_error (@1, _ ("have to be in Chord mode for chords"));
- $$ = unsmob_music ($1);
+ if (!PARSER->lexer_->is_chord_state ())
+ PARSER->parser_error (@1, _ ("have to be in Chord mode for chords"));
+ $$ = $1;
}
;
$$ = $1;
}
| LYRIC_MARKUP
- { THIS->lexer_->push_markup_state (); }
+ { PARSER->lexer_->push_markup_state (); }
markup_top {
$$ = $3;
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->pop_state ();
}
;
$$ = $1;
}
| MARKUP
- { THIS->lexer_->push_markup_state (); }
+ { PARSER->lexer_->push_markup_state (); }
markup_top {
$$ = $3;
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->pop_state ();
}
;
$$ = $1;
}
| SCORE {
- SCM nn = THIS->lexer_->lookup_identifier ("pitchnames");
- THIS->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 ();
- THIS->lexer_->pop_state ();
+ PARSER->lexer_->pop_state ();
}
| MARKUP_HEAD_SCM0 embedded_scm {
$$ = scm_list_2 ($1, $2);
return m;
}
-Music*
-context_spec_music (SCM type, SCM id, Music *m, SCM ops)
+SCM
+context_spec_music (SCM type, SCM id, SCM m, SCM ops, bool create_new)
{
Music *csm = MY_MAKE_MUSIC ("ContextSpeccedMusic");
- csm->set_property ("element", m->self_scm ());
- m->unprotect ();
+ csm->set_property ("element", m);
csm->set_property ("context-type",
scm_is_symbol (type) ? type : scm_string_to_symbol (type));
csm->set_property ("property-operations", ops);
+ if (create_new)
+ csm->set_property ("create-new", SCM_BOOL_T);
if (scm_is_string (id))
csm->set_property ("context-id", id);
- return csm;
+ return csm->unprotect ();
}
SCM
bool
is_regular_identifier (SCM id)
{
- std::string str = ly_scm2string (id);
+ string str = ly_scm2string (id);
char const *s = str.c_str ();
bool v = true;
return p;
}
-Music*
-make_music_relative (Pitch start, Music *music)
+SCM
+make_music_relative (Pitch start, SCM music)
{
Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic");
- relative->set_property ("element", music->self_scm ());
+ relative->set_property ("element", music);
- Pitch last = music->to_relative_octave (start);
+ Music *m = unsmob_music (music);
+ Pitch last = m->to_relative_octave (start);
if (lily_1_8_relative)
- music->set_property ("last-pitch", last.smobbed_copy ());
- return relative;
+ m->set_property ("last-pitch", last.smobbed_copy ());
+ return relative->unprotect ();
}
-Music *
-make_lyric_combine_music (SCM name, Music *music)
+SCM
+make_lyric_combine_music (SCM name, SCM music)
{
Music *combine = MY_MAKE_MUSIC ("LyricCombineMusic");
- combine->set_property ("element", music->self_scm ());
+ combine->set_property ("element", music);
combine->set_property ("associated-context", name);
- return combine;
+ return combine->unprotect ();
}
projects / lilypond.git / blobdiff