From: David Kastrup <dak@gnu.org>
Date: Wed, 25 Jul 2012 19:26:27 +0000 (+0200)
Subject: Issue 2698: Syntax change: don't allow degenerate REAL -.
X-Git-Tag: release/2.15.42-1~17
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ccf2a0b7a2eca57aecfc1d0f6ff50dce0bec329c;p=lilypond.git

Issue 2698: Syntax change: don't allow degenerate REAL -.
---

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 07bb33c6f7..22959fc99c 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -528,10 +528,6 @@ BOM_UTF8	\357\273\277
 		yylval.scm =  scan_fraction (YYText ());
 		return FRACTION;
 	}
-	{UNSIGNED}/\/[^0-9] { // backup rule
-		yylval.scm = scm_c_read_string (YYText ());
-		return UNSIGNED;
-	}
 	{UNSIGNED}/\/	| // backup rule
 	{UNSIGNED}		{
 		yylval.scm = scm_c_read_string (YYText ());
@@ -573,10 +569,6 @@ BOM_UTF8	\357\273\277
 		yylval.scm =  scan_fraction (YYText ());
 		return FRACTION;
 	}
-	{UNSIGNED}/\/[^0-9] { // backup rule
-		yylval.scm = scm_c_read_string (YYText ());
-		return UNSIGNED;
-	}
 	{UNSIGNED}/\/	| // backup rule
 	{UNSIGNED}		{
 		yylval.scm = scm_c_read_string (YYText ());
@@ -720,10 +712,6 @@ BOM_UTF8	\357\273\277
 	yylval.scm = scm_c_read_string (YYText ());
 	return REAL;
 }
--\.	{ // backup rule
-	yylval.scm = scm_from_double (0.0);
-	return REAL;
-}
 
 {UNSIGNED}/\/	| // backup rule
 {UNSIGNED}	{
@@ -736,6 +724,8 @@ BOM_UTF8	\357\273\277
 
 	return YYText ()[0];
 }
+
+-/\.	| // backup rule
 [*:=]		{
 	char c = YYText ()[0];