From 05a7ded7d525402c2257fdaf353322d34ca1a7fb Mon Sep 17 00:00:00 2001
From: Torsten Ruger <torsten@villataika.fi>
Date: Sun, 24 May 2015 15:06:35 +0300
Subject: [PATCH] fix space layout and init

---
 lib/parfait/space.rb | 2 +-
 lib/virtual/boot.rb  | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/parfait/space.rb b/lib/parfait/space.rb
index 9715c945..36667b0b 100644
--- a/lib/parfait/space.rb
+++ b/lib/parfait/space.rb
@@ -32,7 +32,7 @@ module Parfait
       #global objects (data)
       @objects = Parfait::List.new_object
     end
-    attr_reader :classes , :objects , :symbols, :messages, :next_message , :next_frame
+    attr_reader :classes , :objects , :frames, :messages, :next_message , :next_frame
 
     # need a two phase init for the object space (and generally parfait) because the space
     # is an interconnected graph, so not everthing is ready
diff --git a/lib/virtual/boot.rb b/lib/virtual/boot.rb
index 4b232345..69ff8774 100644
--- a/lib/virtual/boot.rb
+++ b/lib/virtual/boot.rb
@@ -25,7 +25,9 @@ module Virtual
       value_classes = values.collect { |cl| @space.create_class(cl,nil) }
       layouts = { "Word" => [] ,
                   "List" => [] ,
-                  "Space" => ["classes","objects"],
+                  "Message" => [],
+                  "Space" => ["classes","objects","frames","messages","next_message","next_frame"],
+                  "Frame" => ["locals" , "tmps" ],
                   "Layout" => ["object_class"] ,
                   "Class" => ["object_layout"],
                   "Dictionary" => ["keys" , "values"] ,
@@ -63,7 +65,10 @@ module Virtual
         o.init_layout
       end
       # and go through the space instance variables which get created before the object list
-
+      @space.init_layout
+      @space.classes.init_layout
+      @space.objects.init_layout
+      @space.late_init
       boot_functions!
     end