ruby-x/rubyx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove the space instance from register machine

Browse Source 
bad design, probably from the booting
This commit is contained in:
Torsten Ruger
2016-12-30 14:04:59 +02:00
parent ef872edd7a
commit a00f6be3ba
30 changed files with 121 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/typed/expressions/helper.rb
View File

@ -4,7 +4,7 @@ module ExpressionHelper
def check
Register.machine.boot unless Register.machine.booted
compiler = Typed::MethodCompiler.new Register.machine.space.get_main
compiler = Typed::MethodCompiler.new Parfait::Space.object_space.get_main
code = Typed.ast_to_code @input
assert code.to_s , @input
produced = compiler.process( code )
@ -15,7 +15,7 @@ module ExpressionHelper
# test hack to in place change object type
def add_space_field(name,type)
class_type = Register.machine.space.get_class_by_name(:Space).instance_type
class_type = Parfait::Space.object_space.get_class_by_name(:Space).instance_type
class_type.send(:private_add_instance_variable, name , type)
end
end

8
test/typed/expressions/test_call.rb
View File

@ -16,20 +16,20 @@ module Register
end
def test_call_main_int
Register.machine.space.get_main.add_argument(:blar , :Integer)
Parfait::Space.object_space.get_main.add_argument(:blar , :Integer)
@input =s(:call,s(:name, :main),s(:arguments , s(:int, 1)))
check
end
def test_call_main_string
Register.machine.space.get_main.add_argument(:blar , :Word)
Parfait::Space.object_space.get_main.add_argument(:blar , :Word)
@input =s(:call,s(:name, :main),s(:arguments , s(:string, "1") ))
check
end
def test_call_main_op
Register.machine.space.get_main.add_local(:bar , :Integer)
Register.machine.space.get_main.add_argument(:blar , :Integer)
Parfait::Space.object_space.get_main.add_local(:bar , :Integer)
Parfait::Space.object_space.get_main.add_argument(:blar , :Integer)
@input =s(:call,s(:name, :main),s(:arguments , s(:name, :bar) ))
check
end

4
test/typed/expressions/test_ops.rb
View File

@ -21,12 +21,12 @@ module Register
end
end
def test_local_int
Register.machine.space.get_main.add_local(:bar , :Integer)
Parfait::Space.object_space.get_main.add_local(:bar , :Integer)
@input = s(:operator_value, :+, s(:name, :bar), s(:int, 3))
check
end
def test_int_local
Register.machine.space.get_main.add_local(:bar , :Integer)
Parfait::Space.object_space.get_main.add_local(:bar , :Integer)
@input = s(:operator_value, :+, s(:int, 3), s(:name, :bar))
check
end

4
test/typed/expressions/test_vars.rb
View File

@ -10,7 +10,7 @@ module Register
end
def test_local
Register.machine.space.get_main.add_local(:bar , :Integer)
Parfait::Space.object_space.get_main.add_local(:bar , :Integer)
@input = s(:name, :bar)
@output = Register::RegisterValue
check
@ -24,7 +24,7 @@ module Register
end
def test_args
Register.machine.space.get_main.add_argument(:bar , :Integer)
Parfait::Space.object_space.get_main.add_argument(:bar , :Integer)
@input = s(:name, :bar)
@output = Register::RegisterValue
check

4
test/typed/parfait/test_attributes.rb
View File

@ -3,7 +3,9 @@ require_relative "../helper"
class TestAttributes < MiniTest::Test
def setup
@mess = Register.machine.boot.space.first_message
Register.machine.boot
@space = Parfait::Space.object_space
@mess = @space.first_message
@type = @mess.get_type
end

3
test/typed/parfait/test_class.rb
View File

@ -3,7 +3,8 @@ require_relative "../helper"
class TestClass < MiniTest::Test
def setup
@space = Register.machine.boot.space
Register.machine.boot
@space = Parfait::Space.object_space
@try = @space.create_class :Try , :Object
end

6
test/typed/parfait/test_list.rb
View File

