[svn:parrot] r29057 - trunk/languages/perl6/src/parser

Author: pmichaud
Date: Fri Jul  4 09:43:52 2008
New Revision: 29057

Modified:
   trunk/languages/perl6/src/parser/grammar.pg

Log:
[rakudo]: Update <dec_number> to match STD.pm


Modified: trunk/languages/perl6/src/parser/grammar.pg
==============================================================================
--- trunk/languages/perl6/src/parser/grammar.pg (original)
+++ trunk/languages/perl6/src/parser/grammar.pg Fri Jul  4 09:43:52 2008
@@ -251,7 +251,8 @@
 
 rule given_statement {
     $<sym>=[given]
-    <EXPR> <block>
+    <EXPR>
+    <pblock>
     {*}
 }
 
@@ -664,12 +665,17 @@
     {*}
 }
 
+token escale {
+    <[Ee]> <[+\-]>? \d+
+}
+
+# careful to distinguish from both integer and 42.method
 token dec_number {
-    \d+[_\d+]*
-        [
-        | '.' \d+[_\d+]* [ <[Ee]> <[+\-]>? \d+ ]?
-        |                  <[Ee]> <[+\-]>? \d+
-        ] # careful to distinguish from both integer and 42.method
+    [
+    |            '.' \d+[_\d+]* <.escale>?
+    | \d+[_\d+]* '.' \d+[_\d+]* <.escale>?
+    | \d+[_\d+]*                <.escale>
+    ]
     {*}
 }