From 7f06e00ccd67fe1be9a7ab9b31c9a00e1dfb5cd2 Mon Sep 17 00:00:00 2001
From: Torsten Ruger <torsten@villataika.fi>
Date: Fri, 30 Dec 2016 20:47:28 +0200
Subject: [PATCH] making types private in space

turned out to be unnecessary, but still better
---
 lib/typed/parfait/space.rb       | 16 +++++++++++++++-
 lib/typed/parfait/type.rb        |  7 +------
 test/typed/parfait/test_space.rb | 11 ++++++++++-
 test/typed/type/test_hash.rb     | 10 +++++-----
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/lib/typed/parfait/space.rb b/lib/typed/parfait/space.rb
index a45ad3ae..4f5c7c4b 100644
--- a/lib/typed/parfait/space.rb
+++ b/lib/typed/parfait/space.rb
@@ -42,6 +42,8 @@ module Parfait
         message = @first_message
       end
       @classes.each do |name , cl|
+        raise "upps #{cl.instance_type.hash}" unless cl.instance_type.hash.is_a?(Fixnum)
+
         @types[cl.instance_type.hash] = cl.instance_type
       end
     end
@@ -50,7 +52,7 @@ module Parfait
       [:classes , :types, :first_message]
     end
 
-    attr_reader :types , :classes , :first_message
+    attr_reader  :classes , :first_message
 
     def each_type
       @types.values.each do |type|
@@ -58,6 +60,18 @@ module Parfait
       end
     end
 
+    def add_type(type)
+      hash = type.hash
+      raise "upps #{hash}" unless hash.is_a?(Fixnum)
+      was = @types[hash]
+      return was if was
+      @types[hash] = type
+    end
+
+    def get_type_for( hash )
+      @types[hash]
+    end
+
     # all methods form all types
     def collect_methods
       methods = []
diff --git a/lib/typed/parfait/type.rb b/lib/typed/parfait/type.rb
index 2f8e5d09..8f4b48fe 100644
--- a/lib/typed/parfait/type.rb
+++ b/lib/typed/parfait/type.rb
@@ -42,9 +42,7 @@ module Parfait
     def self.for_hash( object_class , hash)
       hash = {type: object_class.name }.merge(hash) unless hash[:type]
       new_type = Type.new( object_class , hash)
-      code = hash_code_for_hash( hash )
-      Parfait.object_space.types[code] = new_type
-      new_type
+      Parfait.object_space.add_type(new_type)
     end
 
     def self.hash_code_for_hash( dict )
@@ -152,9 +150,6 @@ module Parfait
       raise "No nil type" unless type
       hash = to_hash
       hash[name] = type
-      code = Type.hash_code_for_hash( hash )
-      existing = Parfait.object_space.types[code]
-      return existing if existing
       return Type.for_hash( @object_class , hash)
     end
 
diff --git a/test/typed/parfait/test_space.rb b/test/typed/parfait/test_space.rb
index 3381f668..57289bfc 100644
--- a/test/typed/parfait/test_space.rb
+++ b/test/typed/parfait/test_space.rb
@@ -6,6 +6,7 @@ class TestSpace < MiniTest::Test
     @machine = Register.machine.boot
     @space = Parfait.object_space
   end
+
   def classes
     [:Kernel,:Word,:List,:Message,:NamedList,:Type,:Object,:Class,:Dictionary,:TypedMethod , :Integer]
   end
@@ -16,6 +17,7 @@ class TestSpace < MiniTest::Test
   def test_global_space
     assert_equal Parfait::Space , Parfait.object_space.class
   end
+
   def test_integer
     int = Parfait.object_space.get_class_by_name :Integer
     assert_equal 3, int.instance_type.method_names.get_length
@@ -29,7 +31,7 @@ class TestSpace < MiniTest::Test
   end
 
   def test_types
-    assert  @space.types.is_a? Parfait::Dictionary
+    assert  @space.instance_variable_get("@types").is_a? Parfait::Dictionary
   end
 
   def test_types_each
@@ -38,6 +40,13 @@ class TestSpace < MiniTest::Test
     end
   end
 
+  def test_types_hashes
+    types = @space.instance_variable_get("@types")
+    types.each do |has , type|
+      assert has.is_a?(Fixnum) , has.inspect
+    end
+  end
+
   def test_classes_type
     classes.each do |name|
       assert_equal Parfait::Type , @space.classes[name].get_type.class
diff --git a/test/typed/type/test_hash.rb b/test/typed/type/test_hash.rb
index dcd2fb0a..92e01791 100644
--- a/test/typed/type/test_hash.rb
+++ b/test/typed/type/test_hash.rb
@@ -5,7 +5,7 @@ class TypeHash < MiniTest::Test
   def setup
     Register.machine.boot
     @space = Parfait.object_space
-    @types = @space.types
+    @types = @space.instance_variable_get("@types")
     @first = @types.values.first
   end
 
@@ -14,7 +14,7 @@ class TypeHash < MiniTest::Test
   end
 
   def test_length
-    assert @types.length > 16
+    assert @types.length > 11
   end
 
   def test_two_hashs_not_equal
@@ -22,12 +22,12 @@ class TypeHash < MiniTest::Test
   end
 
   def test_name
-    assert_equal "Word_Type" , @types.values.first.name
+    assert_equal "BinaryCode_Type" , @types.values.first.name
   end
 
   def test_to_hash
-    assert_equal "Word_Type" ,  @first.name
-    assert_equal :Word ,  @first.object_class.name
+    assert_equal "BinaryCode_Type" ,  @first.name
+    assert_equal :BinaryCode ,  @first.object_class.name
     hash = @first.to_hash
     assert_equal :Type , @first.types.first
     assert_equal hash[:type] , :Type