@ -10,10 +10,10 @@ class TestList < MiniTest::Test
assert @list.is_a? Parfait::Indexed
end
def test_old_type
assert_equal Parfait::Type , Register.machine.space.classes.keys.get_type.class
assert_equal Parfait::Type , Parfait::Space.object_space.classes.keys.get_type.class
end
def test_old_type_push
list = Register.machine.space.classes.keys
list = Parfait::Space.object_space.classes.keys
assert_equal Parfait::Type , list.get_type.class
end
def test_new_type
@ -28,7 +28,7 @@ class TestList < MiniTest::Test
assert_equal 1 , type.variable_index(:type)
end
def notest_type_is_first_old
type = Register.machine.space.classes.keys.get_type
type = Parfait::Space.object_space.classes.keys.get_type
assert_equal 1 , type.variable_index(:type)
end

4
test/typed/parfait/test_message.rb
View File

@ -3,7 +3,9 @@ require_relative "../helper"
class TestMessage < MiniTest::Test
def setup
@mess = Register.machine.boot.space.first_message
Register.machine.boot
@space = Parfait::Space.object_space
@mess = @space.first_message
end
def test_length

4
test/typed/parfait/test_named_list.rb
View File

@ -3,7 +3,9 @@ require_relative "../helper"
class TestNamedLists < MiniTest::Test
def setup
@named_list = Register.machine.boot.space.first_message.locals
Register.machine.boot
@space = Parfait::Space.object_space
@named_list = @space.first_message.locals
@type = @named_list.get_type
end

33
test/typed/parfait/test_space.rb
View File

@ -4,6 +4,7 @@ class TestSpace < MiniTest::Test
def setup
@machine = Register.machine.boot
@space = Parfait::Space.object_space
end
def classes
[:Kernel,:Word,:List,:Message,:NamedList,:Type,:Object,:Class,:Dictionary,:TypedMethod , :Integer]
@ -11,9 +12,7 @@ class TestSpace < MiniTest::Test
def test_booted
assert_equal true , @machine.booted
end
def test_machine_space
assert_equal Parfait::Space , @machine.space.class
end
def test_global_space
assert_equal Parfait::Space , Parfait::Space.object_space.class
end
@ -24,30 +23,36 @@ class TestSpace < MiniTest::Test
def test_classes_class
classes.each do |name|
assert_equal :Class , @machine.space.classes[name].get_class.name
assert_equal Parfait::Class , @machine.space.classes[name].class
assert_equal :Class , @space.classes[name].get_class.name
assert_equal Parfait::Class , @space.classes[name].class
end
end
def test_types
assert @machine.space.types.is_a? Parfait::Dictionary
assert @space.types.is_a? Parfait::Dictionary
end
def test_types_each
@space.each_type do |type|
assert type.is_a?(Parfait::Type)
end
end
def test_classes_type
classes.each do |name|
assert_equal Parfait::Type , @machine.space.classes[name].get_type.class
assert_equal Parfait::Type , @space.classes[name].get_type.class
end
end
def test_classes_name
classes.each do |name|
assert_equal name , @machine.space.classes[name].name
assert_equal name , @space.classes[name].name
end
end
def test_method_name
classes.each do |name|
cl = @machine.space.classes[name]
cl = @space.classes[name]
cl.method_names.each do |mname|
method = cl.get_instance_method(mname)
assert_equal mname , method.name
@ -56,7 +61,7 @@ class TestSpace < MiniTest::Test
end
end
def test_messages
mess = @machine.space.first_message
mess = @space.first_message
all = []
while mess
all << mess
@ -68,19 +73,19 @@ class TestSpace < MiniTest::Test
assert_equal 50 + 1 , all.length
end
def test_message_vars
mess = @machine.space.first_message
mess = @space.first_message
all = mess.get_instance_variables
assert all
assert all.include?(:next_message)
end
def test_create_class
assert @machine.space.create_class( :NewClass )
assert @space.create_class( :NewClass )
end
def test_created_class_is_stored
@machine.space.create_class( :NewerClass )
assert @machine.space.get_class_by_name(:NewerClass)
@space.create_class( :NewerClass )
assert @space.get_class_by_name(:NewerClass)
end
end

2
test/typed/parfait/test_typed_method.rb
View File

@ -3,7 +3,7 @@ require_relative "../helper"
class TestMethod < MiniTest::Test
def setup
obj = Register.machine.space.get_class_by_name(:Object).instance_type
obj = Parfait::Space.object_space.get_class_by_name(:Object).instance_type
args = Parfait::Type.for_hash( obj.object_class , { bar: :Integer , foo: :Type})
@method = ::Parfait::TypedMethod.new obj , :meth , args
@method.add_local :local_bar , :Integer

