Merge commit 'joeri/library'

src/builtins/cmp.pir

@@ -81,8 +81,8 @@ Swiped from Rakudo.
     .param pmc a
     .param pmc b
     .local int i
-    $I1 = a.'elems'()
-    $I2 = b.'elems'()
+    $I1 = elements a
+    $I2 = elements b
     ne $I1, $I2, fail
     i = 0
   loop:

src/classes/Array.pir

@@ -100,23 +100,31 @@ Doesnt work, but it should be close...
 .sub 'fill' :method
     .param pmc value
     .param int offset :optional
-    .param int end_index :optional
+    .param int length :optional
+    .local int i, end_index
 
-    unless end_index goto set_index
     unless offset goto set_offset
+    unless length goto set_length
     goto do_fill
 
-    set_index:
-        end_index = self.'length'()
-        unless offset goto set_offset
-        goto do_fill
     set_offset:
         offset = 0
+        unless length goto set_length
         goto do_fill
+    set_length:
+        length = elements self
+        length = length - offset
     do_fill:
-        $P0 = new 'CardinalString'
-        $P0 = value
-        splice self, value, offset, end_index
+        i = offset
+        end_index = offset + length
+
+    loop:
+        if i == end_index goto done
+        self[i] = value
+
+        inc i
+        goto loop
+    done:    
         .return (self)
 .end
 
@@ -161,18 +169,6 @@ match:
     .return($P0)
 .end
 
-
-=item elems()
-
-Return the number of elements in the list.
-
-=cut
-
-.sub 'elems' :method
-    $I0 = elements self
-    .return ($I0)
-.end
-
 =item
 
 Return the class name
@@ -196,19 +192,18 @@ Return a sorted copy of the list
     by = get_hll_global 'infix:cmp'
   have_by:
 
-    .local pmc list, fpa
+    .local pmc fpa
     .local int elems
 
-    list = self
-    elems = list.'elems'()
+    elems = elements self
     fpa = new 'FixedPMCArray'
     fpa = elems
 
     .local int i
     i = 0
   fpa_loop:
     unless i < elems goto fpa_end
-    $P0 = list[i]
+    $P0 = self[i]
     fpa[i] = $P0
     inc i
     goto fpa_loop
@@ -242,7 +237,7 @@ Return a sorted copy of the list
     hash = new 'CardinalHash'
 
     i = 0
-    len = self.'elems'()
+    len = elements self
 
   loop:
     if i == len goto done
@@ -297,7 +292,7 @@ Return a sorted copy of the list
     uarray = new 'CardinalArray'
 
     i = 0
-    len = self.'elems'()
+    len = elements self
 
   loop:
     if i == len goto done
@@ -406,7 +401,7 @@ Return true is C<self> is of size 0
 =cut
 .sub 'empty?' :method
     .local int len
-    len = self.'length'()
+    len = elements self
     if len == 0 goto empty
     goto not_empty
     empty:
@@ -1150,7 +1145,7 @@ Concatenate the passed array onto C<self>
     .local int i, len
 
     i = 0
-    len = other.'size'()
+    len = elements other
 
   loop:
     if i == len goto done
@@ -1584,7 +1579,7 @@ Operator form for either repetition (when argument is an Integer), or as a short
 
     array = new 'CardinalArray'
     hash = new 'CardinalHash'
-    len = that.'size'()
+    len = elements that
     i = 0
 
   hash_loop:
@@ -1597,7 +1592,7 @@ Operator form for either repetition (when argument is an Integer), or as a short
     goto hash_loop
 
   hash_done:
-    len = this.'size'()
+    len = elements this
     i = 0
 
   diff_loop:

t/03-return.t

@@ -4,10 +4,10 @@ def noargs
     return 1
 end
 
-puts "ok " + noargs()
+puts "ok #{noargs()}"
 
 def onearg(a)
     return a
 end
 
-puts onearg("ok ") + onearg(2)
+puts onearg("ok #{onearg(2)}")

t/04-indexed.t

@@ -2,11 +2,11 @@ puts "1..4"
 
 a = [ 'ok ', 1 ]
 
-puts a[0] + a[1]
+puts a[0] + a[1].to_s
 
 a = [ 'ok ', 2, 3, 4 ]
 b = 1
 
-puts a[0] + a[b]
-puts a[0] + a[a[1]]
-puts a[0] + a[a[a[1]]]
+puts a[0] + a[b].to_s
+puts a[0] + a[a[1]].to_s
+puts a[0] + a[a[a[1]]].to_s

t/08-class.t

@@ -2,15 +2,15 @@ puts '1..7'
 
 class OkayOnCreate
     def initialize(a)
-        puts 'ok ' + a
+        puts "ok #{a}"
     end
 end
 
 a = OkayOnCreate.new(1)
 
 class OkaySayer
     def speak
-        puts 'ok ' + @num
+        puts "ok " + @num.to_s
     end
 
     def setnum(n)
@@ -42,7 +42,7 @@ b.speak
 b.inc
 b.speak
 b.num = b.num + 1
-puts "ok " + b.num
+puts "ok #{b.num}"
 
 class StaticTester
     def num()
@@ -52,7 +52,7 @@ class StaticTester
         @@num = var
     end
     def speak()
-        puts "ok " + @@num
+        puts "ok #{@@num}"
     end
 end
 

t/12-gather.t

@@ -8,7 +8,7 @@ items = gather do
     take 2
 end
 
-is items.elems, 3, "basic gather"
+is items.length, 3, "basic gather"
 
 items.each do |i|
     ok i < 3, "basic gather"

t/array/array.t

@@ -7,7 +7,7 @@ a = [ 1, 2, 3, 4 ]
 is a.first, 1
 is a.first(2).last, 2
 is a.last(2).first, 3
-is a.elems, 4
+is a.length, 4
 
 a = [ 5, 6 ]
 

t/array/at.t

@@ -16,4 +16,3 @@ is b, 3, 'at'
 
 c = a.at(1) * 2
 is c, 4, 'at'
-

t/array/fill.t

@@ -6,12 +6,11 @@ a = Array.new(2)
 
 is a, [ nil, nil ], '.new on Array'
 
-todo "Array.fill", "5", 3
-#a = a.fill('-')
+a = a.fill('-')
 is a, [ '-', '-' ], '.fill on Array'
 
-#a = a.fill(':-)', 1)
+a = a.fill(':-)', 1)
 is a, ['-', ':-)'], '.fill with start index'
 
-#a = a.fill(':-o', 0, 1)
-is a, [':-o', ':-)'],  '.fill with start and end index'
+a = a.fill(':-o', 0, 1)
+is a, [':-o', ':-)'],  '.fill with start and length'

t/array/flatten.t

@@ -11,7 +11,7 @@ c = c.flatten
 
 if c.length == 8
 	c.each() do |x|
-		puts 'ok ' + x
+		puts "ok #{x}"
 	end
 else
 	puts "nok 1..8"

t/array/reverse.t

@@ -11,7 +11,7 @@ a << 1
 a = a.reverse
 unless a[0] != 1
 	a.each() do |i|
-	    puts 'ok ' + i
+	    puts "ok #{i}"
 	end
 end
 
@@ -20,6 +20,6 @@ unless a[0] != 6
 	a.reverse!
 	a.each() do |i|
         i += 6
-	    puts 'ok ' + i
+	    puts "ok #{i}"
 	end
 end