* stepmake/aclocal.m4 (STEPMAKE_PANGO_FT2): Define HAVE_PANGO16 too.

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 61cf45a73190088bcbe2389cd5624f3531f41797..f55a4c76e4be9edb7915265a51b7abf1568ea5d1 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -10,16 +10,16 @@
 */
 
 /*
+FIXME:
 
-TODO:
-
-* The rules for who is protecting what are very shady. Uniformise
-  this.
-
-* There are too many lexical modes?
+   * The rules for who is protecting what are very shady.  Uniformise
+     this.
 
+   * There are too many lexical modes?
 */
 
+#include "config.hh"
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -257,13 +257,12 @@ or
 %pure_parser
 %locations
 
-/* FIXME: The third option is an alias that will be used to display
-   the syntax error.  There's a bug (reported with patch) in bison CVS
-   that prints double backslashes
+/* The third option is an alias that will be used to display the
+   syntax error.  Bison CVS now correctly handles backslash escapes.
+
+   FIXME: Bison needs to translate some of these, eg, STRING.
 
-   bison.ly:1:5: error: syntax error, unexpected \\book", expecting '{'
-   \book
-       \book %expect \book error here
+*/     
    
 /* Keyword tokens with plain escaped name.  */
 %token ACCEPTS "\\accepts"
@@ -272,7 +271,7 @@ or
 %token ALIAS "\\alias"
 %token ALTERNATIVE "\\alternative"
 %token BAR "\\bar"
-%token BOOK "\\book"
+%token BOOK "\book"
 %token CHANGE "\\change"
 %token CHORDMODE "\\chordmode"
 %token CHORDS "\\chords"