Move IntLit ANTLR lexer rule to before String lexer rule to ensure IntLit of form "h..." is lexed as IntLit instead of String

1 files changed, 19 insertions, 19 deletions

diff --git a/src/main/antlr4/FIRRTL.g4 b/src/main/antlr4/FIRRTL.g4
index 8394d3f2..2765533d 100644
--- a/src/main/antlr4/FIRRTL.g4
+++ b/src/main/antlr4/FIRRTL.g4
@@ -139,24 +139,6 @@ primop
  * LEXER RULES
  *------------------------------------------------------------------*/
 
-StringLit
-  : '"' .*? '"'
-  ;
-
-
-Id
-  : IdNondigit
-    ( IdNondigit
-    | Digit
-    )*
-  ;
-
-fragment
-IdNondigit
-  : Nondigit
-  | [~!@#$%^*-+=?/]
-  ;
-
 IntLit
   : '0'
   | ( '+' | '-' )? [1-9] ( Digit )*
@@ -175,7 +157,25 @@ Digit
 
 fragment
 HexDigit
-  : [a-zA-Z0-9]
+  : [a-fA-F0-9]
+  ;
+
+StringLit
+  : '"' .*? '"'
+  ;
+
+
+Id
+  : IdNondigit
+    ( IdNondigit
+    | Digit
+    )*
+  ;
+
+fragment
+IdNondigit
+  : Nondigit
+  | [~!@#$%^*-+=?/]
   ;
 
 Comment