fix S///

rakudo · Oct 22, 2015 · 75e92fc · 75e92fc
1 parent 0e26a47
commit 75e92fc
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -7001,20 +7001,16 @@ Compilation unit '$file' contained the following violations:
                         )
                     ),
 
-                    ($<sym> eq 's' ??
-                        # $_ = $_!APPLY-MATCHES()
-                        QAST::Op.new( :op('call'), :name('&infix:<=>'),
-                            QAST::Var.new( :name('$_'), :scope('lexical') ),
-                            $apply_matches
-                        ) !!
-                        # $_!APPLY-MATCHES()
+                    QAST::Op.new( :op('call'), :name('&infix:<=>'),
+                        QAST::Var.new( :name($<sym> eq 's' ?? '$_' !! '$/'), :scope('lexical') ),
                         $apply_matches
                     )
+
                 ),
 
                 # It will return a list of matches when we match globally, and a single
                 # match otherwise.
-                (
+                $<sym> eq 's' ?? (
                     $global ??
                     QAST::Op.new( :op('p6store'),
                         QAST::Var.new( :name('$/'), :scope('lexical') ),
@@ -7043,13 +7039,11 @@ Compilation unit '$file' contained the following violations:
                             QAST::Var.new( :name('$/'), :scope('lexical') ) ),
                         QAST::Var.new( :name($result), :scope('local') )
                     )
-                ),
+                ) !! QAST::Stmt.new(),
 
                 # The result of this operation.
                 QAST::Var.new( :name('$/'), :scope('lexical') )
             ),
-            $result,
-            $global_result,
         );
     }