2
test/typed/statements/helper.rb
View File

@ -16,7 +16,7 @@ module Statements
code = Typed.ast_to_code( @input )
assert code.to_s , @input
produced = compiler.process( code )
produced = Register.machine.space.get_main.instructions
produced = Parfait::Space.object_space.get_main.instructions
compare_instructions produced , @expect
produced
end

20
test/typed/statements/test_assign.rb
View File

@ -5,7 +5,7 @@ class TestAssignStatement < MiniTest::Test
include Statements
def test_assign_op
Register.machine.space.get_main.add_local(:r , :Integer)
Parfait::Space.object_space.get_main.add_local(:r , :Integer)
@input = s(:statements, s(:assignment, s(:name, :r), s(:operator_value, :+, s(:int, 10), s(:int, 1))))
@ -15,7 +15,7 @@ class TestAssignStatement < MiniTest::Test
end
def test_assign_local
Register.machine.space.get_main.add_local(:r , :Integer)
Parfait::Space.object_space.get_main.add_local(:r , :Integer)
@input =s(:statements, s(:assignment, s(:name, :r), s(:int, 5)))
@expect = [Label, LoadConstant, SlotToReg, RegToSlot, Label, FunctionReturn]
@ -23,7 +23,7 @@ class TestAssignStatement < MiniTest::Test
end
def test_assign_local_assign
Register.machine.space.get_main.add_local(:r , :Integer)
Parfait::Space.object_space.get_main.add_local(:r , :Integer)
@input = s(:statements, s(:assignment, s(:name, :r), s(:int, 5)))
@ -32,7 +32,7 @@ class TestAssignStatement < MiniTest::Test
end
def test_assign_call
Register.machine.space.get_main.add_local(:r , :Integer)
Parfait::Space.object_space.get_main.add_local(:r , :Integer)
@input = s(:statements, s(:assignment, s(:name, :r), s(:call, s(:name, :main), s(:arguments))))
@expect = [Label, SlotToReg, SlotToReg, RegToSlot, LoadConstant, RegToSlot, LoadConstant ,
SlotToReg, SlotToReg, RegToSlot, LoadConstant, RegToSlot, RegisterTransfer, FunctionCall ,
@ -42,7 +42,7 @@ class TestAssignStatement < MiniTest::Test
end
def test_named_list_get
Register.machine.space.get_main.add_local(:r , :Integer)
Parfait::Space.object_space.get_main.add_local(:r , :Integer)
@input = s(:statements, s(:assignment, s(:name, :r), s(:int, 5)), s(:return, s(:name, :r)))
@expect = [Label, LoadConstant, SlotToReg, RegToSlot, SlotToReg, SlotToReg, RegToSlot ,
Label, FunctionReturn]
@ -53,7 +53,7 @@ class TestAssignStatement < MiniTest::Test
end
def test_assign_local_int
Register.machine.space.get_main.add_local(:r , :Integer)
Parfait::Space.object_space.get_main.add_local(:r , :Integer)
@input = s(:statements, s(:assignment, s(:name, :r), s(:int, 5)) )
@expect = [Label, LoadConstant, SlotToReg, RegToSlot, Label, FunctionReturn]
was = check
@ -63,14 +63,14 @@ class TestAssignStatement < MiniTest::Test
end
def test_misassign_local
Register.machine.space.get_main.add_local(:r , :Integer)
Parfait::Space.object_space.get_main.add_local(:r , :Integer)
@input = s(:statements, s(:assignment, s(:name, :r), s(:string, "5")) )
@expect = [Label, LoadConstant, SlotToReg, RegToSlot, Label, FunctionReturn]
assert_raises {check }
end
def test_assign_arg
Register.machine.space.get_main.add_argument(:blar , :Integer)
Parfait::Space.object_space.get_main.add_argument(:blar , :Integer)
@input = s(:statements, s(:assignment, s(:name, :blar), s(:int, 5)))
@expect = [Label, LoadConstant, SlotToReg, RegToSlot, Label, FunctionReturn]
was = check
@ -80,7 +80,7 @@ class TestAssignStatement < MiniTest::Test
end
def test_misassign_arg
Register.machine.space.get_main.add_argument(:blar , :Integer)
Parfait::Space.object_space.get_main.add_argument(:blar , :Integer)
@input = s(:statements, s(:assignment, s(:name, :blar), s(:string, "5")))
@expect = [Label, LoadConstant, SlotToReg, RegToSlot, Label, FunctionReturn]
assert_raises {check }
@ -88,7 +88,7 @@ class TestAssignStatement < MiniTest::Test
def test_arg_get
# have to define bar externally, just because redefining main. Otherwise that would be automatic
Register.machine.space.get_main.add_argument(:balr , :Integer)
Parfait::Space.object_space.get_main.add_argument(:balr , :Integer)
@input = s(:statements, s(:return, s(:name, :balr)))
@expect = [Label, SlotToReg, SlotToReg, RegToSlot, Label, FunctionReturn]
was = check

4
test/typed/statements/test_call.rb
View File

@ -25,7 +25,7 @@ class TestCallStatement < MiniTest::Test
end
def _test_call_local_int
Register.machine.space.get_main.add_local(:testi , :Integer)
Parfait::Space.object_space.get_main.add_local(:testi , :Integer)
clean_compile :Integer, :putint, {}, s(:statements, s(:return, s(:int, 1)))
@input = s(:statements, s(:assignment, s(:name, :testi), s(:int, 20)), s(:call, s(:name, :putint), s(:arguments), s(:receiver, s(:name, :testi))))
@ -37,7 +37,7 @@ class TestCallStatement < MiniTest::Test
end
def test_call_local_class
Register.machine.space.get_main.add_local(:test_l , :List)
Parfait::Space.object_space.get_main.add_local(:test_l , :List)
clean_compile :List, :add, {}, s(:statements, s(:return, s(:int, 1)))
@input =s(:statements, s(:call, s(:name, :add), s(:arguments), s(:receiver, s(:name, :test_l))))

6
test/typed/statements/test_fields.rb
View File

@ -6,7 +6,7 @@ module Register
include Statements
def test_field_named_list
Register.machine.space.get_main.add_local( :m , :Message)
Parfait::Space.object_space.get_main.add_local( :m , :Message)
@input = s(:statements, s(:return, s(:field_access,
s(:receiver, s(:name, :m)), s(:field, s(:name, :name)))))
@expect = [Label, SlotToReg, SlotToReg, SlotToReg, RegToSlot, Label, FunctionReturn]
@ -14,7 +14,7 @@ module Register
end
def test_field_arg
Register.machine.space.get_main.add_local( :m , :Message)
Parfait::Space.object_space.get_main.add_local( :m , :Message)
clean_compile :Space, :get_name, { :main => :Message},
s(:statements, s(:return, s(:field_access,
s(:receiver, s(:name, :main)), s(:field, s(:name, :name)))))
@ -28,7 +28,7 @@ module Register
end
def test_message_field
Register.machine.space.get_main.add_local(:name , :Word)
Parfait::Space.object_space.get_main.add_local(:name , :Word)
@input = s(:statements, s(:assignment, s(:name, :name), s(:field_access, s(:receiver, s(:name, :message)), s(:field, s(:name, :name)))), s(:return, s(:name, :name)))
@expect = [Label, RegisterTransfer, SlotToReg, SlotToReg, RegToSlot, SlotToReg, SlotToReg ,

6
test/typed/statements/test_return.rb
View File

@ -11,14 +11,14 @@ class TestReturnStatement < MiniTest::Test
end
def test_return_local
Register.machine.space.get_main.add_local(:runner , :Integer)
Parfait::Space.object_space.get_main.add_local(:runner , :Integer)
@input = s(:statements, s(:return, s(:name, :runner)))
@expect = [Label, SlotToReg,SlotToReg ,RegToSlot,Label,FunctionReturn]
check
end
def test_return_local_assign
Register.machine.space.get_main.add_local(:runner , :Integer)
Parfait::Space.object_space.get_main.add_local(:runner , :Integer)
@input = s(:statements, s(:assignment, s(:name, :runner), s(:int, 5)), s(:return, s(:name, :runner)))
@expect = [Label, LoadConstant,SlotToReg,RegToSlot,SlotToReg,SlotToReg ,RegToSlot,
Label,FunctionReturn]
@ -34,7 +34,7 @@ class TestReturnStatement < MiniTest::Test
end
def pest_return_space_length # need to add runtime first
Register.machine.space.get_main.add_local(:l , :Type)
Parfait::Space.object_space.get_main.add_local(:l , :Type)
@input = s(:statements, s(:assignment, s(:name, :l), s(:call, s(:name, :get_type), s(:arguments), s(:receiver, s(:name, :space)))), s(:return, s(:field_access, s(:receiver, s(:name, :self)), s(:field, s(:name, :runner)))))
@expect = [Label, SlotToReg,SlotToReg ,RegToSlot,Label,FunctionReturn]
check

4
test/typed/statements/test_while.rb
View File

@ -14,7 +14,7 @@ module Register
end
def test_while_assign
Register.machine.space.get_main.add_local(:n , :Integer)
Parfait::Space.object_space.get_main.add_local(:n , :Integer)
@input = s(:statements, s(:assignment, s(:name, :n), s(:int, 5)), s(:while_statement, :plus, s(:conditional, s(:name, :n)), s(:statements, s(:assignment, s(:name, :n), s(:operator_value, :-, s(:name, :n), s(:int, 1))))), s(:return, s(:name, :n)))
@ -26,7 +26,7 @@ module Register
def test_while_return
Register.machine.space.get_main.add_local(:n , :Integer)
Parfait::Space.object_space.get_main.add_local(:n , :Integer)
@input = s(:statements, s(:assignment, s(:name, :n), s(:int, 10)), s(:while_statement, :plus, s(:conditional, s(:operator_value, :-, s(:name, :n), s(:int, 5))), s(:statements, s(:assignment, s(:name, :n), s(:operator_value, :+, s(:name, :n), s(:int, 1))), s(:return, s(:name, :n)))))

6
test/typed/type/test_basic.rb
View File

@ -3,7 +3,9 @@ require_relative "../helper"
class BasicType < MiniTest::Test
def setup
@mess = Register.machine.boot.space.first_message
Register.machine.boot
@space = Parfait::Space.object_space
@mess = @space.first_message
assert @mess
@type = @mess.get_type()
end
@ -36,7 +38,7 @@ class BasicType < MiniTest::Test
def test_type_length_index
type = @mess.get_type.get_type
assert_equal 5 , type.variable_index(:instance_methods)
assert_equal 5 , type.variable_index(:methods)
assert_equal type.object_class , type.get_internal_word(4)
end

4
test/typed/type/test_hash.rb
View File

@ -3,7 +3,9 @@ require_relative "../helper"
class TypeHash < MiniTest::Test
def setup
@types = Register.machine.boot.space.types
Register.machine.boot
@space = Parfait::Space.object_space
@types = @space.types
@first = @types.values.first
end

4
test/typed/type/test_message.rb
View File

@ -3,7 +3,9 @@ require_relative "../helper"
class TypeMessages < MiniTest::Test
def setup
@mess = Register.machine.boot.space.first_message
Register.machine.boot
@space = Parfait::Space.object_space
@mess = @space.first_message
end
def test_message_type

3
test/typed/type/test_method_api.rb
View File

@ -3,7 +3,8 @@ require_relative "../helper"
class TestMethodApi < MiniTest::Test
def setup
@space = Register.machine.boot.space
Register.machine.boot
@space = Parfait::Space.object_space
@try_class = @space.create_class( :Try )
@try_type = @try_class.instance_type
end

8
test/typed/type/test_type_api.rb
View File

@ -3,7 +3,9 @@ require_relative "../helper"
class TypeApi < MiniTest::Test
def setup
tc = Register.machine.boot.space.get_class_by_name( :Type )
Register.machine.boot
@space = Parfait::Space.object_space
tc = @space.get_class_by_name( :Type )
@type = Parfait::Type.new tc
end
@ -12,7 +14,7 @@ class TypeApi < MiniTest::Test
end
def test_class_type
oc = Register.machine.boot.space.get_class_by_name( :Object )
oc = @space.get_class_by_name( :Object )
assert_equal Parfait::Class , oc.class
type = oc.instance_type
assert_equal Parfait::Type , type.class
@ -21,7 +23,7 @@ class TypeApi < MiniTest::Test
end
def test_class_space
space = Register.machine.space
space = Parfait::Space.object_space
assert_equal Parfait::Space , space.class
type = space.get_type
assert_equal Parfait::Type , type.class