Increase consistency of number-related regexes

sogaiu · Jul 3, 2020 · 5b22a41 · 5b22a41
1 parent 4d73355
commit 5b22a41
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/rouge/lexers/janet.rb b/lib/rouge/lexers/janet.rb
@@ -135,19 +135,24 @@ def name_token(name)
         rule %r/
           [+-]?
           \d+
-          r[0-9a-zA-Z][0-9a-zA-Z_]*
-          (&[+-]?[0-9a-zA-Z]+)?
+          r[0-9a-zA-Z]
+           [0-9a-zA-Z_]*
+          (&[+-]?
+            [0-9a-zA-Z]+)?
         /x, Num::Float
         # numbers via hex
         #   split into 2 rules for ease of expression / understanding
         rule %r/
           [+-]?
-          0x[0-9a-fA-F][_0-9a-fA-F]*
-          (\.[0-9a-fA-F][0-9a-fA-F_]*)?
+          0x[0-9a-fA-F]
+            [0-9a-fA-F_]*
+          (\.[0-9a-fA-F]
+             [0-9a-fA-F_]*)?
         /x, Num::Hex
         rule %r/
           [+-]?
-          0x\.[0-9a-fA-F][_0-9a-fA-F]*
+          0x\.[0-9a-fA-F]
+              [0-9a-fA-F_]*
         /x, Num::Hex
         # decimal floating point
         #   split into 2 rules for ease of expression / understanding