Treat leading '-' as part of numeric literals.

perl6 · Nov 24, 2009 · fb49c3e · fb49c3e
1 parent 0ce5b09
commit fb49c3e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/NQP/Actions.pm b/src/NQP/Actions.pm
@@ -584,14 +584,13 @@ method postcircumfix:sym<( )>($/) {
 }
 
 method value($/) {
-    my $past := $<quote>
-                ?? $<quote>.ast
-                !! PAST::Val.new(
-                       :value($<dec_number>
-                              ?? $<dec_number>.ast
-                              !! $<integer>.ast)
-                   );
-    make $past;
+    make $<quote> ?? $<quote>.ast !! $<number>.ast;
+}
+
+method number($/) {
+    my $value := $<dec_number> ?? $<dec_number>.ast !! $<integer>.ast;
+    if ~$<sign> eq '-' { $value := -$value; }
+    make PAST::Val.new( :value($value) );
 }
 
 method quote:sym<apos>($/) { make $<quote_EXPR>.ast; }

diff --git a/src/NQP/Grammar.pm b/src/NQP/Grammar.pm
@@ -352,9 +352,13 @@ token arglist {
 token term:sym<value> { <value> }
 
 token value {
-    | <dec_number>
     | <quote>
-    | <integer>
+    | <number>
+}
+
+token number {
+    $<sign>=[<[+\-]>?]
+    [ <dec_number> | <integer> ]
 }
 
 proto token quote { <...> }
@@ -433,7 +437,7 @@ token infix:sym<**>   { <sym>  <O('%exponentiation, :pirop<pow>')> }
 
 token prefix:sym<+>   { <sym>  <O('%symbolic_unary, :pirop<set N*>')> }
 token prefix:sym<~>   { <sym>  <O('%symbolic_unary, :pirop<set S*>')> }
-token prefix:sym<->   { <sym>  <![>]> <O('%symbolic_unary, :pirop<neg>')> }
+token prefix:sym<->   { <sym>  <![>]> <!number> <O('%symbolic_unary, :pirop<neg>')> }
 token prefix:sym<?>   { <sym>  <O('%symbolic_unary, :pirop<istrue>')> }
 token prefix:sym<!>   { <sym>  <O('%symbolic_unary, :pirop<isfalse>')> }
 token prefix:sym<|>   { <sym>  <O('%symbolic_unary')> }