release: 1.5.5

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 720732e88c5b0d4411e0a7c808f549e30a797964..5019a8d8a231c5a45b6a10780836260050eb6bff 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -806,7 +806,7 @@ Composite_music:
                chm->set_spot (*$3->origin ());
        }
        | GRACE Music {
-#if 0
+#if 1
        /*
                The other version is for easier debugging  of
                Sequential_music_iterator in combination with grace notes.
@@ -1722,7 +1722,7 @@ simple_element:
                $$ = velt_p;
        }
        | MULTI_MEASURE_REST optional_notemode_duration         {
-               Input = THIS->pop_spot ();
+               Input i = THIS->pop_spot ();
 
                Skip_req * sk = new Skip_req;
                sk->set_mus_property ("duration", $2);
@@ -1747,7 +1747,7 @@ simple_element:
                $$->set_mus_property ("elements", ms);
        }
        | STRING optional_notemode_duration     {
-               Input = THIS->pop_spot ();
+               Input i = THIS->pop_spot ();
 
                Lyric_req* lreq_p = new Lyric_req;
                 lreq_p->set_mus_property ("text", $1);
@@ -1759,7 +1759,7 @@ simple_element:
                $$= velt_p;
        }
        | chord {
-               Input = THIS->pop_spot ();
+               Input i = THIS->pop_spot ();
 
                if (!THIS->lexer_p_->chord_state_b ())
                        THIS->parser_error (_ ("Have to be in Chord mode for chords"));