Give methods on Array a Perl 6 signature and get the transformed into…

… Perl6MultiSub, which is not only more correct but also resolves the issues with method calls on typed arrays. Note that we also bump the required Parrot version number, since I found and fixed a Parrot bug along the way.

src/classes/Array.pir

@@ -14,7 +14,7 @@ src/classes/Array.pir - Perl 6 Array class and related functions
     arrayproto.'!MUTABLE'()
 
     $P0 = get_hll_namespace ['Perl6Array']
-    '!EXPORT'('delete,exists,pop,push,shift,unshift', 'from'=>$P0)
+    '!EXPORT'('delete,exists,pop,push,shift,unshift', 'from'=>$P0, 'to_p6_multi'=>1)
 .end
 
 =head2 Methods
@@ -28,7 +28,7 @@ Remove items from an array.
 =cut
 
 .namespace ['Perl6Array']
-.sub 'delete' :method :multi(Perl6Array)
+.sub 'delete' :method :multi() :subid('array_delete')
     .param pmc indices :slurpy
     .local pmc result
     result = new 'List'
@@ -58,6 +58,16 @@ Remove items from an array.
   indices_end:
     .return (result)
 .end
+.sub '' :init :load
+    .local pmc block, signature
+    .const 'Sub' $P0 = "array_delete"
+    block = $P0
+    signature = new ["Signature"]
+    setprop block, "$!signature", signature
+    signature."!add_param"("@indices", 1 :named("slurpy"))
+    $P0 = get_hll_global 'Array'
+    signature."!add_implicit_self"($P0)
+.end
 
 
 =item exists(indices :slurpy)
@@ -66,7 +76,7 @@ Return true if the elements at C<indices> have been assigned to.
 
 =cut
 
-.sub 'exists' :method :multi(Perl6Array)
+.sub 'exists' :method :multi() :subid('array_exists')
     .param pmc indices :slurpy
     .local int test
 
@@ -79,6 +89,16 @@ Return true if the elements at C<indices> have been assigned to.
   indices_end:
     .tailcall 'prefix:?'(test)
 .end
+.sub '' :init :load
+    .local pmc block, signature
+    .const 'Sub' $P0 = "array_exists"
+    block = $P0
+    signature = new ["Signature"]
+    setprop block, "$!signature", signature
+    signature."!add_param"("@indices", 1 :named("slurpy"))
+    $P0 = get_hll_global 'Array'
+    signature."!add_implicit_self"($P0)
+.end
 
 
 =item item()
@@ -111,8 +131,9 @@ Remove the last item from the array and return it.
 
 =cut
 
-.sub 'pop' :method :multi(Perl6Array)
+.sub 'pop' :method :multi() :subid('array_pop')
     .local pmc x
+    '!SIGNATURE_BIND'()
     unless self goto empty
     x = pop self
     goto done
@@ -121,6 +142,15 @@ Remove the last item from the array and return it.
   done:
     .return (x)
 .end
+.sub '' :init :load
+    .local pmc block, signature
+    .const 'Sub' $P0 = "array_pop"
+    block = $P0
+    signature = new ["Signature"]
+    setprop block, "$!signature", signature
+    $P0 = get_hll_global 'Array'
+    signature."!add_implicit_self"($P0)
+.end
 
 
 =item push(args :slurpy)
@@ -129,13 +159,23 @@ Add C<args> to the end of the Array.
 
 =cut
 
-.sub 'push' :method :multi(Perl6Array)
+.sub 'push' :method :multi() :subid('array_push')
     .param pmc args :slurpy
     args.'!flatten'()
     $I0 = elements self
     splice self, args, $I0, 0
     .tailcall self.'elems'()
 .end
+.sub '' :init :load
+    .local pmc block, signature
+    .const 'Sub' $P0 = "array_push"
+    block = $P0
+    signature = new ["Signature"]
+    setprop block, "$!signature", signature
+    signature."!add_param"("@items", 1 :named("slurpy"))
+    $P0 = get_hll_global 'Array'
+    signature."!add_implicit_self"($P0)
+.end
 
 
 =item shift()
@@ -144,7 +184,7 @@ Shift the first item off the array and return it.
 
 =cut
 
-.sub 'shift' :method :multi(Perl6Array)
+.sub 'shift' :method :multi() :subid('array_shift')
     .local pmc x
     unless self goto empty
     x = shift self
@@ -154,6 +194,15 @@ Shift the first item off the array and return it.
   done:
     .return (x)
 .end
+.sub '' :init :load
+    .local pmc block, signature
+    .const 'Sub' $P0 = "array_shift"
+    block = $P0
+    signature = new ["Signature"]
+    setprop block, "$!signature", signature
+    $P0 = get_hll_global 'Array'
+    signature."!add_implicit_self"($P0)
+.end
 
 
 =item unshift(args :slurpy)
@@ -162,12 +211,22 @@ Adds C<args> to the beginning of the Array.
 
 =cut
 
-.sub 'unshift' :method :multi(Perl6Array)
+.sub 'unshift' :method :multi() :subid('array_unshift')
     .param pmc args :slurpy
     args.'!flatten'()
     splice self, args, 0, 0
     .tailcall self.'elems'()
 .end
+.sub '' :init :load
+    .local pmc block, signature
+    .const 'Sub' $P0 = "array_unshift"
+    block = $P0
+    signature = new ["Signature"]
+    setprop block, "$!signature", signature
+    signature."!add_param"("@items", 1 :named("slurpy"))
+    $P0 = get_hll_global 'Array'
+    signature."!add_implicit_self"($P0)
+.end
 
 =item values()
 
@@ -262,7 +321,6 @@ Store things into an Array (e.g., upon assignment)
     .return (self)
 .end
 
-
 =back
 
 =cut

src/classes/List.pir

@@ -188,11 +188,20 @@ Return the number of elements in the list.
 =cut
 
 .namespace ['List']
-.sub 'elems' :method :multi('ResizablePMCArray') :vtable('get_number')
+.sub 'elems' :method :multi() :vtable('get_number') :subid('list_elems')
     self.'!flatten'()
     $I0 = elements self
     .return ($I0)
 .end
+.sub '' :init :load
+    .local pmc block, signature
+    .const 'Sub' $P0 = "list_elems"
+    block = $P0
+    signature = new ["Signature"]
+    setprop block, "$!signature", signature
+    signature."!add_implicit_self"()
+    '!TOPERL6MULTISUB'(block)
+.end
 
 
 =back