Update Rakudo::Iterator to not use $!whence

rakudo · Jun 15, 2018 · 82702e9 · 82702e9
1 parent e31f830
commit 82702e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/Perl6/Metamodel/ContainerDescriptor.nqp b/src/Perl6/Metamodel/ContainerDescriptor.nqp
@@ -36,8 +36,10 @@ role Perl6::Metamodel::ContainerDescriptor::Whence {
     has $!next-descriptor;
 
     method next() {
-        nqp::ifnull($!next-descriptor,
-            ($!next-descriptor := nqp::gethllsym('perl6', 'default_cont_spec')))
+        my $next := $!next-descriptor;
+        nqp::isconcrete($next)
+            ?? $next
+            !! ($!next-descriptor := nqp::gethllsym('perl6', 'default_cont_spec'))
     }
     method of() { self.next.of }
     method default() { self.next.default }

diff --git a/src/core/Rakudo/Iterator.pm6 b/src/core/Rakudo/Iterator.pm6
@@ -2496,12 +2496,8 @@ class Rakudo::Iterator {
             method new(\arr, Mu \des) { nqp::create(self)!SET-SELF(arr, des) }
 
             method !hole(int $i) is raw {
-                nqp::p6bindattrinvres(
-                  (my \v := nqp::p6scalarfromdesc($!descriptor)),
-                  Scalar,
-                  '$!whence',
-                  -> { nqp::bindpos($!reified,$i,v) }
-                )
+                nqp::p6scalarfromdesc(ContainerDescriptor::BindArrayPos.new(
+                    $!descriptor, $!reified, $i))
             }
             method pull-one() is raw {
                 nqp::ifnull(