From 06cfbdf066e7fbbd67f794635d356c33ab89a077 Mon Sep 17 00:00:00 2001
From: Torsten Ruger <torsten@villataika.fi>
Date: Sun, 1 Jan 2017 21:50:54 +0200
Subject: [PATCH] minor

---
 lib/melon/compiler.rb                      |  3 ++-
 test/melon/compiler/test_type_collector.rb |  3 ++-
 test/melon/test_compiler.rb                | 12 +++++++-----
 test/register/test_collector.rb            |  6 ------
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/lib/melon/compiler.rb b/lib/melon/compiler.rb
index 28f6b470..2bd1722d 100644
--- a/lib/melon/compiler.rb
+++ b/lib/melon/compiler.rb
@@ -21,7 +21,8 @@ module Melon
 
     def on_class statement
       name , sup , body = *statement
-      clazz = Parfait.object_space.create_class(get_name(name) , get_name(sup) )
+      class_name = get_name(name)
+      clazz = Parfait.object_space.create_class(class_name , get_name(sup) )
       ivar_hash = TypeCollector.new.collect(body)
       clazz.set_instance_type( Parfait::Type.for_hash( clazz ,  ivar_hash ) )
 
diff --git a/test/melon/compiler/test_type_collector.rb b/test/melon/compiler/test_type_collector.rb
index 3a56f877..9cb73d01 100644
--- a/test/melon/compiler/test_type_collector.rb
+++ b/test/melon/compiler/test_type_collector.rb
@@ -4,7 +4,7 @@ module Melon
   class TestTypeCollector < MiniTest::Test
 
     def setup
-      Register.machine.boot unless Register.machine.booted
+      Register.machine.boot
     end
 
     def parse_collect( input )
@@ -30,6 +30,7 @@ module Melon
     def test_compile_class
       Compiler.compile  "class TestIvar < Object ; def meth; @ivar;end; end"
       itest = Parfait.object_space.get_class_by_name(:TestIvar)
+      assert itest
       assert itest.instance_type.names.include?(:ivar) , itest.instance_type.names.inspect
     end
 
diff --git a/test/melon/test_compiler.rb b/test/melon/test_compiler.rb
index e8edcd8c..ea5fb6ad 100644
--- a/test/melon/test_compiler.rb
+++ b/test/melon/test_compiler.rb
@@ -4,19 +4,21 @@ module Melon
   class TestClass < MiniTest::Test
 
     def setup
-      Register.machine.boot unless Register.machine.booted
+      Register.machine.boot
     end
 
     def test_creates_class_without_deriviation
       Compiler.compile "class Testing ; end"
-      assert t = Parfait.object_space.get_class_by_name(:Testing) , "No classes created"
-      assert_equal :Object , t.super_class_name
+      clazz = Parfait.object_space.get_class_by_name(:Testing)
+      assert clazz , "No classes created"
+      assert_equal :Object , clazz.super_class_name
     end
 
     def test_creates_class_with_deriviation
       Compiler.compile  "class Test2 < List ;end"
-      assert t = Parfait.object_space.get_class_by_name(:Test2) , "No classes created"
-      assert_equal :List , t.super_class_name
+      clazz = Parfait.object_space.get_class_by_name(:Test2)
+      assert clazz, "No classes created"
+      assert_equal :List , clazz.super_class_name
     end
 
   end
diff --git a/test/register/test_collector.rb b/test/register/test_collector.rb
index 165ae834..44217254 100644
--- a/test/register/test_collector.rb
+++ b/test/register/test_collector.rb
@@ -2,12 +2,6 @@ require_relative "../helper"
 
 module Register
   class TestCollector < MiniTest::Test
-
-    def test_collect_raises
-      Parfait.set_object_space( BootSpace.new )
-      assert_raises {Register::Collector.collect_space}
-    end
-
     def test_simple_collect
       Machine.new.boot
       objects = Register::Collector.collect_space