From 06b5d24729413461cfdfd5fbc57a4792e2d4a496 Mon Sep 17 00:00:00 2001
From: Torsten Ruger <torsten@villataika.fi>
Date: Mon, 29 Jun 2015 10:53:27 +0300
Subject: [PATCH] fixing require order

so Register stuff is defined when builtin is loaded
---
 lib/parfait/space.rb | 2 --
 lib/salama.rb        | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/parfait/space.rb b/lib/parfait/space.rb
index 256b4b78..eb709f7c 100644
--- a/lib/parfait/space.rb
+++ b/lib/parfait/space.rb
@@ -8,8 +8,6 @@
 # "New" is slightly misleading in that normal operation only ever
 # recycles objects.
 
-require "register/builtin/object"
-
 module Parfait
   # The Space contains all objects for a program. In functional terms it is a program, but in oo
   # it is a collection of objects, some of which are data, some classes, some functions
diff --git a/lib/salama.rb b/lib/salama.rb
index 13465f54..4998198f 100644
--- a/lib/salama.rb
+++ b/lib/salama.rb
@@ -7,4 +7,5 @@ require 'parser/transform'
 require "salama-object-file"
 require "virtual"
 require "register/register_machine"
+require "register/builtin/object"
 require "arm/arm_machine"