From: David Kastrup <dak@gnu.org>
Date: Sun, 22 Sep 2013 16:34:11 +0000 (+0200)
Subject: Issue3571: Stop \lyricmode { \skip 1.*3 } from failing.
X-Git-Tag: release/2.17.28-1~26
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=0d37800d2790ea999cf5f8867bf9cba3ddd0e9ed

Issue3571: Stop \lyricmode { \skip 1.*3 } from failing.

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.
---

diff --git a/lily/lexer.ll b/lily/lexer.ll
index cebbd19627..e896de3d63 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -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;