fix hexadecimal token number support.

	* src/scan-gram.l: Catch incorrect ids after hexadecimal numbers.

diff --git a/ChangeLog b/ChangeLog
index ba901d607bf1c51bb487d089fa044d30ed6bd0fb..cac83fd3b58ef6013294233b90bc89ae767ec726 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-05  Akim Demaille  <demaille@gostai.com>
+
+       fix hexadecimal token number support.
+       * src/scan-gram.l: Catch incorrect ids after hexadecimal numbers.
+

 2009-05-05  Akim Demaille  <demaille@gostai.com>
 
        tests: check token numbers.
 2009-05-05  Akim Demaille  <demaille@gostai.com>
 
        tests: check token numbers.

diff --git a/src/scan-gram.l b/src/scan-gram.l
index a22cafdcd8cf64247ee925ce207490037659c88c..c8c9771cbfc743bcff2e75aab5febd525ca5bc55 100644 (file)
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -208,12 +208,6 @@ splice      (\\[ \f\t\v]*\n)*
     complain_at (*loc, _("invalid directive: %s"), quote (yytext));
   }
 
     complain_at (*loc, _("invalid directive: %s"), quote (yytext));
   }
 

-  /* Identifiers may not start with a digit.  Yet, don't silently
-     accept "1FOO" as "1 FOO".  */
-  {int}{id} {
-    complain_at (*loc, _("invalid identifier: %s"), quote (yytext));
-  }
-

   "="                     return EQUAL;
   "|"                     return PIPE;
   ";"                     return SEMICOLON;
   "="                     return EQUAL;
   "|"                     return PIPE;
   ";"                     return SEMICOLON;


@@ -235,6 +229,12 @@ splice      (\\[ \f\t\v]*\n)*
     return INT;
   }
 
     return INT;
   }
 

+  /* Identifiers may not start with a digit.  Yet, don't silently
+     accept "1FOO" as "1 FOO".  */
+  {int}{id} {
+    complain_at (*loc, _("invalid identifier: %s"), quote (yytext));
+  }
+

   /* Characters.  We don't check there is only one.  */
   "'"        STRING_GROW; token_start = loc->start; BEGIN SC_ESCAPED_CHARACTER;
 
   /* Characters.  We don't check there is only one.  */
   "'"        STRING_GROW; token_start = loc->start; BEGIN SC_ESCAPED_CHARACTER;