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

Move the space instance to the parfait module

Browse Source 
A better fit, maybe even a pattern for singletons
This commit is contained in:
Torsten Ruger
2016-12-30 14:10:49 +02:00
parent a00f6be3ba
commit f0350601a7
43 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/melon/compiler/test_type_collector.rb
View File

@ -29,7 +29,7 @@ module Melon
def test_compile_class
Compiler.compile "class TestIvar < Object ; def meth; @ivar;end; end"
itest = Parfait::Space.object_space.get_class_by_name(:TestIvar)
itest = Parfait.object_space.get_class_by_name(:TestIvar)
assert itest.instance_type.names.include?(:ivar) , itest.instance_type.names.inspect
end

4
test/melon/test_compiler.rb
View File

@ -9,13 +9,13 @@ module Melon
def test_creates_class_without_deriviation
Compiler.compile "class Testing ; end"
assert t = Parfait::Space.object_space.get_class_by_name(:Testing) , "No classes created"
assert t = Parfait.object_space.get_class_by_name(:Testing) , "No classes created"
assert_equal :Object , t.super_class_name
end
def test_creates_class_with_deriviation
Compiler.compile "class Test2 < List ;end"
assert t = Parfait::Space.object_space.get_class_by_name(:Test2) , "No classes created"
assert t = Parfait.object_space.get_class_by_name(:Test2) , "No classes created"
assert_equal :List , t.super_class_name
end

2
test/register/test_positioning.rb
View File

@ -17,7 +17,7 @@ class TestPositioning < MiniTest::Test
assert_equal 32 , list.padded_length
end
def test_type
type = Parfait::Type.new Parfait::Space.object_space.get_class_by_name(:Object)
type = Parfait::Type.new Parfait.object_space.get_class_by_name(:Object)
type.set_type( type )
assert_equal 32 , type.padded_length
end

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 Parfait::Space.object_space.get_main
compiler = Typed::MethodCompiler.new Parfait.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 = Parfait::Space.object_space.get_class_by_name(:Space).instance_type
class_type = Parfait.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
Parfait::Space.object_space.get_main.add_argument(:blar , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_argument(:blar , :Word)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:bar , :Integer)
Parfait::Space.object_space.get_main.add_argument(:blar , :Integer)
Parfait.object_space.get_main.add_local(:bar , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:bar , :Integer)
Parfait.object_space.get_main.add_local(:bar , :Integer)
@input = s(:operator_value, :+, s(:name, :bar), s(:int, 3))
check
end
def test_int_local
Parfait::Space.object_space.get_main.add_local(:bar , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:bar , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_argument(:bar , :Integer)
Parfait.object_space.get_main.add_argument(:bar , :Integer)
@input = s(:name, :bar)
@output = Register::RegisterValue
check

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

@ -4,7 +4,7 @@ class TestAttributes < MiniTest::Test
def setup
Register.machine.boot
@space = Parfait::Space.object_space
@space = Parfait.object_space
@mess = @space.first_message
@type = @mess.get_type
end

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

@ -4,7 +4,7 @@ class TestClass < MiniTest::Test
def setup
Register.machine.boot
@space = Parfait::Space.object_space
@space = Parfait.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 , Parfait::Space.object_space.classes.keys.get_type.class
assert_equal Parfait::Type , Parfait.object_space.classes.keys.get_type.class
end
def test_old_type_push
list = Parfait::Space.object_space.classes.keys
list = Parfait.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 = Parfait::Space.object_space.classes.keys.get_type
type = Parfait.object_space.classes.keys.get_type
assert_equal 1 , type.variable_index(:type)
end

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

@ -4,7 +4,7 @@ class TestMessage < MiniTest::Test
def setup
Register.machine.boot
@space = Parfait::Space.object_space
@space = Parfait.object_space
@mess = @space.first_message
end

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

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

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

@ -4,7 +4,7 @@ class TestSpace < MiniTest::Test
def setup
@machine = Register.machine.boot
@space = Parfait::Space.object_space
@space = Parfait.object_space
end
def classes
[:Kernel,:Word,:List,:Message,:NamedList,:Type,:Object,:Class,:Dictionary,:TypedMethod , :Integer]
@ -14,10 +14,10 @@ class TestSpace < MiniTest::Test
end
def test_global_space
assert_equal Parfait::Space , Parfait::Space.object_space.class
assert_equal Parfait::Space , Parfait.object_space.class
end
def test_integer
int = Parfait::Space.object_space.get_class_by_name :Integer
int = Parfait.object_space.get_class_by_name :Integer
assert_equal 3, int.instance_type.method_names.get_length
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 = Parfait::Space.object_space.get_class_by_name(:Object).instance_type
obj = Parfait.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 = Parfait::Space.object_space.get_main.instructions
produced = Parfait.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
Parfait::Space.object_space.get_main.add_local(:r , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:r , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:r , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:r , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:r , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:r , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:r , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_argument(:blar , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_argument(:blar , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_argument(:balr , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:testi , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:test_l , :List)
Parfait.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
Parfait::Space.object_space.get_main.add_local( :m , :Message)
Parfait.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
Parfait::Space.object_space.get_main.add_local( :m , :Message)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:name , :Word)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:runner , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:runner , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:l , :Type)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:n , :Integer)
Parfait.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
Parfait::Space.object_space.get_main.add_local(:n , :Integer)
Parfait.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)))))

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

@ -4,7 +4,7 @@ class BasicType < MiniTest::Test
def setup
Register.machine.boot
@space = Parfait::Space.object_space
@space = Parfait.object_space
@mess = @space.first_message
assert @mess
@type = @mess.get_type()

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

@ -4,7 +4,7 @@ class TypeHash < MiniTest::Test
def setup
Register.machine.boot
@space = Parfait::Space.object_space
@space = Parfait.object_space
@types = @space.types
@first = @types.values.first
end

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

@ -4,7 +4,7 @@ class TypeMessages < MiniTest::Test
def setup
Register.machine.boot
@space = Parfait::Space.object_space
@space = Parfait.object_space
@mess = @space.first_message
end

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

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

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

@ -4,7 +4,7 @@ class TypeApi < MiniTest::Test
def setup
Register.machine.boot
@space = Parfait::Space.object_space
@space = Parfait.object_space
tc = @space.get_class_by_name( :Type )
@type = Parfait::Type.new tc
end
@ -23,7 +23,7 @@ class TypeApi < MiniTest::Test
end
def test_class_space
space = Parfait::Space.object_space
space = Parfait.object_space
assert_equal Parfait::Space , space.class
type = space.get_type
assert_equal Parfait::Type , type.class