X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=8fc0a89c1b417a394c9f027eb0f756baf4d49dca;hb=ce8287acfd7226e5837ab64c09d14a727479391b;hp=9266860f378155d4e1487753fe5aad460bc3f980;hpb=70d5609d63efe8a9b42ff763b79348bf99953bf2;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 9266860f37..8fc0a89c1b 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -3,19 +3,19 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys Jan Nieuwenhuizen */ %{ +#define YYDEBUG 1 #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 @@ -75,13 +75,11 @@ using namespace std; #include "context-def.hh" #include "dimensions.hh" #include "file-path.hh" -#include "input-smob.hh" #include "input.hh" #include "international.hh" #include "lily-guile.hh" #include "lily-lexer.hh" #include "lily-parser.hh" -#include "lilypond-input-version.hh" #include "main.hh" #include "misc.hh" #include "music.hh" @@ -109,10 +107,18 @@ using namespace std; %{ -#define MY_MAKE_MUSIC(x) make_music_by_name (ly_symbol2scm (x)) +#define MY_MAKE_MUSIC(x, spot) make_music_with_input (ly_symbol2scm (x), spot) + +/* ES TODO: +- Don't use lily module, create a new module instead. +- delay application of the function +*/ +#define LOWLEVEL_MAKE_SYNTAX(proc, args) \ + scm_apply_0 (proc, args) +/* 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)); -Music *property_op_to_music (SCM op); -Music *context_spec_music (SCM type, SCM id, Music *m, SCM ops, bool create_new); SCM get_next_unique_context_id (); SCM get_next_unique_lyrics_context_id (); @@ -125,14 +131,12 @@ SCM get_next_unique_lyrics_context_id (); #endif - -Music *make_lyric_combine_music (SCM name, Music *music); -Music *make_music_relative (Pitch start, Music *music); -Music *run_music_function (Lily_parser *, SCM expr); -Music *set_property_music (SCM sym, SCM value); +static Music *make_music_with_input (SCM name, Input where); +SCM make_music_relative (Pitch start, SCM music, Input loc); +SCM run_music_function (Lily_parser *, SCM expr); SCM get_first_context_id (SCM type, Music *m); -SCM make_chord (SCM pitch, SCM dur, SCM modification_list); -SCM make_chord_step (int step, int alter); +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); bool is_duration (int t); bool is_regular_identifier (SCM id); @@ -152,10 +156,9 @@ void set_music_properties (Music *p, SCM a); /* Keyword tokens with plain escaped name. */ %token ACCEPTS "\\accepts" %token ADDLYRICS "\\addlyrics" -%token ADDQUOTE "\\addquote" %token ALIAS "\\alias" %token ALTERNATIVE "\\alternative" -%token BOOK "\book" +%token BOOK "\\book" %token CHANGE "\\change" %token CHORDMODE "\\chordmode" %token CHORDS "\\chords" @@ -179,6 +182,7 @@ void set_music_properties (Music *p, SCM a); %token LYRICSTO "\\lyricsto" %token MARK "\\mark" %token MARKUP "\\markup" +%token MARKUPLINES "\\markuplines" %token MIDI "\\midi" %token NAME "\\name" %token NOTEMODE "\\notemode" @@ -201,7 +205,6 @@ void set_music_properties (Music *p, SCM a); %token TEMPO "\\tempo" %token TIMES "\\times" %token TRANSPOSE "\\transpose" -%token TRANSPOSITION "\\transposition" %token TYPE "\\type" %token UNSET "\\unset" %token WITH "\\with" @@ -218,8 +221,10 @@ void set_music_properties (Music *p, SCM a); %token CHORD_COLON ":" %token CHORD_MINUS "-" %token CHORD_SLASH "/" -%token DOUBLE_ANGLE_CLOSE ">>" +%token ANGLE_OPEN "<" +%token ANGLE_CLOSE ">" %token DOUBLE_ANGLE_OPEN "<<" +%token DOUBLE_ANGLE_CLOSE ">>" %token E_BACKSLASH "\\" %token E_ANGLE_CLOSE "\\>" %token E_CHAR "\\C[haracter]" @@ -244,13 +249,19 @@ If we give names, Bison complains. %token CHORDMODIFIERS %token LYRIC_MARKUP %token MULTI_MEASURE_REST -%token SCM_T %token DIGIT %token E_UNSIGNED %token UNSIGNED +/* Artificial tokens, for more generic function syntax */ +%token EXPECT_MARKUP; +%token EXPECT_MUSIC; +%token EXPECT_SCM; +/* After the last argument. */ +%token EXPECT_NO_MORE_ARGS; + %token BOOK_IDENTIFIER %token CHORDMODIFIER_PITCH %token CHORD_MODIFIER @@ -269,24 +280,15 @@ If we give names, Bison complains. %token MARKUP_HEAD_SCM0_MARKUP1 %token MARKUP_HEAD_SCM0_SCM1 %token MARKUP_HEAD_SCM0_SCM1_MARKUP2 +%token MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 %token MARKUP_HEAD_SCM0_SCM1_SCM2 +%token MARKUP_LIST_HEAD_EMPTY +%token MARKUP_LIST_HEAD_LIST0 +%token MARKUP_LIST_HEAD_SCM0 +%token MARKUP_LIST_HEAD_SCM0_LIST1 +%token MARKUP_LIST_HEAD_SCM0_SCM1_LIST2 %token MARKUP_IDENTIFIER %token MUSIC_FUNCTION -%token MUSIC_FUNCTION_MARKUP -%token MUSIC_FUNCTION_MARKUP_MARKUP -%token MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC -%token MUSIC_FUNCTION_MARKUP_MUSIC -%token MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC -%token MUSIC_FUNCTION_MUSIC -%token MUSIC_FUNCTION_MUSIC_MUSIC -%token MUSIC_FUNCTION_SCM -%token MUSIC_FUNCTION_SCM_MUSIC -%token MUSIC_FUNCTION_SCM_MUSIC_MUSIC -%token MUSIC_FUNCTION_SCM_SCM -%token MUSIC_FUNCTION_SCM_SCM_MUSIC -%token MUSIC_FUNCTION_SCM_SCM_SCM -%token MUSIC_FUNCTION_SCM_SCM_SCM_MUSIC -%token MUSIC_FUNCTION_SCM_SCM_SCM_SCM_MUSIC %token MUSIC_IDENTIFIER %token NOTENAME_PITCH %token NUMBER_IDENTIFIER @@ -294,7 +296,7 @@ If we give names, Bison complains. %token REAL %token RESTNAME %token SCM_IDENTIFIER -%token SCM_T +%token SCM_TOKEN %token SCORE_IDENTIFIER %token STRING %token STRING_IDENTIFIER @@ -305,7 +307,7 @@ If we give names, Bison complains. %type book_body %type bare_unsigned -%type figured_bass_alteration +%type figured_bass_alteration %type dots %type exclamations %type optional_rest @@ -315,32 +317,33 @@ If we give names, Bison complains. %type sup_quotes %type tremolo_type -%type Composite_music -%type Grouped_music_list -%type Music -%type Prefix_composite_music -%type Repeated_music -%type Sequential_music -%type Simple_music -%type Simultaneous_music -%type chord_body -%type chord_body_element -%type command_element -%type command_event -%type context_change -%type direction_less_event -%type direction_reqd_event -%type event_chord -%type gen_text_def -%type music_property_def -%type note_chord_element -%type post_event -%type re_rhythmed_music -%type relative_music -%type simple_element -%type string_number_event -%type tempo_event -%type toplevel_music +/* Music */ +%type composite_music +%type grouped_music_list +%type music +%type prefix_composite_music +%type repeated_music +%type sequential_music +%type simple_music +%type simultaneous_music +%type chord_body +%type chord_body_element +%type command_element +%type command_event +%type context_change +%type direction_less_event +%type direction_reqd_event +%type event_chord +%type gen_text_def +%type music_property_def +%type note_chord_element +%type post_event +%type re_rhythmed_music +%type relative_music +%type simple_element +%type simple_music_property_def +%type string_number_event +%type tempo_event %type output_def_body %type output_def_head @@ -348,15 +351,13 @@ If we give names, Bison complains. %type output_def %type paper_block -%type Alternative_music -%type Generic_prefix_music_scm -%type Music_list +%type alternative_music +%type generic_prefix_music_scm +%type music_list %type absolute_pitch %type assignment_id %type bare_number -%type music_function_event -%type music_function_chord_body -%type music_function_musicless_prefix +%type unsigned_number %type bass_figure %type figured_bass_modification %type br_bass_figure @@ -378,6 +379,12 @@ If we give names, Bison complains. %type figure_spec %type fraction %type full_markup +%type full_markup_list +%type function_scm_argument +%type function_arglist +%type function_arglist_music_last +%type function_arglist_nonmusic_last +%type function_arglist_nonmusic %type identifier_init %type lilypond_header %type lilypond_header_body @@ -387,6 +394,7 @@ If we give names, Bison complains. %type markup_braced_list %type markup_braced_list_body %type markup_composed_list +%type markup_command_list %type markup_head_1_item %type markup_head_1_list %type markup_list @@ -394,6 +402,9 @@ If we give names, Bison complains. %type mode_changing_head %type mode_changing_head_with_context %type multiplied_duration +%type music_function_identifier_musicless_prefix +%type music_function_event +%type music_function_chord_body %type new_chord %type new_lyrics %type number_expression @@ -408,8 +419,10 @@ If we give names, Bison complains. %type pitch_also_in_chords %type post_events %type property_operation +%type property_path property_path_revved %type scalar %type script_abbreviation +%type simple_chord_elements %type simple_markup %type simple_string %type steno_duration @@ -418,7 +431,6 @@ If we give names, Bison complains. %type step_number %type step_numbers %type string -%type function_scm_argument %type score_block %type score_body @@ -439,10 +451,10 @@ lilypond: /* empty */ | lilypond assignment { } | lilypond error { - THIS->error_level_ = 1; + PARSER->error_level_ = 1; } | lilypond INVALID { - THIS->error_level_ = 1; + PARSER->error_level_ = 1; } ; @@ -453,30 +465,33 @@ object_id_setting: toplevel_expression: lilypond_header { - THIS->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1); + 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 (); + | 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 ()); } | 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 (), scm_list_1 ($1)); + } + | full_markup_list { + SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-text-handler"); + scm_call_2 (proc, PARSER->self_scm (), $1); } | output_def { SCM id = SCM_EOL; @@ -489,26 +504,21 @@ toplevel_expression: 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(); } ; -toplevel_music: - Composite_music { - } - ; - embedded_scm: - SCM_T + SCM_TOKEN | SCM_IDENTIFIER ; lilypond_header_body: { - $$ = get_header(THIS); - THIS->lexer_->add_scope ($$); + $$ = get_header (PARSER); + PARSER->lexer_->add_scope ($$); } | lilypond_header_body assignment { @@ -517,7 +527,7 @@ lilypond_header_body: lilypond_header: HEADER '{' lilypond_header_body '}' { - $$ = THIS->lexer_->remove_scope (); + $$ = PARSER->lexer_->remove_scope (); } ; @@ -531,16 +541,7 @@ assignment_id: assignment: assignment_id '=' identifier_init { - if (! is_regular_identifier ($1)) - { -#if 0 - /* no longer valid with dashes in \paper{} block. */ - @1.warning (_ ("identifier should have alphabetic characters only")); -#endif - } - - - THIS->lexer_->set_identifier ($1, $3); + PARSER->lexer_->set_identifier ($1, $3); /* TODO: devise standard for protection in parser. @@ -570,13 +571,20 @@ identifier_init: | context_def_spec_block { $$ = $1; } - | Music { - $$ = $1->self_scm (); - $1->unprotect(); + | 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)); } | post_event { - $$ = $1->self_scm (); - $1->unprotect(); + $$ = $1; } | number_expression { $$ = $1; @@ -605,11 +613,11 @@ context_def_spec_block: context_def_spec_body: /**/ { $$ = Context_def::make_scm (); - unsmob_context_def ($$)->set_spot (@$); + unsmob_context_def ($$)->origin ()->set_spot (@$); } | CONTEXT_DEF_IDENTIFIER { $$ = $1; - unsmob_context_def ($$)->set_spot (@$); + unsmob_context_def ($$)->origin ()->set_spot (@$); } | context_def_spec_body GROBDESCRIPTIONS embedded_scm { Context_def*td = unsmob_context_def ($$); @@ -641,26 +649,38 @@ book_block: book_body: { $$ = new Book; - $$->set_spot (@$); - $$->paper_ = dynamic_cast (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); + $$->origin ()->set_spot (@$); + $$->paper_ = dynamic_cast (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); - $$->set_spot (@$); + $$->protect (); + $$->origin ()->set_spot (@$); } | book_body paper_block { $$->paper_ = $2; $2->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; @@ -681,20 +701,20 @@ score_block: ; score_body: - Music { - SCM m = $1->self_scm (); - $1->unprotect(); + music { + 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); $$->protect (); - $$->set_spot (@$); + $$->origin ()->set_spot (@$); } | SCORE_IDENTIFIER { $$ = unsmob_score ($1); - $$->set_spot (@$); + $$->protect (); + $$->origin ()->set_spot (@$); } | score_body object_id_setting { $$->user_key_ = ly_scm2string ($2); @@ -705,7 +725,7 @@ score_body: | 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 @@ -729,8 +749,9 @@ paper_block: $$ = $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")); + $1->unprotect (); + $$ = get_paper (PARSER); } } ; @@ -740,33 +761,33 @@ output_def: 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; } ; @@ -778,11 +799,13 @@ output_def_body: } | output_def_head_with_mode_switch '{' OUTPUT_DEF_IDENTIFIER { $1->unprotect (); + Output_def *o = unsmob_output_def ($3); o->input_origin_.set_spot (@$); $$ = o; - THIS->lexer_->remove_scope (); - THIS->lexer_->add_scope (o->scope_); + $$->protect (); + PARSER->lexer_->remove_scope (); + PARSER->lexer_->add_scope (o->scope_); } | output_def_body assignment { @@ -790,16 +813,6 @@ output_def_body: | output_def_body context_def_spec_block { assign_context_def ($$, $2); } - | output_def_body tempo_event { - /* - 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")); - set_tempo ($$, d->get_length (), m); - $2->unprotect (); - } | output_def_body error { } @@ -807,10 +820,8 @@ output_def_body: tempo_event: TEMPO steno_duration '=' bare_unsigned { - $$ = MY_MAKE_MUSIC ("MetronomeChangeEvent"); - $$->set_property ("tempo-unit", $2); - $$->set_property ("metronome-count", scm_from_int ( $4)); - } + $$ = MAKE_SYNTAX ("tempo", @$, $2, scm_int2num ($4)); + } ; /* @@ -820,14 +831,13 @@ The representation of a list is the to have efficient append. */ -Music_list: +music_list: /* empty */ { $$ = scm_cons (SCM_EOL, SCM_EOL); } - | Music_list Music { + | 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 */ @@ -835,11 +845,11 @@ Music_list: scm_set_car_x (s, c); /* set first cons */ scm_set_cdr_x (s, c); /* remember last cell */ } - | Music_list embedded_scm { + | music_list embedded_scm { } - | Music_list error { - Music * m = MY_MAKE_MUSIC("Music"); + | music_list error { + Music *m = MY_MAKE_MUSIC("Music", @$); // ugh. code dup m->set_property ("error-found", SCM_BOOL_T); SCM s = $$; @@ -854,80 +864,59 @@ Music_list: } ; -Music: - Simple_music - | Composite_music +music: + simple_music + | composite_music ; -Alternative_music: +alternative_music: /* empty */ { $$ = SCM_EOL; } - | ALTERNATIVE '{' Music_list '}' { - $$ = $3; + | ALTERNATIVE '{' music_list '}' { + $$ = scm_car ($3); } ; -Repeated_music: - REPEAT simple_string bare_unsigned Music Alternative_music +repeated_music: + REPEAT simple_string unsigned_number music alternative_music { - SCM proc = ly_lily_module_constant ("make-repeat"); - SCM alts = scm_is_pair ($5) ? scm_car ($5) : SCM_EOL; - assert ($4); - SCM mus = scm_call_4 (proc, $2, scm_int2num ($3), $4->self_scm (), alts); - Music *r = unsmob_music (mus); - - r->protect (); - $4->unprotect (); - r->set_spot (*$4->origin ()); - - $$ = r; + $$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $5); } ; -Sequential_music: - SEQUENTIAL '{' Music_list '}' { - $$ = MY_MAKE_MUSIC ("SequentialMusic"); - $$->set_property ("elements", scm_car ($3)); - $$->set_spot (@$); +sequential_music: + SEQUENTIAL '{' music_list '}' { + $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($3)); } - | '{' Music_list '}' { - $$ = MY_MAKE_MUSIC ("SequentialMusic"); - $$->set_property ("elements", scm_car ($2)); - $$->set_spot (@$); + | '{' music_list '}' { + $$ = MAKE_SYNTAX ("sequential-music", @$, scm_car ($2)); } ; -Simultaneous_music: - SIMULTANEOUS '{' Music_list '}'{ - $$ = MY_MAKE_MUSIC ("SimultaneousMusic"); - $$->set_property ("elements", scm_car ($3)); - $$->set_spot (@$); - +simultaneous_music: + SIMULTANEOUS '{' music_list '}'{ + $$ = 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 (@$); + | DOUBLE_ANGLE_OPEN music_list DOUBLE_ANGLE_CLOSE { + $$ = MAKE_SYNTAX ("simultaneous-music", @$, scm_car ($2)); } ; -Simple_music: - event_chord { $$ = $1; } - | MUSIC_IDENTIFIER { - $$ = unsmob_music ($1); - } +simple_music: + 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; } ; @@ -939,14 +928,14 @@ context_mod_list: } ; -Composite_music: - Prefix_composite_music { $$ = $1; } - | Grouped_music_list { $$ = $1; } +composite_music: + prefix_composite_music { $$ = $1; } + | grouped_music_list { $$ = $1; } ; -Grouped_music_list: - Simultaneous_music { $$ = $1; } - | Sequential_music { $$ = $1; } +grouped_music_list: + simultaneous_music { $$ = $1; } + | sequential_music { $$ = $1; } ; function_scm_argument: @@ -954,53 +943,52 @@ function_scm_argument: | simple_string ; -/* -TODO: use code generation for this -*/ -Generic_prefix_music_scm: - MUSIC_FUNCTION { - $$ = scm_list_2 ($1, make_input (@$)); - } - | MUSIC_FUNCTION_SCM function_scm_argument { - $$ = scm_list_3 ($1, make_input (@$), $2); - } - | MUSIC_FUNCTION_MARKUP full_markup { - $$ = scm_list_3 ($1, make_input (@$), $2); - } - | music_function_musicless_prefix Music { - $$ = ly_append2 ($1, scm_list_1 ($2->self_scm ())); - $2->unprotect (); +/* An argument list. If a function \foo expects scm scm music, then the lexer expands \foo into the token sequence: + MUSIC_FUNCTION EXPECT_MUSIC EXPECT_SCM EXPECT_SCM +and this rule returns the reversed list of arguments. */ + +function_arglist_music_last: + EXPECT_MUSIC function_arglist music { + $$ = scm_cons ($3, $2); } - | MUSIC_FUNCTION_SCM_SCM function_scm_argument function_scm_argument { - $$ = scm_list_4 ($1, make_input (@$), $2, $3); + ; + +function_arglist_nonmusic_last: + EXPECT_MARKUP function_arglist full_markup { + $$ = scm_cons ($3, $2); } - | MUSIC_FUNCTION_SCM_SCM_SCM function_scm_argument function_scm_argument function_scm_argument { - $$ = scm_list_5 ($1, make_input (@$), $2, $3, $4); + | EXPECT_SCM function_arglist function_scm_argument { + $$ = scm_cons ($3, $2); } - | MUSIC_FUNCTION_MARKUP_MUSIC full_markup Music { - $$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ()); - $3->unprotect (); + ; + +function_arglist_nonmusic: EXPECT_NO_MORE_ARGS { + $$ = SCM_EOL; } - | MUSIC_FUNCTION_MARKUP_MARKUP full_markup full_markup { - $$ = scm_list_4 ($1, make_input (@$), $2, $3); + | EXPECT_MARKUP function_arglist_nonmusic full_markup { + $$ = scm_cons ($3, $2); } - | MUSIC_FUNCTION_MUSIC_MUSIC Music Music { - $$ = scm_list_4 ($1, make_input (@$), $2->self_scm (), $3->self_scm ()); - $2->unprotect (); - $3->unprotect (); + | EXPECT_SCM function_arglist_nonmusic function_scm_argument { + $$ = scm_cons ($3, $2); } - | 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 (); + ; + +function_arglist: EXPECT_NO_MORE_ARGS { + /* This is for 0-ary functions, so they don't need to + read a lookahead token */ + $$ = SCM_EOL; } - | 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 (); + | function_arglist_music_last + | function_arglist_nonmusic_last + ; + +generic_prefix_music_scm: + MUSIC_FUNCTION function_arglist { + $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); } ; + optional_id: /**/ { $$ = SCM_EOL; } | '=' simple_string { @@ -1009,67 +997,45 @@ optional_id: ; -Prefix_composite_music: - Generic_prefix_music_scm { - $$ = run_music_function (THIS, $1); +prefix_composite_music: + generic_prefix_music_scm { + $$ = run_music_function (PARSER, $1); } - | CONTEXT simple_string optional_id optional_context_mod Music { - $$ = context_spec_music ($2, $3, $5, $4, false); + | CONTEXT simple_string optional_id optional_context_mod music { + $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_F); } - | NEWCONTEXT simple_string optional_id optional_context_mod Music { - $$ = context_spec_music ($2, $3, $5, $4, true); + | NEWCONTEXT simple_string optional_id optional_context_mod music { + $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_T); } - | 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 (@$); - - $$->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))); - } - | Repeated_music { $$ = $1; } - | TRANSPOSE pitch_also_in_chords pitch_also_in_chords Music { - $$ = MY_MAKE_MUSIC ("TransposedMusic"); - Music *p = $4; + | 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); - - p->transpose (pitch_interval (from, to)); - $$->set_property ("element", p->self_scm ()); - p->unprotect(); + SCM pitch = pitch_interval (from, to).smobbed_copy (); + $$ = MAKE_SYNTAX ("transpose-music", @$, pitch, $4); } - | mode_changing_head Grouped_music_list { + | 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(); + $$ = MAKE_SYNTAX ("unrelativable-music", @$, $2); } 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, SCM_UNDEFINED, $3, $2, true); + | mode_changing_head_with_context optional_context_mod grouped_music_list { + $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, $2, SCM_BOOL_T); if ($1 == ly_symbol2scm ("ChordNames")) { - Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic"); - chm->set_property ("element", $$->self_scm ()); - $$->unprotect(); - $$ = chm; + $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$); } - THIS->lexer_->pop_state (); + PARSER->lexer_->pop_state (); } | relative_music { $$ = $1; } | re_rhythmed_music { $$ = $1; } @@ -1077,148 +1043,126 @@ Prefix_composite_music: 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; + RELATIVE absolute_pitch music { Pitch start = *unsmob_pitch ($2); - $$ = make_music_relative (start, m); - m->unprotect(); + $$ = make_music_relative (start, $3, @$); } - | RELATIVE Composite_music { - Music *m = $2; - + | RELATIVE composite_music { 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 + 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 (); - } Grouped_music_list { - THIS->lexer_->pop_state (); - $$ = scm_cons ($4->self_scm (), $1); + PARSER->lexer_->push_lyric_state (); + } grouped_music_list { + 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); - if (!scm_is_string (name)) - { - name = get_next_unique_lyrics_context_id (); - voice = context_spec_music (scm_makfrom0str ("Voice"), - name, - voice, SCM_EOL, false); - } - - SCM context = scm_makfrom0str ("Lyrics"); - Music *all = MY_MAKE_MUSIC ("SimultaneousMusic"); - - 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, - SCM_UNDEFINED, com, SCM_EOL, true); - lst = scm_cons (csm->self_scm (), lst); - } - all->set_property ("elements", scm_cons (voice->self_scm (), - lst)); - $$ = all; - voice->unprotect (); + grouped_music_list new_lyrics { + $$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL)); } | LYRICSTO simple_string { - THIS->lexer_->push_lyric_state (); - } Music { - THIS->lexer_->pop_state (); - Music *music = $4; - SCM name = $2; - $$ = make_lyric_combine_music (name, music); - music->unprotect(); + PARSER->lexer_->push_lyric_state (); + } music { + PARSER->lexer_->pop_state (); + $$ = MAKE_SYNTAX ("lyric-combine", @$, $2, $4); } ; context_change: CHANGE STRING '=' STRING { - Music*t = MY_MAKE_MUSIC ("ContextChange"); - t-> set_property ("change-to-type", scm_string_to_symbol ($2)); - t-> set_property ("change-to-id", $4); + $$ = MAKE_SYNTAX ("context-change", @$, scm_string_to_symbol ($2), $4); + } + ; + - $$ = t; - $$->set_spot (@$); +property_path_revved: + embedded_scm { + $$ = scm_cons ($1, SCM_EOL); + } + | property_path_revved embedded_scm { + $$ = scm_cons ($2, $1); } ; +property_path: + property_path_revved { + $$ = scm_reverse_x ($1, SCM_EOL); + } + ; + property_operation: STRING '=' scalar { $$ = scm_list_3 (ly_symbol2scm ("assign"), @@ -1228,13 +1172,10 @@ property_operation: $$ = scm_list_2 (ly_symbol2scm ("unset"), scm_string_to_symbol ($2)); } - | OVERRIDE simple_string embedded_scm '=' embedded_scm { - $$ = scm_list_4 (ly_symbol2scm ("push"), - scm_string_to_symbol ($2), $5, $3); - } - | OVERRIDE simple_string embedded_scm embedded_scm '=' embedded_scm { - $$ = scm_list_5 (ly_symbol2scm ("push"), - scm_string_to_symbol ($2), $6, $4, $3); + | OVERRIDE simple_string property_path '=' embedded_scm { + $$ = scm_append (scm_list_2 (scm_list_3 (ly_symbol2scm ("push"), + scm_string_to_symbol ($2), $5), + $3)); } | REVERT simple_string embedded_scm { $$ = scm_list_3 (ly_symbol2scm ("pop"), @@ -1279,50 +1220,41 @@ context_prop_spec: } ; -music_property_def: - OVERRIDE context_prop_spec embedded_scm '=' scalar { - $$ = 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, false); - } - | OVERRIDE context_prop_spec embedded_scm embedded_scm '=' scalar { - $$ = 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, false); +simple_music_property_def: + OVERRIDE context_prop_spec property_path '=' scalar { + $$ = scm_append (scm_list_2 (scm_list_n (scm_car ($2), + ly_symbol2scm ("OverrideProperty"), + scm_cadr ($2), + $5, SCM_UNDEFINED), + $3)); } | REVERT context_prop_spec embedded_scm { - $$ = property_op_to_music (scm_list_3 ( - ly_symbol2scm ("pop"), + $$ = scm_list_4 (scm_car ($2), + ly_symbol2scm ("RevertProperty"), scm_cadr ($2), - $3)); - - $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false); + $3); } | SET context_prop_spec '=' scalar { - $$ = property_op_to_music (scm_list_3 ( - ly_symbol2scm ("assign"), + $$ = scm_list_4 (scm_car ($2), + ly_symbol2scm ("PropertySet"), scm_cadr ($2), - $4)); - $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false); + $4); } | UNSET context_prop_spec { - $$ = property_op_to_music (scm_list_2 ( - ly_symbol2scm ("unset"), - scm_cadr ($2))); - $$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false); - } - | ONCE music_property_def { - SCM e = $2->get_property ("element"); - unsmob_music (e)->set_property ("once", SCM_BOOL_T); - $$ = $2; - + $$ = scm_list_3 (scm_car ($2), + ly_symbol2scm ("PropertyUnset"), + scm_cadr ($2)); } ; +music_property_def: + simple_music_property_def { + $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons (PARSER->self_scm (), scm_cons2 (make_input (@$), SCM_BOOL_F, $1))); + } + | ONCE simple_music_property_def { + $$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons (PARSER->self_scm (), scm_cons2 (make_input (@$), SCM_BOOL_T, $2))); + } + ; string: STRING { @@ -1367,41 +1299,23 @@ scalar: string { } ; -/* - -pre_events doesn't contain anything. It is a trick: - -Adding pre_events to the simple_element -makes the choice between - - string: STRING - -and - - simple_element: STRING - -a single shift/reduction conflict. - -nevertheless, this is not very clean, and we should find a different -solution. - -*/ -pre_events: /* empty */ - ; - event_chord: - pre_events simple_element post_events { - SCM elts = $2-> get_property ("elements"); - - elts = ly_append2 (elts, scm_reverse_x ($3, SCM_EOL)); + /* TODO: Create a special case that avoids the creation of + EventChords around simple_elements that have no post_events? + */ + simple_chord_elements post_events { + SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL)); - $2->set_property ("elements", elts); + Input i; /* why is this giving wrong start location? -ns - * $2->set_spot (@$); */ + * i = @$; */ + i.set_location (@1, @2); + $$ = MAKE_SYNTAX ("event-chord", i, elts); + } + | MULTI_MEASURE_REST optional_notemode_duration post_events { Input i; - i.set_location (@2, @3); - $2->set_spot (i); - $$ = $2; + i.set_location (@1, @3); + $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, $3); } | command_element | note_chord_element @@ -1411,47 +1325,32 @@ event_chord: 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_open: '<' - ; - -chord_close: '>' - ; - -simul_open: DOUBLE_ANGLE_OPEN - ; - -simul_close: DOUBLE_ANGLE_CLOSE - ; - chord_body: - chord_open chord_body_elements chord_close + ANGLE_OPEN chord_body_elements ANGLE_CLOSE { - $$ = MY_MAKE_MUSIC ("EventChord"); - $$->set_spot (@$); - $$->set_property ("elements", - scm_reverse_x ($2, SCM_EOL)); + $$ = MAKE_SYNTAX ("event-chord", @$, scm_reverse_x ($2, SCM_EOL)); } ; chord_body_elements: /* empty */ { $$ = SCM_EOL; } | chord_body_elements chord_body_element { - $$ = scm_cons ($2->self_scm (), $1); - $2->unprotect (); + $$ = scm_cons ($2, $1); } ; @@ -1463,9 +1362,8 @@ chord_body_element: SCM check = $4; SCM post = $5; - Music *n = MY_MAKE_MUSIC ("NoteEvent"); + Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); n->set_property ("pitch", $1); - n->set_spot (@$); if (q % 2) n->set_property ("cautionary", SCM_BOOL_T); if (ex % 2 || q % 2) @@ -1481,179 +1379,137 @@ chord_body_element: n->set_property ("absolute-octave", scm_from_int (q-1)); } - - $$ = n; + $$ = n->unprotect (); } | DRUM_PITCH post_events { - Music *n = MY_MAKE_MUSIC ("NoteEvent"); + Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); n->set_property ("duration", $2); n->set_property ("drum-type", $1); - n->set_spot (@$); if (scm_is_pair ($2)) { 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 (@$); + $$ = run_music_function (PARSER, $1); } ; -music_function_chord_body: - MUSIC_FUNCTION { - $$ = scm_list_2 ($1, make_input (@$)); - } - | music_function_musicless_prefix chord_body_element { - $$ = ly_append2 ($1, scm_list_1 ($2->self_scm ())); - $2->unprotect (); +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."); + } } ; -music_function_event: - music_function_musicless_prefix post_event { - $$ = ly_append2 ($1, scm_list_1 ($2->self_scm ())); - $2->unprotect (); +music_function_chord_body: + /* We could allow chord functions to have multiple music arguments, + but it's more consistent with music_function_event if we + prohibit it here too */ + music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic chord_body_element { + $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4))); + } + | music_function_identifier_musicless_prefix function_arglist_nonmusic { + $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); } ; -/* -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_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_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); + | music_function_identifier_musicless_prefix function_arglist_nonmusic { + $$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL)); } ; - 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 (@$); + $$ = $1; } | SKIP duration_length { - Music *skip = MY_MAKE_MUSIC ("SkipMusic"); - skip->set_property ("duration", $2); - skip->set_spot (@$); - $$ = skip; + $$ = MAKE_SYNTAX ("skip-music", @$, $2); } | E_BRACKET_OPEN { - Music *m = MY_MAKE_MUSIC ("LigatureEvent"); + 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)); - m->unprotect(); - $$->set_spot (@$); + $$ = m->unprotect(); } | E_BRACKET_CLOSE { - Music *m = MY_MAKE_MUSIC ("LigatureEvent"); + 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 (@$); - m->unprotect (); + $$ = m->unprotect (); } | E_BACKSLASH { - $$ = MY_MAKE_MUSIC ("VoiceSeparator"); - $$->set_spot (@$); + $$ = MAKE_SYNTAX ("voice-separator", @$, SCM_UNDEFINED); } | '|' { - 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 (); + m->set_spot (@$); + $$ = m->unprotect (); + } else - $$ = MY_MAKE_MUSIC ("BarCheck"); + $$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED); - $$->set_spot (@$); - } - | TRANSPOSITION pitch { - Pitch middle_c; - Pitch sounds_as_c = pitch_interval (*unsmob_pitch ($2), middle_c); - $$ = set_property_music (ly_symbol2scm ("instrumentTransposition"), - sounds_as_c.smobbed_copy()); - $$->set_spot (@$); - $$ = context_spec_music (ly_symbol2scm ("Staff"), SCM_UNDEFINED, - $$, SCM_EOL, false); } - | PARTIAL duration_length { + | 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, false); - p = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED, - p, SCM_EOL, false); - $$ = p; + $$ = 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 ("Score"), SCM_BOOL_F, $$, SCM_EOL, SCM_BOOL_F); } | 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; + Music *m = MY_MAKE_MUSIC ("MarkEvent", @$); + $$ = m->unprotect (); } | tempo_event { $$ = $1; } | KEY DEFAULT { - Music *key = MY_MAKE_MUSIC ("KeyChangeEvent"); - $$ = key; + Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$); + $$ = key->unprotect (); } | KEY NOTENAME_PITCH SCM_IDENTIFIER { - Music *key = MY_MAKE_MUSIC ("KeyChangeEvent"); + Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$); if (scm_ilength ($3) > 0) { key->set_property ("pitch-alist", $3); key->set_property ("tonic", Pitch (0, 0, 0).smobbed_copy ()); key->transpose (* unsmob_pitch ($2)); } else { - THIS->parser_error (@3, _ ("second argument must be pitch list")); + PARSER->parser_error (@3, _ ("second argument must be pitch list")); } - $$ = key; + $$ = key->unprotect (); } ; @@ -1663,9 +1519,8 @@ post_events: $$ = SCM_EOL; } | post_events post_event { - $2->set_spot (@2); - $$ = scm_cons ($2->self_scm (), $$); - $2->unprotect (); + unsmob_music ($2)->set_spot (@2); + $$ = scm_cons ($2, $$); } ; @@ -1674,28 +1529,32 @@ post_event: $$ = $1; } | '-' music_function_event { - Music *mus = run_music_function (THIS, $2); - mus->set_spot (@1); - $$ = mus; + $$ = run_music_function (PARSER, $2); } | 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 @@ -1703,10 +1562,9 @@ post_event: string_number_event: E_UNSIGNED { - Music *s = MY_MAKE_MUSIC ("StringNumberEvent"); + Music *s = MY_MAKE_MUSIC ("StringNumberEvent", @$); s->set_property ("string-number", scm_from_int ($1)); - s->set_spot (@$); - $$ = s; + $$ = s->unprotect (); } ; @@ -1745,27 +1603,26 @@ direction_less_char: 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->set_spot (@$); } else { - m = MY_MAKE_MUSIC ("Music"); + 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 (@$); + Music *a = MY_MAKE_MUSIC ("TremoloEvent", @$); a->set_property ("tremolo-type", scm_from_int ($1)); - $$ = a; + $$ = a->unprotect (); } ; @@ -1774,19 +1631,19 @@ direction_reqd_event: $$ = $1; } | script_abbreviation { - SCM s = THIS->lexer_->lookup_identifier ("dash" + ly_scm2string ($1)); - Music *a = MY_MAKE_MUSIC ("ArticulationEvent"); + 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 (); } ; octave_check: /**/ { $$ = SCM_EOL; } | '=' { $$ = scm_from_int (0); } - | '=' sub_quotes { $$ = scm_from_int ($2); } + | '=' sub_quotes { $$ = scm_from_int (-$2); } | '=' sup_quotes { $$ = scm_from_int ($2); } ; @@ -1838,7 +1695,7 @@ steno_tonic_pitch: $$ = p.smobbed_copy (); } | TONICNAME_PITCH sub_quotes { - Pitch p =* unsmob_pitch ($1); + Pitch p = *unsmob_pitch ($1); p = p.transposed (Pitch (-$2,0,0)); $$ = p.smobbed_copy (); @@ -1858,48 +1715,44 @@ pitch_also_in_chords: gen_text_def: full_markup { - Music *t = MY_MAKE_MUSIC ("TextScriptEvent"); + Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$); t->set_property ("text", $1); - t->set_spot (@$); - $$ = t; + $$ = t->unprotect (); } | string { - Music *t = MY_MAKE_MUSIC ("TextScriptEvent"); + 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"); + Music *t = MY_MAKE_MUSIC ("FingeringEvent", @$); t->set_property ("digit", scm_from_int ($1)); - t->set_spot (@$); - $$ = t; + $$ = t->unprotect (); } ; script_abbreviation: '^' { - $$ = scm_makfrom0str ("Hat"); + $$ = scm_from_locale_string ("Hat"); } | '+' { - $$ = scm_makfrom0str ("Plus"); + $$ = scm_from_locale_string ("Plus"); } | '-' { - $$ = scm_makfrom0str ("Dash"); + $$ = scm_from_locale_string ("Dash"); } | '|' { - $$ = scm_makfrom0str ("Bar"); + $$ = scm_from_locale_string ("Bar"); } - | '>' { - $$ = scm_makfrom0str ("Larger"); + | ANGLE_CLOSE { + $$ = scm_from_locale_string ("Larger"); } | '.' { - $$ = scm_makfrom0str ("Dot"); + $$ = scm_from_locale_string ("Dot"); } | '_' { - $$ = scm_makfrom0str ("Underscore"); + $$ = scm_from_locale_string ("Underscore"); } ; @@ -1924,12 +1777,12 @@ duration_length: 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 ($$); } ; @@ -1937,7 +1790,7 @@ steno_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); @@ -1987,7 +1840,7 @@ tremolo_type: } | ':' 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; } ; @@ -2004,20 +1857,18 @@ bass_number: ; figured_bass_alteration: - '-' { $$ = -2; } - | '+' { $$ = 2; } - | '!' { $$ = 0; } + '-' { $$ = ly_rational2scm (FLAT_ALTERATION); } + | '+' { $$ = ly_rational2scm (SHARP_ALTERATION); } + | '!' { $$ = scm_from_int (0); } ; bass_figure: FIGURE_SPACE { - Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent"); - $$ = bfr->self_scm (); - bfr->unprotect (); - bfr->set_spot (@1); + Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent", @$); + $$ = bfr->unprotect (); } | bass_number { - Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent"); + Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent", @$); $$ = bfr->self_scm (); if (scm_is_number ($1)) @@ -2026,7 +1877,6 @@ bass_figure: bfr->set_property ("text", $1); bfr->unprotect (); - bfr->set_spot (@1); } | bass_figure ']' { $$ = $1; @@ -2034,11 +1884,11 @@ bass_figure: } | bass_figure figured_bass_alteration { Music *m = unsmob_music ($1); - if ($2) { + if (scm_to_double ($2)) { SCM salter = m->get_property ("alteration"); - int alter = scm_is_number (salter) ? scm_to_int (salter) : 0; + SCM alter = scm_is_number (salter) ? salter : scm_from_int (0); m->set_property ("alteration", - scm_from_int (alter + $2)); + scm_sum (alter, $2)); } else { m->set_property ("alteration", scm_from_int (0)); } @@ -2094,10 +1944,7 @@ figure_list: figure_spec: FIGURE_OPEN figure_list FIGURE_CLOSE { - Music *m = MY_MAKE_MUSIC ("EventChord"); - $2 = scm_reverse_x ($2, SCM_EOL); - m->set_property ("elements", $2); - $$ = m->self_scm (); + $$ = scm_reverse_x ($2, SCM_EOL); } ; @@ -2109,14 +1956,14 @@ optional_rest: 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) - n = MY_MAKE_MUSIC ("RestEvent"); + n = MY_MAKE_MUSIC ("RestEvent", @$); else - n = MY_MAKE_MUSIC ("NoteEvent"); + n = MY_MAKE_MUSIC ("NoteEvent", @$); n->set_property ("pitch", $1); n->set_property ("duration", $5); @@ -2132,81 +1979,55 @@ simple_element: if ($2 % 2 || $3 % 2) n->set_property ("force-accidental", SCM_BOOL_T); - Music *v = MY_MAKE_MUSIC ("EventChord"); - v->set_property ("elements", scm_list_1 (n->self_scm ())); - n->unprotect (); - - v->set_spot (@$); - n->set_spot (@$); - $$ = v; + $$ = n->unprotect (); } | DRUM_PITCH optional_notemode_duration { - Music *n = MY_MAKE_MUSIC ("NoteEvent"); + Music *n = MY_MAKE_MUSIC ("NoteEvent", @$); n->set_property ("duration", $2); n->set_property ("drum-type", $1); - Music *v = MY_MAKE_MUSIC ("EventChord"); - v->set_property ("elements", scm_list_1 (n->self_scm ())); - n->unprotect (); - v->set_spot (@$); - n->set_spot (@$); - $$ = v; - + $$ = n->unprotect (); } - | figure_spec optional_notemode_duration { - Music *m = unsmob_music ($1); - m->set_spot (@$); - for (SCM s = m->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s)) - { - unsmob_music (scm_car (s))->set_property ("duration", $2); - } - $$ = m; - } | RESTNAME optional_notemode_duration { Music *ev = 0; if (ly_scm2string ($1) == "s") { /* Space */ - ev = MY_MAKE_MUSIC ("SkipEvent"); + ev = MY_MAKE_MUSIC ("SkipEvent", @$); } else { - ev = MY_MAKE_MUSIC ("RestEvent"); + ev = MY_MAKE_MUSIC ("RestEvent", @$); } ev->set_property ("duration", $2); - ev->set_spot (@$); - Music *velt = MY_MAKE_MUSIC ("EventChord"); - velt->set_property ("elements", scm_list_1 (ev->self_scm ())); - velt->set_spot (@$); - - ev->unprotect(); - - $$ = velt; - } - | 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 (); + $$ = ev->unprotect (); } - | 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"); + Music *levent = MY_MAKE_MUSIC ("LyricEvent", @$); levent->set_property ("text", $1); levent->set_property ("duration",$2); - levent->set_spot (@$); - Music *velt = MY_MAKE_MUSIC ("EventChord"); - velt->set_property ("elements", scm_list_1 (levent->self_scm ())); - - $$= velt; + $$= levent->unprotect (); } + ; + +simple_chord_elements: + simple_element { + $$ = scm_list_1 ($1); + } | 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; } + | figure_spec optional_notemode_duration { + for (SCM s = $1; scm_is_pair (s); s = scm_cdr (s)) + { + unsmob_music (scm_car (s))->set_property ("duration", $2); + } + $$ = $1; + } ; lyric_element: @@ -2220,11 +2041,11 @@ lyric_element: new_chord: steno_tonic_pitch optional_notemode_duration { - $$ = make_chord ($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 ($1, $2, scm_cons ($3, its)); + $$ = make_chord_elements ($1, $2, scm_cons ($3, its)); } ; @@ -2276,10 +2097,10 @@ step_number: $$ = make_chord_step ($1, 0); } | bare_unsigned '+' { - $$ = make_chord_step ($1, SHARP); + $$ = make_chord_step ($1, SHARP_ALTERATION); } | bare_unsigned CHORD_MINUS { - $$ = make_chord_step ($1, FLAT); + $$ = make_chord_step ($1, FLAT_ALTERATION); } ; @@ -2347,6 +2168,14 @@ bare_unsigned: } ; +unsigned_number: + bare_unsigned { $$ = scm_from_int ($1); } + | NUMBER_IDENTIFIER { + $$ = $1; + } + ; + + exclamations: { $$ = 0; } | exclamations '!' { $$ ++; } @@ -2366,10 +2195,19 @@ lyric_markup: $$ = $1; } | LYRIC_MARKUP - { THIS->lexer_->push_markup_state (); } + { PARSER->lexer_->push_markup_state (); } markup_top { $$ = $3; - THIS->lexer_->pop_state (); + PARSER->lexer_->pop_state (); + } + ; + +full_markup_list: + MARKUPLINES + { PARSER->lexer_->push_markup_state (); } + markup_list { + $$ = $3; + PARSER->lexer_->pop_state (); } ; @@ -2378,10 +2216,10 @@ full_markup: $$ = $1; } | MARKUP - { THIS->lexer_->push_markup_state (); } + { PARSER->lexer_->push_markup_state (); } markup_top { $$ = $3; - THIS->lexer_->pop_state (); + PARSER->lexer_->pop_state (); } ; @@ -2404,6 +2242,9 @@ markup_list: | markup_braced_list { $$ = $1; } + | markup_command_list { + $$ = scm_list_1 ($1); + } ; markup_composed_list: @@ -2429,6 +2270,24 @@ markup_braced_list_body: } ; +markup_command_list: + MARKUP_LIST_HEAD_EMPTY { + $$ = scm_list_1 ($1); + } + | MARKUP_LIST_HEAD_LIST0 markup_list { + $$ = scm_list_2 ($1, $2); + } + | MARKUP_LIST_HEAD_SCM0 embedded_scm { + $$ = scm_list_2 ($1, $2); + } + | MARKUP_LIST_HEAD_SCM0_LIST1 embedded_scm markup_list { + $$ = scm_list_3 ($1, $2, $3); + } + | MARKUP_LIST_HEAD_SCM0_SCM1_LIST2 embedded_scm embedded_scm markup_list { + $$ = scm_list_4 ($1, $2, $3, $4); + } + ; + markup_head_1_item: MARKUP_HEAD_MARKUP0 { $$ = scm_list_1 ($1); @@ -2464,13 +2323,13 @@ simple_markup: $$ = $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); @@ -2481,6 +2340,9 @@ simple_markup: | MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm { $$ = scm_list_3 ($1, $2, $3); } + | MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 embedded_scm markup markup { + $$ = scm_list_4 ($1, $2, $3, $4); + } | MARKUP_HEAD_EMPTY { $$ = scm_list_1 ($1); } @@ -2505,11 +2367,9 @@ markup: %% void -Lily_parser::set_yydebug (bool ) +Lily_parser::set_yydebug (bool x) { -#if 0 - yydebug = 1; -#endif + yydebug = x; } void @@ -2535,17 +2395,26 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) *destination = sid; return STRING_IDENTIFIER; } else if (unsmob_book (sid)) { - *destination = unsmob_book (sid)->clone ()->self_scm (); + Book *book = unsmob_book (sid)->clone (); + *destination = book->self_scm (); + book->unprotect (); + return BOOK_IDENTIFIER; } else if (scm_is_number (sid)) { *destination = sid; return NUMBER_IDENTIFIER; } else if (unsmob_context_def (sid)) { - *destination = unsmob_context_def (sid)->clone_scm (); + Context_def *def= unsmob_context_def (sid)->clone (); + + *destination = def->self_scm (); + def->unprotect (); + return CONTEXT_DEF_IDENTIFIER; } else if (unsmob_score (sid)) { Score *score = new Score (*unsmob_score (sid)); *destination = score->self_scm (); + + score->unprotect (); return SCORE_IDENTIFIER; } else if (Music *mus = unsmob_music (sid)) { mus = mus->clone (); @@ -2556,6 +2425,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) bool is_event = scm_memq (ly_symbol2scm ("event"), mus->get_property ("types")) != SCM_BOOL_F; + mus->unprotect (); return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER; } else if (unsmob_duration (sid)) { *destination = unsmob_duration (sid)->smobbed_copy (); @@ -2563,8 +2433,9 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) } else if (unsmob_output_def (sid)) { Output_def *p = unsmob_output_def (sid); p = p->clone (); - + *destination = p->self_scm (); + p->unprotect (); return OUTPUT_DEF_IDENTIFIER; } else if (Text_interface::is_markup (sid)) { *destination = sid; @@ -2576,71 +2447,10 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) return -1; } -Music * -property_op_to_music (SCM op) -{ - Music *m = 0; - SCM tag = scm_car (op); - SCM symbol = scm_cadr (op); - SCM args = scm_cddr (op); - SCM grob_val = SCM_UNDEFINED; - SCM grob_path = SCM_UNDEFINED; - SCM val = SCM_UNDEFINED; - - if (tag == ly_symbol2scm ("assign")) - { - m = MY_MAKE_MUSIC ("PropertySet"); - val = scm_car (args); - } - else if (tag == ly_symbol2scm ("unset")) - m = MY_MAKE_MUSIC ("PropertyUnset"); - else if (tag == ly_symbol2scm ("push")) - { - m = MY_MAKE_MUSIC ("OverrideProperty"); - grob_val = scm_car (args); - grob_path = scm_cdr (args); - m->set_property ("pop-first", SCM_BOOL_T); - } - else if (tag == ly_symbol2scm ("pop")) { - m = MY_MAKE_MUSIC ("RevertProperty"); - grob_path = args; - } - - m->set_property ("symbol", symbol); - - if (val != SCM_UNDEFINED) - m->set_property ("value", val); - if (grob_val != SCM_UNDEFINED) - m->set_property ("grob-value", grob_val); - if (grob_path != SCM_UNDEFINED) - m->set_property ("grob-property-path", grob_path); - - return m; -} - -Music* -context_spec_music (SCM type, SCM id, Music *m, SCM ops, bool create_new) -{ - Music *csm = MY_MAKE_MUSIC ("ContextSpeccedMusic"); - - csm->set_property ("element", m->self_scm ()); - m->unprotect (); - - 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; -} - SCM get_next_unique_context_id () { - return scm_makfrom0str ("$uniqueContextId"); + return scm_from_locale_string ("$uniqueContextId"); } @@ -2650,11 +2460,11 @@ get_next_unique_lyrics_context_id () static int new_context_count; char s[128]; snprintf (s, sizeof (s)-1, "uniqueContext%d", new_context_count++); - return scm_makfrom0str (s); + return scm_from_locale_string (s); } -Music * +SCM run_music_function (Lily_parser *parser, SCM expr) { SCM func = scm_car (expr); @@ -2663,34 +2473,15 @@ run_music_function (Lily_parser *parser, SCM expr) SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature")); SCM type_check_proc = ly_lily_module_constant ("type-check-list"); - bool ok = true; if (!to_boolean (scm_call_3 (type_check_proc, scm_cadr (expr), sig, args))) { parser->error_level_ = 1; - ok = false; + return LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("void-music"), scm_list_2 (parser->self_scm (), make_input (*loc))); } - SCM m = SCM_EOL; - if (ok) - m = scm_apply_0 (func, scm_cons (parser->self_scm(), - scm_cdr (expr))); - - - Music* retval = 0; - if (unsmob_music (m)) - { - retval = unsmob_music (m); - retval->protect (); - } - else - { - if (ok) - loc->error (_ ("music head function must return Music object")); - retval = MY_MAKE_MUSIC ("Music"); - } - retval->set_spot (*loc); - return retval; + 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); } bool @@ -2712,6 +2503,13 @@ is_regular_identifier (SCM id) return v; } +Music * +make_music_with_input (SCM name, Input where) +{ + Music *m = make_music_by_name (name); + m->set_spot (where); + return m; +} SCM get_first_context_id (SCM type, Music *m) @@ -2742,15 +2540,15 @@ void set_music_properties (Music *p, SCM a) { for (SCM k = a; scm_is_pair (k); k = scm_cdr (k)) - p->internal_set_property (scm_caar (k), scm_cdar (k)); + p->set_property (scm_caar (k), scm_cdar (k)); } SCM -make_chord_step (int step, int alter) +make_chord_step (int step, Rational alter) { if (step == 7) - alter += FLAT; + alter += FLAT_ALTERATION; while (step < 0) step += 7; @@ -2760,13 +2558,10 @@ make_chord_step (int step, int alter) SCM -make_chord (SCM pitch, SCM dur, SCM modification_list) +make_chord_elements (SCM pitch, SCM dur, SCM modification_list) { - SCM chord_ctor = ly_lily_module_constant ("construct-chord"); - SCM ch = scm_call_3 (chord_ctor, pitch, dur, modification_list); - - unsmob_music (ch)->protect(); - return ch; + SCM chord_ctor = ly_lily_module_constant ("construct-chord-elements"); + return scm_call_3 (chord_ctor, pitch, dur, modification_list); } @@ -2778,37 +2573,19 @@ ly_input_procedure_p (SCM x) || (scm_is_pair (x) && ly_is_procedure (scm_car (x))); } -Music* -set_property_music (SCM sym, SCM value) -{ - Music *p = MY_MAKE_MUSIC ("PropertySet"); - p->set_property ("symbol", sym); - p->set_property ("value", value); - return p; -} - -Music* -make_music_relative (Pitch start, Music *music) +SCM +make_music_relative (Pitch start, SCM music, Input loc) { - Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic"); - relative->set_property ("element", music->self_scm ()); + Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic", loc); + 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; -} - -Music * -make_lyric_combine_music (SCM name, Music *music) -{ - Music *combine = MY_MAKE_MUSIC ("LyricCombineMusic"); - combine->set_property ("element", music->self_scm ()); - combine->set_property ("associated-context", name); - return combine; + m->set_property ("last-pitch", last.smobbed_copy ()); + return relative->unprotect (); } - int yylex (YYSTYPE *s, YYLTYPE *loc, void *v) {