Sync integer parsing warnings/errors with STD.

Of note, the one that warns about leading 0 not being octal is now shown.
rakudo · Mar 9, 2013 · b58945c · b58945c
1 parent 8c0f875
commit b58945c
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -2560,10 +2560,10 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
 
     token numish {
         [
-        | <dec_number>
+        | 'NaN' >>
         | <integer>
+        | <dec_number>
         | <rad_number>
-        | 'NaN' >>
         | 'Inf' >>
         | '+Inf' >>
         | '-Inf' >>
@@ -2578,6 +2578,21 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
         | $<coeff> = [ <int=.decint>                    ] <escale>
         ]
     }
+
+    token integer {
+        [
+        | 0 [ b '_'? <VALUE=binint>
+            | o '_'? <VALUE=octint>
+            | x '_'? <VALUE=hexint>
+            | d '_'? <VALUE=decint>
+            | <VALUE=decint>
+                <!!{ $/.CURSOR.worry("Leading 0 does not indicate octal in Perl 6; please use 0o" ~ $<VALUE>.Str ~ " if you mean that") }>
+            ]
+        | <VALUE=decint>
+        ]
+        <!!before ['.' <?before \s | ',' | '=' | <terminator> > <.sorry: "Decimal point must be followed by digit">]? >
+        [ <?before '_' '_'+\d> <.sorry: "Only isolated underscores are allowed inside numbers"> ]?
+    }
 
     token rad_number {
         ':' $<radix> = [\d+] <.unsp>?