Parcel no longer autoflattens for .elems or .[]

rakudo · Sep 2, 2014 · ef380d2 · ef380d2
1 parent a8df1c9
commit ef380d2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/src/core/Any.pm b/src/core/Any.pm
@@ -786,7 +786,7 @@ sub SLICE_MORE ( \SELF, $more, $array, *%adv ) is hidden_from_backtrace {
                             $de(SELF,$_) if $wasthere = $ex(SELF,$_);
                             ($_, !( $wasthere ?^ $exists )) 
                               if !$kv | $wasthere;
-                        } ).eager.Parcel
+                        } ).flat.eager.Parcel
                     }
                     else {
                         @nogo = <delete exists kv>;
@@ -815,10 +815,10 @@ sub SLICE_MORE ( \SELF, $more, $array, *%adv ) is hidden_from_backtrace {
                     $kv
                       ?? $more.list.map( {
                              ( $_, $de(SELF,$_) ) if $ex(SELF,$_);
-                         } ).eager.Parcel
+                         } ).flat.eager.Parcel
                       !! $more.list.map( {
                              ( $_, $de(SELF,$_) )
-                         } ).eager.Parcel;
+                         } ).flat.eager.Parcel;
                 }
                 else {
                     @nogo = <delete kv>;
@@ -884,10 +884,10 @@ sub SLICE_MORE ( \SELF, $more, $array, *%adv ) is hidden_from_backtrace {
                     $kv
                       ?? $more.list.map( {
                              ( $_, $exists ) if $ex(SELF,$_);
-                         } ).eager.Parcel
+                         } ).flat.eager.Parcel
                       !! $more.list.map( {
                              ( $_, !( $ex(SELF,$_) ?^ $exists ) )
-                         } ).eager.Parcel;
+                         } ).flat.eager.Parcel;
                 }
                 else {
                     @nogo = <exists kv>;
@@ -917,11 +917,11 @@ sub SLICE_MORE ( \SELF, $more, $array, *%adv ) is hidden_from_backtrace {
             if !%a {                         # :!delete?:kv(0|1)
                 $kv
                   ?? $more.list.map( {
-                         ($_, $at(SELF,$_)) if $ex(SELF,$_);
-                     } ).eager.Parcel
+                         $_, $at(SELF,$_) if $ex(SELF,$_);
+                     } ).flat.eager.Parcel
                   !! $more.list.map( {
-                         ($_, $at(SELF,$_))
-                     } ).eager.Parcel;
+                         $_, $at(SELF,$_)
+                     } ).flat.eager.Parcel;
             }
             else {
                 @nogo = <kv>;
@@ -947,7 +947,7 @@ sub SLICE_MORE ( \SELF, $more, $array, *%adv ) is hidden_from_backtrace {
             if !%a {                         # :!delete?:k(0|1)
                 $k
                   ?? $more.list.map( { $_ if $ex(SELF,$_) } ).eager.Parcel
-                  !! $more.list.eager.Parcel;
+                  !! $more.list.flat.eager.Parcel;
             }
             else {
                 @nogo = <k>;

diff --git a/src/core/Parcel.pm b/src/core/Parcel.pm
@@ -6,9 +6,8 @@ my class Parcel does Positional { # declared in BOOTSTRAP
     submethod BUILD() { $!storage := nqp::list() }
 
     multi method Bool(Parcel:D:)           { nqp::p6bool($!storage) }
-    multi method Numeric(Parcel:D:)        { self.flat.elems }
-    multi method Str(Parcel:D:)            { self.flat.Str }
-#    multi method Int(Parcel:D:)            { self.flat.elems }
+    multi method Numeric(Parcel:D:)        { nqp::elems($!storage) }
+    multi method Str(Parcel:D:)            { self.list.Str }
     multi method ACCEPTS(Parcel:D: $topic) { self.list.ACCEPTS($topic) }
 
     multi method WHICH(Parcel:D:) {
@@ -34,7 +33,7 @@ my class Parcel does Positional { # declared in BOOTSTRAP
         $cap
     }
 
-    method elems() { self.flat.elems }
+    method elems() { nqp::elems($!storage) }
     method item()  { my $v = self; }
     method flat()  { nqp::p6list(nqp::clone($!storage), List, Bool::True) }
     method list()  { nqp::p6list(nqp::clone($!storage), List, Mu) }
@@ -63,7 +62,12 @@ my class Parcel does Positional { # declared in BOOTSTRAP
         $parcel;
     }
 
-    method at_pos(Parcel:D: \x) is rw { self.flat.at_pos(x); }
+    multi method at_pos(Parcel:D: \x) is rw { self.at_pos(nqp::unbox_i(x.floor)) }
+    multi method at_pos(Parcel:D: int $x) is rw {
+        $x > nqp::elems($!storage) || $x < 0
+            ?? Nil
+            !! nqp::atpos($!storage, $x);
+    }
 
     multi method gist(Parcel:D:) {
         my Mu $gist := nqp::list();