Introduce singleton types

Just for future, as this gives us a way to know immediately in the type, which represent normal, and which singleton classes
Also instantiate singleton class lazily (with singleton type)
This makes the type of class single, ie unique, immediately when it is used, ie methods or variables defined.
Fixes a design mistake, where all singletonn classes shared the same type, and thus unique methods per class were impossible
(Also some misc in commit)

lib/mom/method_compiler.rb

@@ -69,7 +69,7 @@ module Mom
         return ["arg#{index}".to_sym]
       end
       index = @callable.frame_type.variable_index(name)
-      raise "no such local or argument #{name}" unless index
+      raise "no such local or argument #{name} for #{callable.name}:#{callable.frame_type.hash}" unless index
       return ["local#{index}".to_sym]
     end
 

lib/parfait/class.rb

@@ -17,7 +17,7 @@
 module Parfait
   class Class < Behaviour
 
-    attr_reader :name , :super_class_name , :single_class
+    attr_reader :name , :super_class_name
 
     def self.type_length
       6
@@ -30,7 +30,11 @@ module Parfait
       super(instance_type)
       @name = name
       @super_class_name = superclass
-      @single_class = SingletonClass.new( self , self.type || @name)
+    end
+
+    def single_class
+      return @single_class if @single_class
+      @single_class = SingletonClass.new( self )
     end
 
     def rxf_reference_name

lib/parfait/singleton_class.rb

@@ -25,16 +25,21 @@ module Parfait
       8
     end
 
-    def initialize( clazz , clazz_type)
-      raise "No type for #{clazz.name}" unless clazz_type
-      super( clazz_type )
+    def initialize( clazz )
+      clazz_hash = clazz.type.to_hash
       @clazz = clazz
+      super( Type.for_hash(clazz_hash , self , 1) )
+      @clazz.set_type( @instance_type )
     end
 
     def rxf_reference_name
       @clazz.name
     end
 
+    def name
+      :"#{clazz.name}.Single"
+    end
+
     def inspect
       "SingletonClass(#{@clazz.name})"
     end

lib/parfait/type.rb

@@ -4,7 +4,7 @@ module Parfait
 # you want to store values by name (instance variable names).
 #
 # One could (like mri), store the names in each object, but that is wasteful in both
-# time and space.
+# time and space (time for access, space to store implicitly known names ).
 # Instead we store only the values, and access them by index (bit like c++).
 # The Type allows the mapping of names to index.
 
@@ -17,20 +17,27 @@ module Parfait
 # for every Type instance.
 
 # But, as we want every Object to have a class, the Type carries that class.
-# So the type of type has an entry "object_class"
+# So the type of type has an entry "object_class", ir Type has an instance object_class.
 
 # But Objects must also be able to carry methods themselves (ruby calls singleton_methods)
-# and those too are stored in the Type (both type and class include behaviour)
+# and those too are stored in the Type. Those type instances are called singleton
+# types, in analogy to the singleton classes they represent.
+# In other words, "usually" a type represents a whole group of objects (instances of a
+# class at the time the type was the instance_type). But for Singletons, ie objects
+# that have a singleton class, the type is only for that object.
 
-# The object is an "List" (memory location) of values of length n
+# An object is an "List" (memory location) of values of length n
 # The Type is a list of n names and n types that describe the values stored in an
 # actual object.
 # Together they turn the object into a hash like structure
 
 # For types to be a useful concept, they have to be unique and immutable. Any "change",
 # like adding a name/type pair, will result in a new type instance.
+# Type identity can be checked by the hash function, so two types are the same when their
+# hashes are the same. The hash is made up of hashing all instance names and the class
+# name.
 
-# The Type class carries a hash of types of the systems, which is used to ensure that
+# The Space class carries a hash of types of the systems, which is used to ensure that
 # there is only one instance of every type. Hash and equality are defined on type
 # for this to work.
 
@@ -39,24 +46,31 @@ module Parfait
     attr_reader :object_class , :names , :types , :methods
 
     def self.type_length
-      5
+      6
     end
 
-    def self.for_hash( hash , object_class = :Object)
+    # This is the default way to create  new type, because we add it to the
+    # global list, to space.
+    # The hash (actually the keys of the hash) and the object_class define the
+    # identity of the type, which can be checked with the hash function.
+    # single is by default 0, meaning you have to specify explicitly (1) for
+    # it to be a "singleton" type (see class description)
+    def self.for_hash( hash , object_class = :Object , single = 0)
       name = object_class
       if(object_class.is_a?(Symbol))
         object_class = Object.object_space.get_class_by_name(object_class)
       end
       raise "No such class #{name}" unless object_class
       hash = {type: object_class.name }.merge(hash) unless hash[:type]
