X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=41e5080f9854651069dcf7c9ef0c798d0b318716;hb=56691afedddbbbbc6cf8abbc53c9f1753e3922e6;hp=59cbf58502275c853ff0f07e344f8e46d1dd635f;hpb=e647c14f4af42b2bbe35ec78ce72ce400041c2ea;p=lilypond.git diff --git a/lily/parser.yy b/lily/parser.yy index 59cbf58502..41e5080f98 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1,10 +1,21 @@ /* - parser.yy -- Bison/C++ parser for LilyPond + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1997--2007 Han-Wen Nienhuys + Copyright (C) 1997--2010 Han-Wen Nienhuys Jan Nieuwenhuizen + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ %{ @@ -44,7 +55,7 @@ of the parse stack onto the heap. */ or - \repeat { \repeat } \alternative + \repeat { \repeat } \alternative */ @@ -73,6 +84,7 @@ using namespace std; #include "book.hh" #include "context-def.hh" +#include "context-mod.hh" #include "dimensions.hh" #include "file-path.hh" #include "input.hh" @@ -151,14 +163,15 @@ void set_music_properties (Music *p, SCM a); FIXME: Bison needs to translate some of these, eg, STRING. -*/ - +*/ + /* Keyword tokens with plain escaped name. */ %token ACCEPTS "\\accepts" %token ADDLYRICS "\\addlyrics" %token ALIAS "\\alias" %token ALTERNATIVE "\\alternative" %token BOOK "\\book" +%token BOOKPART "\\bookpart" %token CHANGE "\\change" %token CHORDMODE "\\chordmode" %token CHORDS "\\chords" @@ -186,7 +199,7 @@ void set_music_properties (Music *p, SCM a); %token MIDI "\\midi" %token NAME "\\name" %token NOTEMODE "\\notemode" -%token OBJECTID "\\objectid" +%token OBJECTID "\\objectid" %token OCTAVE "\\octave" %token ONCE "\\once" %token OVERRIDE "\\override" @@ -265,7 +278,9 @@ If we give names, Bison complains. %token BOOK_IDENTIFIER %token CHORDMODIFIER_PITCH %token CHORD_MODIFIER +%token CHORD_REPETITION %token CONTEXT_DEF_IDENTIFIER +%token CONTEXT_MOD_IDENTIFIER %token DRUM_PITCH %token DURATION_IDENTIFIER %token EVENT_IDENTIFIER @@ -280,6 +295,7 @@ 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_SCM1_MARKUP2_MARKUP3 %token MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 %token MARKUP_HEAD_SCM0_SCM1_SCM2 %token MARKUP_LIST_HEAD_EMPTY @@ -305,6 +321,8 @@ If we give names, Bison complains. %type book_block %type book_body +%type bookpart_block +%type bookpart_body %type bare_unsigned %type figured_bass_alteration @@ -330,6 +348,7 @@ If we give names, Bison complains. %type chord_body_element %type command_element %type command_event +%type context_modification %type context_change %type direction_less_event %type direction_reqd_event @@ -349,10 +368,10 @@ If we give names, Bison complains. %type output_def_head %type output_def_head_with_mode_switch %type output_def -%type paper_block +%type paper_block %type alternative_music -%type generic_prefix_music_scm +%type generic_prefix_music_scm %type music_list %type absolute_pitch %type assignment_id @@ -392,7 +411,7 @@ If we give names, Bison complains. %type lyric_markup %type markup %type markup_braced_list -%type markup_braced_list_body +%type markup_braced_list_body %type markup_composed_list %type markup_command_list %type markup_head_1_item @@ -429,7 +448,7 @@ If we give names, Bison complains. %type steno_pitch %type steno_tonic_pitch %type step_number -%type step_numbers +%type step_numbers %type string %type score_block @@ -460,7 +479,7 @@ lilypond: /* empty */ object_id_setting: - OBJECTID STRING { $$ = $2; } + OBJECTID STRING { $$ = $2; } ; toplevel_expression: @@ -473,9 +492,15 @@ toplevel_expression: scm_call_2 (proc, PARSER->self_scm (), book->self_scm ()); book->unprotect (); } + | bookpart_block { + Book *bookpart = $1; + SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-bookpart-handler"); + scm_call_2 (proc, PARSER->self_scm (), bookpart->self_scm ()); + bookpart->unprotect (); + } | score_block { Score *score = $1; - + SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-score-handler"); scm_call_2 (proc, PARSER->self_scm (), score->self_scm ()); score->unprotect (); @@ -521,7 +546,7 @@ lilypond_header_body: PARSER->lexer_->add_scope ($$); } | lilypond_header_body assignment { - + } ; @@ -542,7 +567,11 @@ assignment_id: assignment: assignment_id '=' identifier_init { PARSER->lexer_->set_identifier ($1, $3); - + } + | assignment_id property_path '=' identifier_init { + SCM path = scm_cons (scm_string_to_symbol ($1), $2); + PARSER->lexer_->set_identifier (path, $4); + ; /* TODO: devise standard for protection in parser. @@ -564,6 +593,10 @@ identifier_init: $$ = $1->self_scm (); $1->unprotect (); } + | bookpart_block { + $$ = $1->self_scm (); + $1->unprotect (); + } | output_def { $$ = $1->self_scm (); $1->unprotect (); @@ -601,6 +634,9 @@ identifier_init: | DIGIT { $$ = scm_from_int ($1); } + | context_modification { + $$ = $1; + } ; context_def_spec_block: @@ -631,7 +667,14 @@ context_def_spec_body: } } | context_def_spec_body context_mod { - unsmob_context_def ($$)->add_context_mod ($2); + unsmob_context_def ($$)->add_context_mod ($2); + } + | context_def_spec_body context_modification { + Context_def *td = unsmob_context_def ($$); + SCM new_mods = unsmob_context_mod ($2)->get_mods (); + for (SCM m = new_mods; scm_is_pair (m); m = scm_cdr (m)) { + td->add_context_mod (scm_car (m)); + } } ; @@ -640,6 +683,8 @@ context_def_spec_body: book_block: BOOK '{' book_body '}' { $$ = $3; + pop_paper (PARSER); + PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-book"), SCM_BOOL_F); } ; @@ -649,19 +694,32 @@ book_block: book_body: { $$ = new Book; + init_papers (PARSER); $$->origin ()->set_spot (@$); $$->paper_ = dynamic_cast (unsmob_output_def (PARSER->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); $$->paper_->unprotect (); - $$->header_ = PARSER->lexer_->lookup_identifier ("$defaultheader"); + push_paper (PARSER, $$->paper_); + $$->header_ = PARSER->lexer_->lookup_identifier ("$defaultheader"); + PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $$->self_scm ()); + PARSER->lexer_->set_identifier (ly_symbol2scm ("book-output-suffix"), SCM_BOOL_F); + PARSER->lexer_->set_identifier (ly_symbol2scm ("book-filename"), SCM_BOOL_F); } | BOOK_IDENTIFIER { $$ = unsmob_book ($1); $$->protect (); $$->origin ()->set_spot (@$); + PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $1); } | book_body paper_block { $$->paper_ = $2; $2->unprotect (); + set_paper (PARSER, $2); + } + | book_body bookpart_block { + Book *bookpart = $2; + SCM proc = PARSER->lexer_->lookup_identifier ("book-bookpart-handler"); + scm_call_2 (proc, $$->self_scm (), bookpart->self_scm ()); + bookpart->unprotect (); } | book_body score_block { Score *score = $2; @@ -688,12 +746,67 @@ book_body: | book_body error { $$->paper_ = 0; $$->scores_ = SCM_EOL; + $$->bookparts_ = SCM_EOL; } | book_body object_id_setting { $$->user_key_ = ly_scm2string ($2); } ; +bookpart_block: + BOOKPART '{' bookpart_body '}' { + $$ = $3; + PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), SCM_BOOL_F); + } + ; + +bookpart_body: + { + $$ = new Book; + $$->origin ()->set_spot (@$); + PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $$->self_scm ()); + } + | BOOK_IDENTIFIER { + $$ = unsmob_book ($1); + $$->protect (); + $$->origin ()->set_spot (@$); + PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $1); + } + | bookpart_body paper_block { + $$->paper_ = $2; + $2->unprotect (); + } + | bookpart_body score_block { + Score *score = $2; + SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-score-handler"); + scm_call_2 (proc, $$->self_scm (), score->self_scm ()); + score->unprotect (); + } + | bookpart_body composite_music { + Music *music = unsmob_music ($2); + SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-music-handler"); + scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ()); + } + | bookpart_body full_markup { + SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-text-handler"); + scm_call_2 (proc, $$->self_scm (), scm_list_1 ($2)); + } + | bookpart_body full_markup_list { + SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-text-handler"); + scm_call_2 (proc, $$->self_scm (), $2); + } + | bookpart_body lilypond_header { + $$->header_ = $2; + } + | bookpart_body error { + $$->paper_ = 0; + $$->scores_ = SCM_EOL; + } + | bookpart_body object_id_setting { + $$->user_key_ = ly_scm2string ($2); + } + ; + score_block: SCORE '{' score_body '}' { $$ = $3; @@ -726,7 +839,7 @@ score_body: if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T) { PARSER->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead")); - + } else { @@ -862,7 +975,7 @@ music_list: } | music_list error { Music *m = MY_MAKE_MUSIC("Music", @$); - // ugh. code dup + // ugh. code dup m->set_property ("error-found", SCM_BOOL_T); SCM s = $$; SCM c = scm_cons (m->self_scm (), SCM_EOL); @@ -923,22 +1036,45 @@ simple_music: | context_change ; +context_modification: + WITH { PARSER->lexer_->push_initial_state (); } '{' context_mod_list '}' + { + PARSER->lexer_->pop_state (); + $$ = $4; + } + | WITH CONTEXT_MOD_IDENTIFIER + { + $$ = $2; + } + | CONTEXT_MOD_IDENTIFIER + { + $$ = $1; + } + ; + optional_context_mod: - /**/ { $$ = SCM_EOL; } - | WITH { PARSER->lexer_->push_initial_state (); } - '{' context_mod_list '}' - { - PARSER->lexer_->pop_state (); - $$ = $4; - } - ; + /**/ { + $$ = SCM_EOL; + } + | context_modification + { + $$ = $1; + } + ; context_mod_list: - /* */ { $$ = SCM_EOL; } - | context_mod_list context_mod { - $$ = scm_cons ($2, $1); - } - ; + /**/ { + $$ = Context_mod ().smobbed_copy (); + } + | context_mod_list context_mod { + unsmob_context_mod ($1)->add_context_mod ($2); + } + | context_mod_list CONTEXT_MOD_IDENTIFIER { + Context_mod *md = unsmob_context_mod ($2); + if (md) + unsmob_context_mod ($1)->add_context_mods (md->get_mods ()); + } + ; composite_music: prefix_composite_music { $$ = $1; } @@ -951,7 +1087,7 @@ grouped_music_list: ; function_scm_argument: - embedded_scm + embedded_scm | simple_string ; @@ -969,6 +1105,9 @@ function_arglist_nonmusic_last: EXPECT_MARKUP function_arglist full_markup { $$ = scm_cons ($3, $2); } + | EXPECT_MARKUP function_arglist simple_string { + $$ = scm_cons ($3, $2); + } | EXPECT_SCM function_arglist function_scm_argument { $$ = scm_cons ($3, $2); } @@ -980,6 +1119,9 @@ function_arglist_nonmusic: EXPECT_NO_MORE_ARGS { | EXPECT_MARKUP function_arglist_nonmusic full_markup { $$ = scm_cons ($3, $2); } + | EXPECT_MARKUP function_arglist_nonmusic simple_string { + $$ = scm_cons ($3, $2); + } | EXPECT_SCM function_arglist_nonmusic function_scm_argument { $$ = scm_cons ($3, $2); } @@ -1006,7 +1148,7 @@ optional_id: | '=' simple_string { $$ = $2; } - ; + ; prefix_composite_music: @@ -1014,10 +1156,18 @@ prefix_composite_music: $$ = run_music_function (PARSER, $1); } | CONTEXT simple_string optional_id optional_context_mod music { - $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_F); + Context_mod *ctxmod = unsmob_context_mod ($4); + SCM mods = SCM_EOL; + if (ctxmod) + mods = ctxmod->get_mods (); + $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, mods, SCM_BOOL_F); } | NEWCONTEXT simple_string optional_id optional_context_mod music { - $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_T); + Context_mod *ctxmod = unsmob_context_mod ($4); + SCM mods = SCM_EOL; + if (ctxmod) + mods = ctxmod->get_mods (); + $$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, mods, SCM_BOOL_T); } | TIMES fraction music { @@ -1042,7 +1192,11 @@ prefix_composite_music: PARSER->lexer_->pop_state (); } | mode_changing_head_with_context optional_context_mod grouped_music_list { - $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, $2, SCM_BOOL_T); + Context_mod *ctxmod = unsmob_context_mod ($2); + SCM mods = SCM_EOL; + if (ctxmod) + mods = ctxmod->get_mods (); + $$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, mods, SCM_BOOL_T); if ($1 == ly_symbol2scm ("ChordNames")) { $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$); @@ -1053,14 +1207,14 @@ prefix_composite_music: | re_rhythmed_music { $$ = $1; } ; -mode_changing_head: +mode_changing_head: NOTEMODE { SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames"); PARSER->lexer_->push_note_state (alist_to_hashq (nn)); $$ = ly_symbol2scm ("notes"); } - | DRUMMODE + | DRUMMODE { SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames"); PARSER->lexer_->push_note_state (alist_to_hashq (nn)); @@ -1086,7 +1240,7 @@ mode_changing_head: } ; -mode_changing_head_with_context: +mode_changing_head_with_context: DRUMS { SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames"); PARSER->lexer_->push_note_state (alist_to_hashq (nn)); @@ -1172,7 +1326,7 @@ property_path_revved: property_path: property_path_revved { $$ = scm_reverse_x ($1, SCM_EOL); - } + } ; property_operation: @@ -1184,7 +1338,7 @@ property_operation: $$ = scm_list_2 (ly_symbol2scm ("unset"), scm_string_to_symbol ($2)); } - | OVERRIDE simple_string property_path '=' embedded_scm { + | OVERRIDE simple_string property_path '=' scalar { $$ = scm_append (scm_list_2 (scm_list_3 (ly_symbol2scm ("push"), scm_string_to_symbol ($2), $5), $3)); @@ -1214,6 +1368,17 @@ context_mod: | context_def_mod STRING { $$ = scm_list_2 ($1, $2); } + | context_def_mod embedded_scm { + if (ly_symbol2scm ("consists") != $1) + { + $$ = SCM_EOL; + PARSER->parser_error (@1, _ ("only \\consists takes non-string argument.")); + } + else + { + $$ = scm_list_2 ($1, $2); + } + } ; context_prop_spec: @@ -1234,7 +1399,7 @@ context_prop_spec: simple_music_property_def: OVERRIDE context_prop_spec property_path '=' scalar { - $$ = scm_append (scm_list_2 (scm_list_n (scm_car ($2), + $$ = scm_append (scm_list_2 (scm_list_n (scm_car ($2), ly_symbol2scm ("OverrideProperty"), scm_cadr ($2), $5, SCM_UNDEFINED), @@ -1324,13 +1489,27 @@ event_chord: i.set_location (@1, @2); $$ = MAKE_SYNTAX ("event-chord", i, elts); } + | CHORD_REPETITION optional_notemode_duration post_events { + Input i; + i.set_location (@1, @3); + $$ = MAKE_SYNTAX ("repetition-chord", i, + PARSER->lexer_->chord_repetition_.last_chord_, + PARSER->lexer_->chord_repetition_.repetition_function_, + $2, $3); + } | MULTI_MEASURE_REST optional_notemode_duration post_events { Input i; i.set_location (@1, @3); $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, $3); } | command_element - | note_chord_element + /* note chord elements are memorized into + PARSER->lexer_->chord_repetition_ so that the chord repetition + mechanism copy them when a chord repetition symbol is found + */ + | note_chord_element { + PARSER->lexer_->chord_repetition_.last_chord_ = $$; + } ; @@ -1341,7 +1520,7 @@ note_chord_element: SCM dur = unsmob_duration ($2)->smobbed_copy (); SCM es = m->get_property ("elements"); SCM postevs = scm_reverse_x ($3, SCM_EOL); - + for (SCM s = es; scm_is_pair (s); s = scm_cdr (s)) unsmob_music (scm_car (s))->set_property ("duration", dur); es = ly_append2 (es, postevs); @@ -1404,7 +1583,7 @@ chord_body_element: } $$ = n->unprotect (); } - | music_function_chord_body { + | music_function_chord_body { $$ = run_music_function (PARSER, $1); } ; @@ -1513,7 +1692,7 @@ command_event: 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)); @@ -1535,7 +1714,7 @@ post_events: $$ = scm_cons ($2, $$); } ; - + post_event: direction_less_event { $$ = $1; @@ -1585,7 +1764,7 @@ direction_less_char: $$ = ly_symbol2scm ("bracketOpenSymbol"); } | ']' { - $$ = ly_symbol2scm ("bracketCloseSymbol"); + $$ = ly_symbol2scm ("bracketCloseSymbol"); } | '~' { $$ = ly_symbol2scm ("tildeSymbol"); @@ -1636,8 +1815,8 @@ direction_less_event: a->set_property ("tremolo-type", scm_from_int ($1)); $$ = a->unprotect (); } - ; - + ; + direction_reqd_event: gen_text_def { $$ = $1; @@ -1811,6 +1990,7 @@ steno_duration: | DURATION_IDENTIFIER dots { Duration *d = unsmob_duration ($1); Duration k (d->duration_log (), d->dot_count () + $2); + k = k.compressed (d->factor ()); *d = k; $$ = $1; } @@ -1983,7 +2163,7 @@ simple_element: n = MY_MAKE_MUSIC ("RestEvent", @$); else n = MY_MAKE_MUSIC ("NoteEvent", @$); - + n->set_property ("pitch", $1); n->set_property ("duration", $5); @@ -2005,7 +2185,7 @@ simple_element: n->set_property ("duration", $2); n->set_property ("drum-type", $1); - $$ = n->unprotect (); + $$ = n->unprotect (); } | RESTNAME optional_notemode_duration { Music *ev = 0; @@ -2015,7 +2195,7 @@ simple_element: } else { ev = MY_MAKE_MUSIC ("RestEvent", @$); - + } ev->set_property ("duration", $2); $$ = ev->unprotect (); @@ -2034,7 +2214,7 @@ simple_element: simple_chord_elements: simple_element { $$ = scm_list_1 ($1); - } + } | new_chord { if (!PARSER->lexer_->is_chord_state ()) PARSER->parser_error (@1, _ ("have to be in Chord mode for chords")); @@ -2046,7 +2226,7 @@ simple_chord_elements: unsmob_music (scm_car (s))->set_property ("duration", $2); } $$ = $1; - } + } ; lyric_element: @@ -2070,7 +2250,7 @@ new_chord: chord_items: /**/ { - $$ = SCM_EOL; + $$ = SCM_EOL; } | chord_items chord_item { $$ = scm_cons ($2, $$); @@ -2121,7 +2301,7 @@ step_number: | bare_unsigned CHORD_MINUS { $$ = make_chord_step ($1, FLAT_ALTERATION); } - ; + ; /* UTILITIES @@ -2193,7 +2373,7 @@ unsigned_number: $$ = $1; } ; - + exclamations: { $$ = 0; } @@ -2243,8 +2423,8 @@ full_markup: ; markup_top: - markup_list { - $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1); + markup_list { + $$ = scm_list_2 (ly_lily_module_constant ("line-markup"), $1); } | markup_head_1_list simple_markup { $$ = scm_car (scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, scm_list_1 ($2))); @@ -2269,7 +2449,7 @@ markup_list: markup_composed_list: markup_head_1_list markup_braced_list { $$ = scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, $2); - + } ; @@ -2362,6 +2542,9 @@ simple_markup: | MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 embedded_scm markup markup { $$ = scm_list_4 ($1, $2, $3, $4); } + | MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3 embedded_scm embedded_scm markup markup { + $$ = scm_list_5 ($1, $2, $3, $4, $5); + } | MARKUP_HEAD_EMPTY { $$ = scm_list_1 ($1); } @@ -2372,7 +2555,7 @@ simple_markup: $$ = scm_list_3 ($1, $2, $3); } ; - + markup: markup_head_1_list simple_markup { SCM mapper = ly_lily_module_constant ("map-markup-command-list"); @@ -2422,13 +2605,17 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) } else if (scm_is_number (sid)) { *destination = sid; return NUMBER_IDENTIFIER; - } else if (unsmob_context_def (sid)) { - Context_def *def= unsmob_context_def (sid)->clone (); + } else if (unsmob_context_def (sid)) { + Context_def *def= unsmob_context_def (sid)->clone (); + + *destination = def->self_scm (); + def->unprotect (); - *destination = def->self_scm (); - def->unprotect (); - - return CONTEXT_DEF_IDENTIFIER; + return CONTEXT_DEF_IDENTIFIER; + } else if (unsmob_context_mod (sid)) { + *destination = unsmob_context_mod (sid)->smobbed_copy (); + + return CONTEXT_MOD_IDENTIFIER; } else if (unsmob_score (sid)) { Score *score = new Score (*unsmob_score (sid)); *destination = score->self_scm (); @@ -2452,7 +2639,7 @@ 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; @@ -2463,7 +2650,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) return MARKUP_IDENTIFIER; } - return -1; + return -1; } SCM @@ -2597,7 +2784,7 @@ make_music_relative (Pitch start, SCM music, Input loc) { Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic", loc); relative->set_property ("element", music); - + Music *m = unsmob_music (music); Pitch last = m->to_relative_octave (start); if (lily_1_8_relative) @@ -2611,8 +2798,8 @@ yylex (YYSTYPE *s, YYLTYPE *loc, void *v) Lily_parser *pars = (Lily_parser*) v; Lily_lexer *lex = pars->lexer_; - lex->lexval = (void*) s; - lex->lexloc = loc; + lex->lexval_ = (void*) s; + lex->lexloc_ = loc; lex->prepare_for_next_token (); return lex->yylex (); }