Get type checking of operations involving arrays working. Along the w…

…ay, fixed the bug where my @A; @A = 1; then made anything that referenced @A[0] blow up with a Null PMC Exception.
rakudo · Apr 8, 2009 · 2ae3181 · 2ae3181
1 parent 6b97553
commit 2ae3181
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 8 deletions.
diff --git a/src/classes/Array.pir b/src/classes/Array.pir
@@ -48,7 +48,10 @@ Remove items from an array.
   shorten_loop:
     if $I0 < 0 goto shorten_end
     $P0 = self[$I0]
-    unless null $P0 goto shorten_end
+    if null $P0 goto do_shorten
+    $I1 = $P0.'defined'()
+    if $I1 goto shorten_end
+  do_shorten:
     delete self[$I0]
     dec $I0
     goto shorten_loop
@@ -133,7 +136,6 @@ Remove the last item from the array and return it.
 
 .sub 'pop' :method :multi() :subid('array_pop')
     .local pmc x
-    '!SIGNATURE_BIND'()
     unless self goto empty
     x = pop self
     goto done
@@ -161,10 +163,22 @@ Add C<args> to the end of the Array.
 
 .sub 'push' :method :multi() :subid('array_push')
     .param pmc args :slurpy
+    .local pmc type, it
+    type = self.'of'()
     args.'!flatten'()
+    it = iter args
+  it_loop:
+    unless it goto it_loop_end
+    $P0 = shift it
+    $I0 = type.'ACCEPTS'($P0)
+    unless $I0 goto type_error
+    goto it_loop
+  it_loop_end:
     $I0 = elements self
     splice self, args, $I0, 0
     .tailcall self.'elems'()
+  type_error:
+    'die'('Type check failure in push')
 .end
 .sub '' :init :load
     .local pmc block, signature
@@ -213,9 +227,21 @@ Adds C<args> to the beginning of the Array.
 
 .sub 'unshift' :method :multi() :subid('array_unshift')
     .param pmc args :slurpy
+    .local pmc type, it
+    type = self.'of'()
     args.'!flatten'()
+    it = iter args
+  it_loop:
+    unless it goto it_loop_end
+    $P0 = shift it
+    $I0 = type.'ACCEPTS'($P0)
+    unless $I0 goto type_error
+    goto it_loop
+  it_loop_end:
     splice self, args, 0, 0
     .tailcall self.'elems'()
+  type_error:
+    'die'('Type check failure in push')
 .end
 .sub '' :init :load
     .local pmc block, signature
@@ -302,7 +328,8 @@ Store things into an Array (e.g., upon assignment)
 .namespace ['Perl6Array']
 .sub '!STORE' :method
     .param pmc source
-    .local pmc array, it
+    .local pmc array, it, type
+    type = self.'of'()
     ## we create a new array here instead of emptying self in case
     ## the source argument contains self or elements of self.
     array = new 'ResizablePMCArray'
@@ -311,14 +338,19 @@ Store things into an Array (e.g., upon assignment)
   array_loop:
     unless it goto array_done
     $P0 = shift it
+    $I0 = type.'ACCEPTS'($P0)
+    unless $I0 goto type_error
     $P0 = '!CALLMETHOD'('Scalar',$P0)
     $P0 = clone $P0
+    setprop $P0, 'type', type
     push array, $P0
     goto array_loop
   array_done:
     $I0 = elements self
     splice self, array, 0, $I0
     .return (self)
+  type_error:
+    'die'("Type mismatch in assignment to Array.")
 .end
 
 =back

diff --git a/src/classes/Positional.pir b/src/classes/Positional.pir
@@ -52,10 +52,11 @@ Returns a list element or slice.
 
 =cut
 
-.sub 'postcircumfix:[ ]' :method
+.sub 'postcircumfix:[ ]' :method :outer('_positional_role_body')
     .param pmc args            :slurpy
     .param pmc options         :slurpy :named
-    .local pmc result
+    .local pmc result, type
+    type = find_lex 'T'
     if args goto do_index
     ## return complete invocant as a list
     .tailcall self.'list'()
@@ -73,9 +74,15 @@ Returns a list element or slice.
   result_fetch:
     result = self[$I0]
     unless null result goto end
+    .local int cur_elems
+    cur_elems = elements self
+  viv_loop:
+    if cur_elems > $I0 goto end
     result = 'undef'()
-    self[$I0] = result
-    goto end
+    setprop result, 'type', type
+    self[cur_elems] = result
+    inc cur_elems
+    goto viv_loop
   result_whatever:
     result = 'list'(self)
     goto end
@@ -95,8 +102,14 @@ Returns a list element or slice.
   slice_index:
     elem = self[$I0]
     unless null elem goto slice_elem
+    cur_elems = elements self
+  viv_loop_slice:
+    if cur_elems > $I0 goto slice_elem
     elem = 'undef'()
-    self[$I0] = elem
+    setprop elem, 'type', type
+    self[cur_elems] = elem
+    inc cur_elems
+    goto viv_loop_slice
   slice_elem:
     push result, elem
     goto slice_loop