-      new_type = Type.new( object_class , hash)
+      new_type = Type.new( object_class , hash , single)
       Object.object_space.add_type(new_type)
     end
 
     # should not be called directly. Use Type.for_hash instead, that adds the
-    # type to the global list
-    def initialize( object_class , hash )
+    # type to the global list and does sym->class conversion if neccessary
+    def initialize( object_class , hash , single )
       super()
+      @is_single = single
       @object_class =  object_class
       @methods = nil
       @names = List.new
@@ -68,6 +82,10 @@ module Parfait
       end
     end
 
+    def is_single?
+      @is_single == 1
+    end
+
     def class_name
       @object_class&.name
     end

lib/parfait/vool_method.rb

@@ -20,6 +20,7 @@ module Parfait
       @args_type = args_type
       @frame_type = frame_type
       @source = source
+      #raise source.to_s if name == :type_length
       raise "Name must be symbol" unless name.is_a?(Symbol)
       raise "args_type must be type" unless args_type.is_a?(Parfait::Type)
       raise "frame_type must be type" unless frame_type.is_a?(Parfait::Type)

lib/risc/collector.rb

@@ -67,6 +67,9 @@ module Risc
     def self.position!( objekt )
       return false if Position.set?(objekt)
       return true if objekt.is_a? ::Integer
+      return true if objekt.is_a? ::NilClass
+      return true if objekt.is_a? ::TrueClass
+      return true if objekt.is_a? ::FalseClass
       return true if objekt.is_a?( Risc::Label)
       #puts "ADD  #{objekt.class.name}"
       unless objekt.is_a?( Parfait::Object) or objekt.is_a?( Symbol)

lib/risc/parfait_boot.rb

@@ -29,7 +29,7 @@ module Parfait
     space = Space.new( )
     type_names.each do |name , ivars |
       ivars[:type] = :Type
-      instance_type = Type.new(name , ivars)
+      instance_type = Type.new(name , ivars , 0)
       space.add_type instance_type
       space.classes[name] = Class.new(name , nil , instance_type)
     end
@@ -51,7 +51,6 @@ module Parfait
     classes.each do |name , cl|
       object_type = Parfait.object_space.get_type_by_class_name(name)
       raise "nil type" unless object_type
-      cl.single_class.instance_eval{ @instance_type = class_type}
       cl.instance_eval{ @instance_type = object_type}
       cl.instance_eval{ @super_class_name = super_names[name] || :Object}
       object_type.instance_eval{ @object_class = cl }
@@ -140,7 +139,8 @@ module Parfait
               true_object: :TrueClass, false_object: :FalseClass , nil_object: :NilClass},
       TrueClass: {},
       Type: {names: :List , types: :List  ,
-             object_class: :Class, methods: :CallableMethod } ,
+             object_class: :Class, methods: :CallableMethod ,
+             is_single: :Object} ,
       VoolMethod: { name: :Word , args_type: :Type , frame_type: :Type } ,
       Word: {char_length: :Integer , next_word: :Word} ,
       }

lib/vool/class_method_expression.rb

@@ -41,7 +41,7 @@ module Vool
 
     def to_s(depth = 0)
       arg_str = @args.collect{|a| a.to_s}.join(', ')
-      at_depth(depth , "def self.#{name}(#{arg_str})\n#{@body.to_s(depth + 1)}end")
+      at_depth(depth , "def self.#{name}(#{arg_str})\n#{@body.to_s(1)}\nend")
     end
 
     private

lib/vool/method_expression.rb

@@ -50,7 +50,7 @@ module Vool
 
     def to_s(depth = 0)
       arg_str = @args.collect{|a| a.to_s}.join(', ')
-      at_depth(depth , "def #{name}(#{arg_str})\n#{@body.to_s(depth + 1)}\nend")
+      at_depth(depth , "def #{name}(#{arg_str})\n#{@body.to_s(1)}\nend")
     end
 
     private

lib/vool/statements.rb

@@ -72,11 +72,7 @@ module Vool
       first = stats.shift.to_mom(compiler)
       while( nekst = stats.shift )
         next_mom = nekst.to_mom(compiler)
-        if next_mom.is_a?(Mom::BlockCompiler)
-          compiler.block_compilers << next_mom
-        else
-          first.append next_mom
-        end
+        first.append next_mom
       end
       first
     end