]> git.donarmstrong.com Git - lilypond.git/commitdiff
Issue3571: Stop \lyricmode { \skip 1.*3 } from failing.
authorDavid Kastrup <dak@gnu.org>
Sun, 22 Sep 2013 16:34:11 +0000 (18:34 +0200)
committerDavid Kastrup <dak@gnu.org>
Fri, 27 Sep 2013 09:57:39 +0000 (11:57 +0200)
The problem was that the lexer preferred to match ".*" as a word since
the matched pattern was longer than the explicit pattern matching ".".
The word pattern is now amended so that it does not compete with the
single-character patterns.

lily/lexer.ll

index cebbd19627190c2504fbe5b547f8be83435cd16f..e896de3d638bc14a34c20037d7f72dfa4a9fae89 100644 (file)
@@ -585,7 +585,7 @@ BOM_UTF8    \357\273\277
                 yylval = SCM_UNSPECIFIED;
                return YYText ()[0];
        }
-       [^$#{}\"\\ \t\n\r\f0-9]+ {
+       [^|*.=$#{}\"\\ \t\n\r\f0-9][^$#{}\"\\ \t\n\r\f0-9]* {
                /* ugr. This sux. */
                string s (YYText_utf8 ());
                 yylval = SCM_UNSPECIFIED;