make List.sink safe for invoking on the type object

rakudo · Feb 18, 2012 · bbfd717 · bbfd717
1 parent f9e18ea
commit bbfd717
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Perl6/World.pm b/src/Perl6/World.pm
@@ -765,10 +765,12 @@ class Perl6::World is HLL::World {
             }
         };
         my $stub := sub (*@pos, *%named) {
-            unless $precomp {
+            if $precomp {
+                $precomp(|@pos, |%named);
+            }
+            else {
                 $compiler_thunk();
             }
-            $precomp(|@pos, |%named);
         };
         pir::setprop__vPsP($stub, 'COMPILER_THUNK', $compiler_thunk);
         pir::set__vPS($stub, $code_past.name);
@@ -1513,7 +1515,8 @@ class Perl6::World is HLL::World {
 
         # Call it right away.
         my $ret := $trait_sub(|@pos_args, |%named_args);
-#        if pir::can__IPs($ret, 'sink') { $ret.sink }
+        pir::say(pir::typeof__SP($ret));
+        if pir::can__IPs($ret, 'sink') { $ret.sink }
 
         # Serialize call to it.
         if self.is_precompilation_mode() {

diff --git a/src/core/List.pm b/src/core/List.pm
@@ -80,6 +80,7 @@ my class List does Positional {
 
     method eager() { self.gimme(*); self }
     method sink()  {
+        return unless self.DEFINITE;
         while defined $!nextiter {
             $!nextiter.reify(*, :sink);
         }