Revert "only sink when --sink command line option is provided"

This reverts commit 3f12074.
rakudo · Nov 19, 2012 · 318e56c · 318e56c
1 parent 6cc0d6c
commit 318e56c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -57,7 +57,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
                 QAST::Op.new(:op<if>,
                     QAST::Op.new(:op<can>,
                         QAST::Var.new(:$name, :scope<local>),
-                        QAST::SVal.new(:value<sink>),
+                        QAST::SVal.new(:value('sink')),
                     ),
                     QAST::Op.new(:op<callmethod>, :name<sink>,
                         QAST::Var.new(:$name, :scope<local>),
@@ -67,7 +67,7 @@ class Perl6::Actions is HLL::Actions does STDActions {
         );
     }
     sub autosink($past) {
-        $*DO_SINK && nqp::istype($past, QAST::Op) && ($past.op eq 'call' || $past.op eq 'callmethod')
+        nqp::istype($past, QAST::Op) && ($past.op eq 'call' || $past.op eq 'callmethod')
             ?? sink($past)
             !! $past;
     }

diff --git a/src/Perl6/Compiler.nqp b/src/Perl6/Compiler.nqp
@@ -7,7 +7,6 @@ class Perl6::Compiler is HLL::Compiler {
         if nqp::existskey(%options, 'doc') && !%options<doc> {
             %options<doc> := 'Text';
         }
-        my $*DO_SINK := %options<sink>;
 
         my $hll_ns := pir::get_root_global__Ps('perl6');
         my $argiter := nqp::iterator(@args);

diff --git a/src/main.nqp b/src/main.nqp
@@ -27,7 +27,6 @@ sub MAIN(@ARGS) {
     @clo.push('p');
     @clo.push('doc=s?');
     @clo.push('optimize=s?');
-    @clo.push('sink');
     @clo.push('c');
     @clo.push('I=s');
     @clo.push('M=s');