remove to_mom from ruby_to_vool

must have slipped in
affects mosty tests
This commit is contained in:
Torsten Ruger 2018-06-29 14:57:48 +03:00
parent 6bd01fd55f
commit 5036dd68df
3 changed files with 25 additions and 16 deletions

View File

@ -4,15 +4,15 @@ module Vool
class VoolCompiler class VoolCompiler
def self.ruby_to_vool( ruby_source ) def self.ruby_to_vool( ruby_source )
statements = RubyCompiler.compile( ruby_source ) vool = RubyCompiler.compile( ruby_source )
statements = statements.normalize vool = vool.normalize
statements.to_mom(nil) vool
statements
end end
def self.ruby_to_binary(source , platform = :arm) def self.ruby_to_binary(source , platform = :arm)
machine = Risc.machine.boot machine = Risc.machine.boot
self.ruby_to_vool(source) vool = self.ruby_to_vool(source)
vool.to_mom(nil)
machine.translate(platform) machine.translate(platform)
machine.position_all machine.position_all
machine.create_binary machine.create_binary

View File

@ -9,7 +9,8 @@ module Vool
end end
def create_method def create_method
VoolCompiler.ruby_to_vool in_Test("def meth; @ivar = 5;end") vool = VoolCompiler.ruby_to_vool in_Test("def meth; @ivar = 5;end")
vool.to_mom(nil)
test = Parfait.object_space.get_class_by_name(:Test) test = Parfait.object_space.get_class_by_name(:Test)
test.get_method(:meth) test.get_method(:meth)
end end
@ -41,17 +42,20 @@ module Vool
end end
def test_method_statement_has_class def test_method_statement_has_class
clazz = VoolCompiler.ruby_to_vool in_Test("def meth; @ivar = 5;end") vool = VoolCompiler.ruby_to_vool in_Test("def meth; @ivar = 5;end")
assert clazz.body.clazz clazz = vool.to_mom(nil)
assert vool.body.clazz
end end
def test_parfait_class_creation def test_parfait_class_creation
clazz = VoolCompiler.ruby_to_vool in_Test("def meth; @ivar = 5;end") vool = VoolCompiler.ruby_to_vool in_Test("def meth; @ivar = 5;end")
assert_equal Parfait::Class , clazz.body.clazz.class clazz = vool.to_mom(nil)
assert_equal Parfait::Class , vool.body.clazz.class
end end
def test_typed_method_instance_type def test_typed_method_instance_type
VoolCompiler.ruby_to_vool in_Test("def meth; @ivar = 5; @ibar = 4;end") vool = VoolCompiler.ruby_to_vool in_Test("def meth; @ivar = 5; @ibar = 4;end")
vool.to_mom(nil)
test = Parfait.object_space.get_class_by_name(:Test) test = Parfait.object_space.get_class_by_name(:Test)
method = test.instance_type.get_method(:meth) method = test.instance_type.get_method(:meth)
assert_equal 1, method.for_type.variable_index(:ivar) assert_equal 1, method.for_type.variable_index(:ivar)
@ -59,7 +63,8 @@ module Vool
end end
def test_vool_method_has_one_local def test_vool_method_has_one_local
VoolCompiler.ruby_to_vool in_Test("def meth; local = 5 ; a = 6;end") vool = VoolCompiler.ruby_to_vool in_Test("def meth; local = 5 ; a = 6;end")
vool.to_mom(nil)
test = Parfait.object_space.get_class_by_name(:Test) test = Parfait.object_space.get_class_by_name(:Test)
method = test.get_method(:meth) method = test.get_method(:meth)
assert_equal 3 , method.frame_type.instance_length assert_equal 3 , method.frame_type.instance_length
@ -68,7 +73,8 @@ module Vool
end end
def test_typed_method_has_one_local def test_typed_method_has_one_local
VoolCompiler.ruby_to_vool in_Test("def meth; local = 5 ; a = 6;end") vool = VoolCompiler.ruby_to_vool in_Test("def meth; local = 5 ; a = 6;end")
vool.to_mom(nil)
test = Parfait.object_space.get_class_by_name(:Test) test = Parfait.object_space.get_class_by_name(:Test)
method = test.instance_type.get_method(:meth) method = test.instance_type.get_method(:meth)
assert_equal 3 , method.frame_type.instance_length assert_equal 3 , method.frame_type.instance_length

View File

@ -9,7 +9,8 @@ module Vool
end end
def compile_in_test input def compile_in_test input
VoolCompiler.ruby_to_vool in_Test(input) vool = VoolCompiler.ruby_to_vool in_Test(input)
vool.to_mom(nil)
itest = Parfait.object_space.get_class_by_name(:Test) itest = Parfait.object_space.get_class_by_name(:Test)
assert itest assert itest
itest itest
@ -38,14 +39,16 @@ module Vool
end end
def test_creates_class_without_deriviation def test_creates_class_without_deriviation
VoolCompiler.ruby_to_vool "class Testing ; end" vool = VoolCompiler.ruby_to_vool "class Testing ; end"
vool.to_mom(nil)
clazz = Parfait.object_space.get_class_by_name(:Testing) clazz = Parfait.object_space.get_class_by_name(:Testing)
assert clazz , "No classes created" assert clazz , "No classes created"
assert_equal :Object , clazz.super_class_name assert_equal :Object , clazz.super_class_name
end end
def test_creates_class_with_deriviation def test_creates_class_with_deriviation
VoolCompiler.ruby_to_vool "class Test2 < List ;end" vool = VoolCompiler.ruby_to_vool "class Test2 < List ;end"
vool.to_mom(nil)
clazz = Parfait.object_space.get_class_by_name(:Test2) clazz = Parfait.object_space.get_class_by_name(:Test2)
assert clazz, "No classes created" assert clazz, "No classes created"
assert_equal :List , clazz.super_class_name assert_equal :List , clazz.super_class_name