From 0c08c335e520a345a2817afd263037e3f738ac89 Mon Sep 17 00:00:00 2001 From: Torsten Ruger Date: Wed, 25 Mar 2015 18:30:47 +0200 Subject: [PATCH] fix the conditional parfait --- lib/salama.rb | 4 +++- lib/virtual/boot_space.rb | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/salama.rb b/lib/salama.rb index aa0406a3..5b6ae7a8 100644 --- a/lib/salama.rb +++ b/lib/salama.rb @@ -1,6 +1,8 @@ require 'parslet' -require_relative "parfait/hash" +module Parfait + eval(File.open("./lib/parfait/hash.rb").read) +end require "elf/object_writer" require 'salama-reader' diff --git a/lib/virtual/boot_space.rb b/lib/virtual/boot_space.rb index e2822e3f..a04f8072 100644 --- a/lib/virtual/boot_space.rb +++ b/lib/virtual/boot_space.rb @@ -1,6 +1,5 @@ require_relative "boot_class" require "builtin/object" -require "parfait/hash" module Virtual # The BootSpace contains all objects for a program. In functional terms it is a program, but in oo