Scons stuff

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index f55a4c76e4be9edb7915265a51b7abf1568ea5d1..1ff26ea6e5785ded4ff4a1f6cd2b081151ab5ecb 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -225,13 +225,13 @@ of the parse stack onto the heap. */
 %{
 
 int
-yylex (YYSTYPE *s, YYLTYPE *l, void *v)
+yylex (YYSTYPE *s, YYLTYPE *loc, void *v)
 {
        Lily_parser *pars = (Lily_parser*) v;
        Lily_lexer *lex = pars->lexer_;
 
        lex->lexval = (void*) s;
-       lex->lexloc = l;
+       lex->lexloc = loc;
        lex->prepare_for_next_token ();
        return lex->yylex ();
 }
@@ -2671,16 +2671,14 @@ Lily_parser::do_yyparse ()
 }
 
 
-/*
-Should make this optional?    It will also complain when you do
+/* FIXME: Should make this optional?  It will also complain at
 
        [s4]
 
 which is entirely legitimate.
 
-Or we can scrap it. Barchecks should detect wrong durations, and
-skipTypesetting speeds it up a lot.
-*/
+Or we can scrap it.  Barchecks should detect wrong durations, and
+skipTypesetting speeds it up a lot.  */
 
 void
 Lily_parser::beam_check (SCM dur)