fix the list after object fixes

start index at 1, but don’t overwrite layout,
so add one
This commit is contained in:
Torsten Ruger 2015-05-17 14:56:06 +03:00
parent 3b268df920
commit 3bdba119c8
2 changed files with 56 additions and 37 deletions

View File

@ -1,13 +1,29 @@
# A List, or rather an ordered list, is just that, a list of items.
# For a programmer this may be a little strange as this new start goes with trying to break old
# bad habits. A List would be an array in some languages, but list is a better name, closer to
# common language.
# Another habit is to start a list from 0. This is "just" programmers lazyness, as it goes
# with the standard c implementation. But it bends the mind, and in oo we aim not to.
# If you have a list of three items, you they will be first, second and third, ie 1,2,3
#
# For the implementation we use Objects memory which is index addressable
# But, objects are also lists where indexes start with 1, except 1 is taken for the Layout
# so all incoming/outgoing indexes have to be shifted one up/down
module Parfait
class List < Object
def get_length
internal_object_length - 1
end
def index_of( item )
max = self.length
counter = 0
max = self.get_length
counter = 1
while( counter < max )
if( internal_object_get(index) == item)
if( get(index) == item)
return counter
end
counter = counter + 1
@ -18,52 +34,55 @@ module Parfait
# push means add to the end
# this automatically grows the List
def push value
self.set( length , value)
self.set( self.get_length + 1 , value)
end
# set the value at index.
# Lists start from index 1
def set( index , value)
raise "negative index for set #{len}" if index < 0
if index >= self.length
raise "Only positive indexes #{index}" if index <= 0
if index > self.get_length
grow_to(index)
end
internal_object_set( index , value)
# internally 1 is reserved for the layout
internal_object_set( index + 1, value)
end
# set the value at index.
# Lists start from index 1
def get(index)
raise "negative index for get #{len}" if index < 0
if index >= self.length
raise "Only positive indexes, #{len}" if index <= 0
if index > self.get_length
return nil
else
return internal_object_get(index)
return internal_object_get(index + 1)
end
end
def empty?
self.length == 0
self.get_length == 0
end
def each
index = 0
while index < self.length
index = 1
while index <= self.get_length
item = get(index)
yield item
index = index + 1
end
self
end
def set_length len
# TODO check if not shrinking
grow_to len
end
def grow_to(len)
raise "negative length for grow #{len}" if len < 0
return unless len > self.length
index = self.length
internal_object_grow(length)
while( index < self.length )
internal_object_set( index , nil)
index += 1
end
raise "Only positive lenths, #{len}" if len <= 0
old_length = self.get_length
return if old_length >= len
internal_object_grow(len + 1)
end
#many basic List functions can not be defined in ruby, such as
# get/set/length/add/delete

View File

@ -9,36 +9,36 @@ class TestList < MiniTest::Test
assert @list.empty?
end
def test_list_len
assert_equal 0 , @list.length
assert_equal 0 , @list.get_length
end
def test_empty_list_doesnt_return
assert_equal nil , @list.get(3)
end
def test_one_set0
assert_equal 1 , @list.set(0,1)
end
def test_set0_len
@list.set(0,1)
assert_equal 1 , @list.length
end
def test_one_set1
assert_equal :some , @list.set(1,:some)
assert_equal 1 , @list.set(1,1)
end
def test_set1_len
@list.set(1,:some)
assert_equal 2 , @list.length
@list.set(1,1)
assert_equal 1 , @list.get_length
end
def test_one_set2
assert_equal :some , @list.set(2,:some)
end
def test_set2_len
@list.set(2,:some)
assert_equal 2 , @list.get_length
end
def test_two_sets
assert_equal 1 , @list.set(0,1)
assert_equal 1 , @list.set(1,1)
assert_equal :some , @list.set(1,:some)
end
def test_one_get1
test_one_set0
assert_equal 1 , @list.get(0)
test_one_set1
assert_equal 1 , @list.get(1)
end
def test_one_get2
test_one_set1
assert_equal :some , @list.get(1)
test_one_set2
assert_equal :some , @list.get(2)
end
def test_many_get
shouldda = { 1 => :one , 2 => :two , 3 => :three}