Remove unnecessary implementation detail

&SEQUENCE somehow lived in the CORE:: but didn't need to. Move it into Rakudo::SEQUENCE and rename the sub to "iterator", as that is the most logical thing to be returned from a SEQUENCE generator. Adapt the code and the keys tests accordingly.
rakudo · Mar 20, 2020 · 509a7f6 · 509a7f6
1 parent fbf54e1
commit 509a7f6
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 17 deletions.
diff --git a/src/core.c/Rakudo/SEQUENCE.pm6 b/src/core.c/Rakudo/SEQUENCE.pm6
@@ -1,4 +1,7 @@
-sub SEQUENCE(\left, Mu \right, :$exclude_end) is implementation-detail {
+class Rakudo::SEQUENCE {
+
+    method iterator(\left, Mu \right, :$exclude_end --> Iterator:D) {
+
     my \righti := (nqp::iscont(right) ?? right !! [right]).iterator;
     my $endpoint := righti.pull-one.self; # .self explodes Failures
     $endpoint =:= IterationEnd and X::Cannot::Empty.new(
@@ -346,8 +349,10 @@ sub SEQUENCE(\left, Mu \right, :$exclude_end) is implementation-detail {
         }
     });
     $infinite
-        ?? (gathered.Slip, Slip.from-iterator(righti)).lazy
-        !! (gathered.Slip, Slip.from-iterator(righti))
+        ?? (gathered.Slip, Slip.from-iterator(righti)).lazy.iterator
+        !! (gathered.Slip, Slip.from-iterator(righti)).iterator
+}
+
 }
 
 # vim: ft=perl6 expandtab sw=4
diff --git a/src/core.c/Range.pm6 b/src/core.c/Range.pm6
@@ -1,3 +1,4 @@
+my class Rakudo::SEQUENCE { ... }
 my class X::Immutable { ... }
 my class X::Range::InvalidArg { ... }
 
@@ -157,11 +158,11 @@ my class Range is Cool does Iterable does Positional {
                          $!min,$!max.Str,$!excludes-min,$!excludes-max
                        )
                     # generic string sequence
