Implement s[...] op= foo.

rakudo · Jan 12, 2015 · 495bc53 · 495bc53
1 parent d7338dc
commit 495bc53
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -6108,7 +6108,21 @@ class Perl6::Actions is HLL::Actions does STDActions {
             $<sibble><left>.ast, 'anon', '', %sig_info, $rx_block, :use_outer_match(1)) if $<sibble><left>.ast;
 
         # Quote needs to be closure-i-fied.
-        my $closure := block_closure(make_thunk_ref($<sibble><right>.ast, $<sibble><right>));
+        my $infixish := $<sibble><infixish>;
+        my $right;
+        if !$infixish || $infixish.Str eq '=' {
+            $right := $<sibble><right>.ast;
+        }
+        else {
+            $right := $infixish.ast;
+            $right.push(QAST::Op.new(
+                :op('assign'),
+                QAST::Op.new( :op('p6scalarfromdesc'), QAST::Op.new( :op('null') ) ),
+                QAST::Var.new( :name('$/'), :scope('lexical') )
+            ));
+            $right.push($<sibble><right>.ast);
+        }
+        my $closure := block_closure(make_thunk_ref($right, $<sibble><right>));
 
         # make $/ = $_.subst-mutate(...)
         my $past := QAST::Op.new(

diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -3464,8 +3464,7 @@ grammar Perl6::Grammar is HLL::Grammar does STD {
             <.ws>
             [ <?[ \[ \{ \( \< ]> <.obs('brackets around replacement', 'assignment syntax')> ]?
             [ <infixish> || <.missing: "assignment operator"> ]
-            [ <?{ $<infixish>.Str eq '=' }> || <.malformed: "assignment operator"> ]
-            # XXX When we support it, above check should add: || $<infixish><infix_postfix_meta_operator>[0]
+            [ <?{ $<infixish>.Str eq '=' || $<infixish><infix_postfix_meta_operator> }> || <.malformed: "assignment operator"> ]
             <.ws>
             [ <right=.EXPR('i')> || <.panic: "Assignment operator missing its expression"> ]
         ||