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

correctly jumping to __init and then calling main

Browse Source
This commit is contained in:
Torsten Ruger 2014-10-07 15:35:13 +03:00
parent 30a982be0e
commit f09a70a65b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/virtual/boot_space.rb
View File

@ -17,7 +17,6 @@ module Virtual
def initialize def initialize
super() super()
@classes = Parfait::Hash.new @classes = Parfait::Hash.new
@main = Virtual::CompiledMethod.main
#global objects (data) #global objects (data)
@objects = [] @objects = []
@symbols = [] @symbols = []
@ -76,8 +75,6 @@ module Virtual
# CompiledMethods are grabbed from respective modules by sending the method name. This should return the # CompiledMethods are grabbed from respective modules by sending the method name. This should return the
# implementation of the method (ie a method object), not actually try to implement it (as that's impossible in ruby) # implementation of the method (ie a method object), not actually try to implement it (as that's impossible in ruby)
def boot_classes! def boot_classes!
@init = Virtual::Block.new(:_init_ , nil )
@init.add_code(Register::RegisterMain.new(@main))
# very fiddly chicken 'n egg problem. Functions need to be in the right order, and in fact we have to define some # very fiddly chicken 'n egg problem. Functions need to be in the right order, and in fact we have to define some
# dummies, just for the other to compile # dummies, just for the other to compile
obj = get_or_create_class :Object obj = get_or_create_class :Object
@ -85,9 +82,18 @@ module Virtual
obj.add_instance_method Builtin::Object.send(f , @context) obj.add_instance_method Builtin::Object.send(f , @context)
end end
obj = get_or_create_class :Kernel obj = get_or_create_class :Kernel
[:main , :__init__,:putstring,:exit,:__send].each do |f| # create main first, __init__ calls it
@main = Builtin::Kernel.send(:main , @context)
obj.add_instance_method @main
underscore_init = Builtin::Kernel.send(:__init__ , @context) #store , so we don't have to resolve it below
obj.add_instance_method underscore_init
[:putstring,:exit,:__send].each do |f|
obj.add_instance_method Builtin::Kernel.send(f , @context) obj.add_instance_method Builtin::Kernel.send(f , @context)
end end
# and the @init block in turn _jumps_ to __init__
# the point of which is that by the time main executes, all is "normal"
@init = Virtual::Block.new(:_init_ , nil )
@init.add_code(Register::RegisterMain.new(underscore_init))
obj = get_or_create_class :Integer obj = get_or_create_class :Integer
[:putint,:fibo].each do |f| [:putint,:fibo].each do |f|
obj.add_instance_method Builtin::Integer.send(f , @context) obj.add_instance_method Builtin::Integer.send(f , @context)