-                    !! SEQUENCE(
+                    !! Rakudo::SEQUENCE.iterator(
                          ($!excludes-min ?? $!min.succ !! $!min),
                          $!max,
                          :exclude_end($!excludes-max)
-                       ).iterator
+                       )
                   # general case
                   !! Rakudo::Iterator.SuccFromTo(
                        $!excludes-min ?? $!min.succ !! $!min,
@@ -303,7 +304,7 @@ my class Range is Cool does Iterable does Positional {
               ?? ().iterator
               !! $max.chars == 1 && nqp::istype($!min,Str) && $!min.chars == 1
                 ?? CharReverse.new($max,$!excludes-min ?? $!min.succ !! $!min)
-                !! SEQUENCE($max,$!min,:exclude_end($!excludes-min)).iterator
+                !! Rakudo::SEQUENCE.iterator($max,$!min,:exclude_end($!excludes-min))
         }
 
         # General case according to spec

diff --git a/src/core.c/operators.pm6 b/src/core.c/operators.pm6
@@ -123,7 +123,9 @@ only sub HOW (Mu \x) { x.HOW }
 only sub VAR (Mu \x) { x.VAR }
 
 proto sub infix:<...>(|) {*}
-multi sub infix:<...>(\a, Mu \b) { Seq.new(SEQUENCE(a, b).iterator) }
+multi sub infix:<...>(\a, Mu \b) {
+    Seq.new(Rakudo::SEQUENCE.iterator(a, b))
+}
 multi sub infix:<...>(|lol) {
     my @lol := lol.list;
     my @end;
@@ -146,11 +148,11 @@ multi sub infix:<...>(|lol) {
     $i = 0;
     while $i < $m {
         $ret := ($ret.Slip,
-            SEQUENCE(
+            Seq.new(Rakudo::SEQUENCE.iterator(
                 (Slip.from-iterator(@seq[$i]),),
                 @end[$i],
                 :exclude_end(so @excl[$i])
-            ).Slip
+            )).Slip
         );
         ++$i;
     }
@@ -163,7 +165,9 @@ multi sub infix:<...>(|lol) {
 }
 
 proto sub infix:<...^>($, Mu, *%) {*}
-multi sub infix:<...^>(\a, Mu \b) { Seq.new(SEQUENCE(a, b, :exclude_end(1)).iterator) }
+multi sub infix:<...^>(\a, Mu \b) {
+    Seq.new(Rakudo::SEQUENCE.iterator(a, b, :exclude_end))
+}
 
 proto sub infix:<…>(|) {*}
 multi sub infix:<…>(|c) { infix:<...>(|c) }

diff --git a/t/02-rakudo/03-corekeys-6c.t b/t/02-rakudo/03-corekeys-6c.t
@@ -67,7 +67,6 @@ my @expected = (
   Q{&REQUIRE_IMPORT},
   Q{&RETURN-LIST},
   Q{&RUN-MAIN},
-  Q{&SEQUENCE},
   Q{&SLICE_MORE_HASH},
   Q{&SLICE_MORE_LIST},
   Q{&SLICE_ONE_HASH},

diff --git a/t/02-rakudo/03-corekeys-6d.t b/t/02-rakudo/03-corekeys-6d.t
@@ -67,7 +67,6 @@ my @expected = (
     Q{&REQUIRE_IMPORT},
     Q{&RETURN-LIST},
     Q{&RUN-MAIN},
-    Q{&SEQUENCE},
     Q{&SLICE_MORE_HASH},
     Q{&SLICE_MORE_LIST},
     Q{&SLICE_ONE_HASH},

diff --git a/t/02-rakudo/03-corekeys-6e.t b/t/02-rakudo/03-corekeys-6e.t
@@ -68,7 +68,6 @@ my @expected = (
     Q{&REQUIRE_IMPORT},
     Q{&RETURN-LIST},
     Q{&RUN-MAIN},
-    Q{&SEQUENCE},
     Q{&SLICE_MORE_HASH},
     Q{&SLICE_MORE_LIST},
     Q{&SLICE_ONE_HASH},

diff --git a/t/02-rakudo/03-corekeys.t b/t/02-rakudo/03-corekeys.t
@@ -69,7 +69,6 @@ my @allowed =
       Q{&REQUIRE_IMPORT},
       Q{&RETURN-LIST},
       Q{&RUN-MAIN},
-      Q{&SEQUENCE},
       Q{&SLICE_MORE_HASH},
       Q{&SLICE_MORE_LIST},
       Q{&SLICE_ONE_HASH},

diff --git a/t/02-rakudo/04-settingkeys-6c.t b/t/02-rakudo/04-settingkeys-6c.t
@@ -66,7 +66,6 @@ my %allowed = (
     Q{&REQUIRE_IMPORT},
     Q{&RETURN-LIST},
     Q{&RUN-MAIN},
-    Q{&SEQUENCE},
     Q{&SLICE_MORE_HASH},
     Q{&SLICE_MORE_LIST},
     Q{&SLICE_ONE_HASH},

diff --git a/t/02-rakudo/04-settingkeys-6e.t b/t/02-rakudo/04-settingkeys-6e.t
@@ -65,7 +65,6 @@ my %allowed = (
     Q{&REQUIRE_IMPORT},
     Q{&RETURN-LIST},
     Q{&RUN-MAIN},
-    Q{&SEQUENCE},
     Q{&SLICE_MORE_HASH},
     Q{&SLICE_MORE_LIST},
     Q{&SLICE_ONE_HASH},

diff --git a/tools/templates/6.c/core_sources b/tools/templates/6.c/core_sources
@@ -150,8 +150,8 @@ src/core.c/set_precedes.pm6
 src/core.c/ObjAt.pm6
 src/core.c/Version.pm6
 src/core.c/ForeignCode.pm6
-src/core.c/operators.pm6
 src/core.c/Rakudo/SEQUENCE.pm6
+src/core.c/operators.pm6
 src/core.c/Hyper.pm6
 src/core.c/metaops.pm6
 src/core.c/precedence.pm6