Revert "Make X die on various forms of lazy sequences"

This reverts commit 2a7c27a.
rakudo · Jan 16, 2017 · 9537ccd · 9537ccd
1 parent 3e373ff
commit 9537ccd
Showing 1 changed file with 2 additions and 50 deletions.
diff --git a/src/core/Rakudo/Iterator.pm b/src/core/Rakudo/Iterator.pm
@@ -561,12 +561,7 @@ class Rakudo::Iterator {
 
                           # need to set up an iterator
                           nqp::stmts(
-                            nqp::if($elem.is-lazy,
-                              nqp::stmts(
-                                self!die-if-not-sane($i),
-                                ($!lazy = 1)
-                              )
-                            ),
+                            nqp::if($elem.is-lazy,($!lazy = 1)),
                             nqp::if(
                               nqp::eqaddr(
                                 (my $pulled :=
@@ -595,25 +590,6 @@ class Rakudo::Iterator {
                     self
                   )
               }
-              # sanity check for handling 1,2 X 1..*
-              method !die-if-not-sane($from) {
-                  nqp::stmts(
-                    (my int $i = $from),
-                    nqp::while(
-                      nqp::isge_i(($i = nqp::sub_i($i,1)),0),
-                      nqp::stmts(
-                        nqp::unless(
-                          nqp::isnull(nqp::atpos($!iterators,$i)),
-                          (die "Can only have one lazy sequence in a cross")
-                        ),
-                        nqp::if(
-                          nqp::isgt_i(nqp::elems(nqp::atpos($!reifieds,$i)),1),
-                          (die "Can only have single element lists before a lazy sequence in a cross")
-                        )
-                      )
-                    )
-                  )
-              }
               method new(\iterables) { nqp::create(self)!SET-SELF(iterables) }
               method pull-one() {
                   nqp::if(
@@ -847,12 +823,7 @@ class Rakudo::Iterator {
 
                           # need to set up an iterator
                           nqp::stmts(
-                            nqp::if($elem.is-lazy,
-                              nqp::stmts(
-                                self!die-if-not-sane($i),
-                                ($!lazy = 1)
-                              )
-                            ),
+                            nqp::if($elem.is-lazy,($!lazy = 1)),
                             nqp::if(
                               nqp::eqaddr(
                                 (my $pulled :=
@@ -882,25 +853,6 @@ class Rakudo::Iterator {
                     self
                   )
               }
-              # sanity check for handling 1,2 X 1..*
-              method !die-if-not-sane($from) {
-                  nqp::stmts(
-                    (my int $i = $from),
-                    nqp::while(
-                      nqp::isge_i(($i = nqp::sub_i($i,1)),0),
-                      nqp::stmts(
-                        nqp::unless(
-                          nqp::isnull(nqp::atpos($!iterators,$i)),
-                          (die "Can only have one lazy sequence in a cross")
-                        ),
-                        nqp::if(
-                          nqp::isgt_i(nqp::elems(nqp::atpos($!reifieds,$i)),1),
-                          (die "Can only have single element lists before a lazy sequence in a cross")
-                        )
-                      )
-                    )
-                  )
-              }
               method new(\its,\map) { nqp::create(self)!SET-SELF(its,map) }
               method pull-one() {
                   nqp::if(