fix the boot

was broken for unknown reason really

lib/virtual/boot.rb

@@ -80,7 +80,7 @@ module Virtual
 
 #      add_object @space
 
-      values.each {|v| v.init_layout }
+      class_mappings.values.each {|v| v.init_layout }
 
       # now update the layout on all objects created so far,
       # go through objects in space

lib/virtual/machine.rb

@@ -36,7 +36,7 @@ module Virtual
 
     FIRST_PASS = "Virtual::SendImplementation"
     LAST_PASS = "Virtual::SetOptimisation"
-    
+
     def initialize
       @parser  = Parser::Salama.new
       @passes = [  FIRST_PASS ]
@@ -114,20 +114,13 @@ module Virtual
       @passes.insert(index , pass)
     end
 
-    def self.boot
-      me = Virtual.machine
-      # boot is a verb here. this is a somewhat tricky process which is in it's own file, boot.rb
-      raise "already booted" if @booted
-      me.boot
-      me
-    end
-
     def boot
-      return if @booted
+      return self if @booted
       boot_parfait!
       @init = Block.new("init",nil)
       @init.add_code Virtual::VirtualMain.new( self.space.get_init )
       @booted = true
+      self
     end
 
     def compile_main bytes

test/virtual/virtual_helper.rb

@@ -11,12 +11,11 @@ end
 module VirtualHelper
   # need a code generator, for arm
   def setup
-#    @object_space = Boot::Space.new "Arm"
+    @machine = Virtual.machine.boot
   end
 
   def check
-    machine = Virtual::Machine.boot
+    expressions = @machine.compile_main @string_input
-    expressions = machine.compile_main @string_input
     if( expressions.first.is_a? Parfait::Method )
       # stops the whole objectspace beeing tested
       # with the class comes superclass and all methods