make o left associative

This allows [\o] &cos xx * to work.
rakudo · Oct 6, 2015 · 54746f2 · 54746f2
1 parent 164953b
commit 54746f2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -3981,8 +3981,6 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
     }
 
     token infix:sym<**>   { <sym>  <O('%exponentiation')> }
-    token infix:sym<∘>   { <sym>  <O('%exponentiation')> }
-    token infix:sym<o>   { <sym>  <O('%exponentiation')> }
 
     token prefix:sym<+>   { <sym>  <O('%symbolic_unary')> }
     token prefix:sym<~~>  { <sym> <.dupprefix('~~')> <O('%symbolic_unary')> }
@@ -4043,6 +4041,8 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
         [<-alpha>  <.obs('. to concatenate strings', '~')>]?
         <O('%dottyinfix')>
     }
+    token infix:sym<∘>   { <sym>  <O('%concatenation')> }
+    token infix:sym<o>   { <sym>  <O('%concatenation')> }
 
     token infix:sym<&>   { <sym> <O('%junctive_and, :iffy<1>')> }
     token infix:sym<(&)> { <sym> <O('%junctive_and')> }

diff --git a/src/core/operators.pm b/src/core/operators.pm
@@ -631,7 +631,9 @@ sub infix:<orelse>(**@a) {
     $current;
 }
 
-sub infix:<∘> (&f, &g --> Block) { (&f).count > 1 ?? -> |args { f |g |args } !! -> |args { f g |args } }
+multi sub infix:<∘> () { *.self }
+multi sub infix:<∘> (&f) { &f }
+multi sub infix:<∘> (&f, &g --> Block) { (&f).count > 1 ?? -> |args { f |g |args } !! -> |args { f g |args } }
 my &infix:<o> := &infix:<∘>;
 
 # vim: ft=perl6 expandtab sw=4