* parser.l: Regression: valid floating-point literals tagged

as having trailing junk. The fix is to put the junk-matching rule after
the valid rules.

2 files changed, 15 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index f2df059a..621b5a93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2014-02-27  Kaz Kylheku  <kaz@kylheku.com>
 
+	* parser.l: Regression: valid floating-point literals tagged
+	as having trailing junk. The fix is to put the junk-matching rule after
+	the valid rules.
+
+2014-02-27  Kaz Kylheku  <kaz@kylheku.com>
+
 	* lib.c (copy): New function.
 
 	* lib.h (copy): Declared.
diff --git a/parser.l b/parser.l
index ddc2b5d4..ba907888 100644
--- a/parser.l
+++ b/parser.l
@@ -237,12 +237,8 @@ UONLY   {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
   return NUMBER;
 }
 
-<SPECIAL>({FLO}|{FLODOT}){TOK} |
-<BRACED>({FLO}|{FLODOT}){BTOK} |
-<NESTED>({FLO}|{FLODOT}){NTOK} {
-  val str = string_utf8(yytext);
-
-  yyerrorf(lit("trailing junk in floating-point literal: ~a"), str, nao);
+<SPECIAL,NESTED,BRACED>{FLO} {
+  val str = string_own(utf8_dup_from(yytext));
 
   if (yy_top_state() == INITIAL
       || yy_top_state() == QSILIT)
@@ -252,7 +248,7 @@ UONLY   {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
   return NUMBER;
 }
 
-<SPECIAL,NESTED,BRACED>{FLO} {
+<SPECIAL,NESTED,BRACED>{FLODOT}/[^.] {
   val str = string_own(utf8_dup_from(yytext));
 
   if (yy_top_state() == INITIAL
@@ -263,8 +259,12 @@ UONLY   {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
   return NUMBER;
 }
 
-<SPECIAL,NESTED,BRACED>{FLODOT}/[^.] {
-  val str = string_own(utf8_dup_from(yytext));
+<SPECIAL>({FLO}|{FLODOT}){TOK} |
+<BRACED>({FLO}|{FLODOT}){BTOK} |
+<NESTED>({FLO}|{FLODOT}){NTOK} {
+  val str = string_utf8(yytext);
+
+  yyerrorf(lit("trailing junk in floating-point literal: ~a"), str, nao);
 
   if (yy_top_state() == INITIAL
       || yy_top_state() == QSILIT)