]> git.donarmstrong.com Git - lilypond.git/commitdiff
Issue 2698: Syntax change: don't allow degenerate REAL -.
authorDavid Kastrup <dak@gnu.org>
Wed, 25 Jul 2012 19:26:27 +0000 (21:26 +0200)
committerDavid Kastrup <dak@gnu.org>
Mon, 30 Jul 2012 05:54:24 +0000 (07:54 +0200)
lily/lexer.ll

index 07bb33c6f7187979356d7e6ffac05cca3ba095a5..22959fc99cfeeb9c72236d45563902f048263236 100644 (file)
@@ -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];