unbotch MINUS SIGN patch

helps to put the right precedence level and arity...
rakudo · Dec 18, 2015 · b050d5e · b050d5e
1 parent 3d8d56a
commit b050d5e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -4045,8 +4045,8 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
     token prefix:sym<+>   { <sym>  <O('%symbolic_unary')> }
     token prefix:sym<~~>  { <sym> <.dupprefix('~~')> <O('%symbolic_unary')> }
     token prefix:sym<~>   { <sym>  <O('%symbolic_unary')> }
-    token prefix:sym<->   { <sym> <![>]> <O('%symbolic_unary')> }
-    token prefix:sym<−>   { <sym> <![>]> <O('%symbolic_unary')> }
+    token prefix:sym<->   { <sym> <O('%symbolic_unary')> }
+    token prefix:sym<−>   { <sym> <O('%symbolic_unary')> }
     token prefix:sym<??>  { <sym> <.dupprefix('??')> <O('%symbolic_unary')> }
     token prefix:sym<?>   { <sym> <!before '??'> <O('%symbolic_unary')> }
     token prefix:sym<!>   { <sym> <!before '!!'> <O('%symbolic_unary')> }
@@ -4088,7 +4088,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
         <sym> [<?before '>>'> || <![>]>]
         <O('%additive')>
     }
-    token infix:sym<−>   { <sym> <![>]> <O('%symbolic_unary')> }
+    token infix:sym<−>    { <sym>  <O('%additive')> }
     token infix:sym<+|>   { <sym>  <O('%additive')> }
     token infix:sym<+^>   { <sym>  <O('%additive')> }
     token infix:sym<~|>   { <sym>  <O('%additive')> }

diff --git a/src/core/Numeric.pm b/src/core/Numeric.pm
@@ -41,7 +41,7 @@ multi sub prefix:<+>(\a) { a.Numeric }
 proto sub prefix:<->($?) is pure { * }
 multi sub prefix:<->(\a) { -a.Numeric }
 
-sub prefix:<−>(|c) is pure { prefix:<->(|c) }
+sub prefix:<−>($n) is pure { prefix:<->($n) }
 
 proto sub abs($) is pure { * }
 multi sub abs(\a) { abs a.Numeric }
@@ -186,10 +186,12 @@ multi sub infix:<+>($x = 0)      { $x.Numeric }
 multi sub infix:<+>(\a, \b)    { a.Numeric + b.Numeric }
 
 proto sub infix:<->(Mu $?, Mu $?) is pure   { * }
-multi sub infix:<->($x = 0)      { $x.Numeric }
+multi sub infix:<->($x = 0)      { -$x.Numeric }
 multi sub infix:<->(\a, \b)    { a.Numeric - b.Numeric }
 
-sub infix:<−>(|c) is pure { infix:<->(|c) }
+proto sub infix:<−>(Mu $?, Mu $?) is pure { * }
+multi sub infix:<−>($x = 0)    { -$x.Numeric }
+multi sub infix:<−>(\a, \b) is pure { a.Numeric - b.Numeric }
 
 proto sub infix:<*>(Mu $?, Mu $?) is pure   { * }
 multi sub infix:<*>($x = 1)      { $x.Numeric }