cast_off 0.3.1 → 0.3.2

data/lib/cast_off/compile/dependency.rb

@@ -127,20 +127,20 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
       end
 
       def add(klass, mid, strong_p)
-        # TODO include で継承関係が変わったのを検出
         bug() unless klass.instance_of?(ClassWrapper)
         targets = [klass]
-        if not klass.singleton?
-          klass.each_method_search_target(mid) do |cm|
-            next if cm == klass.contain_class
-            case cm
-            when Class
-              targets << ClassWrapper.new(cm, true)
-            when Module
-              targets << ModuleWrapper.new(cm)
-            else
-              bug()
-            end
+        klass.each_method_search_target(mid) do |cm|
+          next if klass.singleton? ? (cm == klass) : (cm == klass.contain_class)
+          case cm
+          when Class
+            targets << ClassWrapper.new(cm, true)
+          when Module
+            targets << ModuleWrapper.new(cm)
+          when ClassWrapper
+            bug() unless cm.singleton?
+            targets << cm
+          else
+            bug()
           end
         end
         targets.each do |t|
@@ -162,6 +162,27 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
         end
       end
 
+      def self.copy(dst, src, singleton_p)
+        bug() unless dst.is_a?(Module)
+        dst = ModuleWrapper.new(dst)
+        deps  = singleton_p ? @@singleton_method_dependency : @@instance_method_dependency
+        funcs = singleton_p ? @@singleton_method_dependency_initializers : @@instance_method_dependency_initializers
+        (deps[src] || []).each do |mid|
+          finits = funcs[[src, mid]]
+          if finits && !finits.empty?
+            finits.each{|f| instance_method_depend(dst, mid, f)}
+          else
+            bug() unless singleton_p
+            case mid
+            when :singleton_method_added, :method_added, :include, :extend
+              # nothing to do
+            else
+              bug()
+            end
+          end
+        end
+      end
+
       def self.hook(o)
         s = class << o
           self
@@ -193,13 +214,39 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
             end
           end
 
+          # include のフックまで入れると読み込み時間が結構遅くなるので注意
+          begin
+            m_include = o.method(:include).unbind
+            m_extend  = o.method(:extend).unbind
+          rescue NameError
+            raise(ExecutionError.new("#{o}: include or extend not defined"))
+          end
+          define_method(:include) do |*mods|
+            extend_p = Dependency.extend?
+            CastOff.dlog("#{self} #{extend_p ? 'extends' : 'includes'} #{mods}")
+            bug() unless m_include && m_extend
+            m = extend_p ? m_extend : m_include
+            # include, extend の対象は self なので、self 以外が include, extend することはない。
+            m.bind(self).call(*mods)
+            return unless o == self
+            mods.each do |mod|
+              next unless mod.is_a?(Module)
+              Dependency.copy(mod, self, extend_p)
+              Dependency.hook(mod) unless mod.singleton_methods(false).include?(:override_singleton_method)
+              methods = mod.instance_methods(false) + mod.private_instance_methods(false)
+              override_callback = extend_p ? :override_singleton_method : :override_method
+              methods.each{|mid| o.__send__(override_callback, o, mid, extend_p ? :extend : :include)}
+            end
+          end
+          alias extend include
+
           begin
-            singleton_method_added = o.method(:singleton_method_added)
+            singleton_method_added = o.method(:singleton_method_added).unbind
           rescue NameError
             singleton_method_added = nil
           end
           begin
-            method_added = o.method(:method_added)
+            method_added = o.method(:method_added).unbind
           rescue NameError
             method_added = nil
           end
@@ -209,15 +256,15 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
                 CastOff.dlog("singleton method added #{o}.#{mid}")
                 CastOff.delete_original_singleton_method_iseq(self, mid)
                 override_singleton_method(o, mid, :added) 
-                singleton_method_added.call(mid) if singleton_method_added
+                singleton_method_added.bind(self).call(mid) if singleton_method_added
               else
                 CastOff.dlog("method added #{o}##{mid}")
                 CastOff.delete_original_instance_method_iseq(self, mid)
                 override_method(o, mid, :added)
-                method_added.call(mid) if method_added
+                method_added.bind(self).call(mid) if method_added
               end
             elsif o == BasicObject && method_added && !Dependency.singleton_method_added?
-              method_added.call(mid)
+              method_added.bind(self).call(mid)
             end
             super(mid) rescue NoMethodError
           end
@@ -225,10 +272,11 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
           CastOff.dlog("hook #{o}")
         end
         @@singleton_method_dependency[o] ||= []
-        @@singleton_method_dependency[o] |= [:method_added, :singleton_method_added]
+        @@singleton_method_dependency[o] |= [:method_added, :singleton_method_added, :include]
         @@singleton_method_strong_dependency[o] ||= []
         @@singleton_method_strong_dependency[o] |= [:method_added]
         @@singleton_method_strong_dependency[o] |= [:singleton_method_added]
+        @@singleton_method_strong_dependency[o] |= [:include]
       end
 
       def hook(function_pointer_initializer)

data/lib/cast_off/compile/information.rb

@@ -165,6 +165,20 @@ module CastOff::Compiler
         @undefs
       end
 
+      def get_variables(var)
+        check_initialize()
+        ds = @definition.select{|d| var == d.result_variable }
+        bug() if ds.empty?
+        ds.map{|d| d.result_variable}
+      end
+
+      def get_variable(var)
+        vars = get_variables(var)
+        boxed_p = vars.first.boxed?
+        bug() if boxed_p ? vars.find{|v| v.unboxed?} : vars.find{|v| v.boxed?}
+        vars.first
+      end
+
       def mark(var)
         check_initialize()
         ds = @definition.select {|d| var == d.result_variable }
@@ -221,55 +235,13 @@ module CastOff::Compiler
       end
 
       ### unboxing begin ###
-      def can_not_unbox_variable_resolve_forward(var)
+      def propergate_boxed_value_forward(var)
         check_initialize()
-        return false if var.can_not_unbox?
-        ds = @definition.select {|d| var == d.result_variable }
-        if ds.empty?
-          case var
-          when TmpBuffer, Pointer, Argument, Self, ConstWrapper, Literal
-            return false
-          else
-            bug(var)
-          end
-        end
-        ds.each do |d|
-          if d.result_variable.can_not_unbox?
-            var.can_not_unbox()
-            return true
-          end
-        end
-        return false
-      end
-
-      def can_not_unbox_variable_resolve_backward(var)
-        check_initialize()
-        bug() unless var.can_not_unbox?
-        ds = @definition.select {|d| var == d.result_variable }
-        if ds.empty?
-          case var
-          when TmpBuffer, Pointer, Argument, Self, ConstWrapper, Literal
-            return false
-          else
-            bug(var)
-          end
-        end
-        ds.inject(false){|change, d| d.result_variable.can_not_unbox() || change}
-      end
-
-      def box_value_resolve_forward(var)
-        check_initialize()
-        bug() if !var.unboxed? && !var.boxed?
         return false if var.boxed?
         ds = @definition.select {|d| var == d.result_variable }
         if ds.empty?
-          case var
-          when TmpBuffer, Pointer, Argument, Self, ConstWrapper, Literal
-            #bug(var)
-            return false
-          else
-            bug(var)
-          end
+          bug(var) unless var.is_a?(Literal) # should be boxed => TmpBuffer, Pointer, Argument, Self, ConstWrapper
+          return false
         end
         ds.each do |d|
           if d.result_variable.boxed?
@@ -280,7 +252,7 @@ module CastOff::Compiler
         return false
       end
 
-      def box_value_resolve_backward(var)
+      def propergate_boxed_value_backward(var)
         check_initialize()
         bug() unless var.boxed?
         ds = @definition.select {|d| var == d.result_variable }
@@ -294,35 +266,6 @@ module CastOff::Compiler
         end
         ds.inject(false){|change, d| d.result_variable.box() || change}
       end
-
-      def unbox_value_resolve(var)
-        check_initialize()
-        bug() if var.can_not_unbox?
-        return false if var.unboxed?
-        ds = @definition.select {|d| var == d.result_variable }
-        if ds.empty?
-          case var
-          when TmpBuffer, Pointer, Argument, Self, ConstWrapper, Literal
-            return false
-          else
-            bug(var)
-          end
-        end
-        c = nil
-        ds.each do |d|
-          v = d.result_variable
-          return false unless v.unboxed?
-          bug() if v.dynamic?
-          bug() unless v.types.size == 1
-          if c
-            bug() unless c == v.types[0]
-          else
-            c = v.types[0]
-          end
-        end
-        var.unbox()
-        true
-      end
       ### unboxing end ###
 
       private
@@ -431,6 +374,7 @@ module CastOff::Compiler
           other.condition.each do |(v, p)|
             tmp.delete(v) if !tmp[v] || (tmp[v] && tmp[v] != p)
           end
+          (tmp.keys - other.condition.keys).each{|v| tmp.delete(v)}
         else
           tmp = other.condition.dup
         end

data/lib/cast_off/compile/ir/call_ir.rb

@@ -36,27 +36,15 @@ module CastOff
         can_not_unbox()
       end
 
-      def propergate_value_which_can_not_unbox(defs)
+      def propergate_boxed_value(defs)
         # nothing to do
         false
       end
 
-      def propergate_box_value(defs)
-        # nothing to do
-        false
-      end
-
-      def propergate_unbox_value(defs)
-        return false if @return_value.can_not_unbox?
-        @return_value.unbox()
-      end
-
-      #private
-
       def can_not_unbox()
         params = param_variables()
-        params.each{|p| p.can_not_unbox()}
-        @return_value.can_not_unbox()
+        params.each{|p| p.box()}
+        @return_value.box()
       end
       ### unboxing end ###
 
@@ -261,8 +249,8 @@ module CastOff
       ### unboxing begin ###
       def unboxing_prelude()
         params = param_variables()
-        params.each{|p| p.can_not_unbox()}
-        @return_value.can_unbox()
+        params.each{|p| p.box()}
+        @return_value.box() unless @return_value.can_unbox?
       end
       ### unboxing end ###
 
@@ -1728,7 +1716,7 @@ You should not use #{@method_id} method in compilation target of CastOff.
         [MethodWrapper.new(ArrayWrapper,  :first), 1]  => [['first',        [], nil, nil, false, false]],
         [MethodWrapper.new(FixnumWrapper, :+), 2]      => [['fixnum_plus',  [Fixnum], Fixnum, nil, true, true], ['float_plus',   [Float],   nil, Float, true, true]], # FIXME
         [MethodWrapper.new(FixnumWrapper, :-), 2]      => [['fixnum_minus', [Fixnum], Fixnum, nil, true, true], ['float_minus',  [Float],   nil, Float, true, true]], # FIXME
-        [MethodWrapper.new(FixnumWrapper, :*), 2]      => [['fixnum_mult',  [Fixnum], Fixnum, nil, true, true],        ['float_mult',   [Float],   nil, Float, true, true]], # FIXME
+        [MethodWrapper.new(FixnumWrapper, :*), 2]      => [['fixnum_mult',  [Fixnum], Fixnum, nil, true, true], ['float_mult',   [Float],   nil, Float, true, true]], # FIXME
         [MethodWrapper.new(FixnumWrapper, :<=), 2]     => [['le',           [Fixnum], nil, [TrueClass,  FalseClass], false, false]],
         [MethodWrapper.new(FixnumWrapper, :<), 2]      => [['lt',           [Fixnum], nil, [TrueClass,  FalseClass], false, false]],
         [MethodWrapper.new(FixnumWrapper, :>=), 2]     => [['ge',           [Fixnum], nil, [TrueClass,  FalseClass], false, false]],
@@ -1741,7 +1729,23 @@ You should not use #{@method_id} method in compilation target of CastOff.
         [MethodWrapper.new(FloatWrapper,  :-), 2]      => [['float_minus',  [Float],   nil, Float, true, true], ['fixnum_minus',  [Fixnum],  nil, Float, true, true]],
         [MethodWrapper.new(FloatWrapper,  :*), 2]      => [['float_mult',   [Float],   nil, Float, true, true], ['fixnum_mult',   [Fixnum],  nil, Float, true, true]],
         [MethodWrapper.new(FloatWrapper,  :/), 2]      => [['float_div',    [Float],   nil, Float, true, true], ['fixnum_div',    [Fixnum],  nil, Float, true, true]],
-        [MethodWrapper.new(FloatWrapper,  :>), 2]      => [['float_gt',     [Float],   nil, [TrueClass,  FalseClass], false, true]],
+        [MethodWrapper.new(FloatWrapper,  :<=), 2]     => [['float_le',     [Float],   nil, [TrueClass,  FalseClass], false, true],
+                                                           ['fixnum_le',    [Fixnum],  nil, [TrueClass,  FalseClass], false, true]],
+        [MethodWrapper.new(FloatWrapper,  :<), 2]      => [['float_lt',     [Float],   nil, [TrueClass,  FalseClass], false, true],
+                                                           ['fixnum_lt',    [Fixnum],  nil, [TrueClass,  FalseClass], false, true]],
+        [MethodWrapper.new(FloatWrapper,  :>=), 2]     => [['float_ge',     [Float],   nil, [TrueClass,  FalseClass], false, true],
+                                                           ['fixnum_ge',    [Fixnum],  nil, [TrueClass,  FalseClass], false, true]],
+        [MethodWrapper.new(FloatWrapper,  :>), 2]      => [['float_gt',     [Float],   nil, [TrueClass,  FalseClass], false, true],
+                                                           ['fixnum_gt',    [Fixnum],  nil, [TrueClass,  FalseClass], false, true]],
+        [MethodWrapper.new(FloatWrapper,  :==), 2]     => [['float_eq',     [Float],   nil, [TrueClass,  FalseClass], false, true],
+                                                           ['fixnum_eq',    [Fixnum],  nil, [TrueClass,  FalseClass], false, true]],
+        [MethodWrapper.new(FloatWrapper,  :===), 2]    => [['float_eqq',    [Float],   nil, [TrueClass,  FalseClass], false, true],
+                                                           ['fixnum_eqq',   [Fixnum],  nil, [TrueClass,  FalseClass], false, true]],
+        [MethodWrapper.new(FixnumWrapper, :-@), 1]     => [['uminus',       [], Fixnum, nil, true, true]],
+        [MethodWrapper.new(FloatWrapper, :-@), 1]      => [['uminus',       [], nil, Float, true, true]],
+        [MethodWrapper.new(FixnumWrapper, :to_f), 1]   => [['to_f',         [], nil, Float, true, true]],
+        [MethodWrapper.new(FloatWrapper, :to_f), 1]    => [['to_f',         [], nil, Float, true, false]],
+        [MethodWrapper.new(FloatWrapper, :to_i), 1]    => [['to_i',         [], nil, Float, false, true]],
       }
       SpecializeTable1 = {
         [:==,   2, MethodWrapper.new(ObjectWrapper, :==)]      => :specialized_object_eq,
@@ -1800,10 +1804,26 @@ You should not use #{@method_id} method in compilation target of CastOff.
         bug()
       end
 
+      def unboxed_decl(v)
+        bug() unless v.is_a?(Variable)
+        bug() if v.dynamic?
+        bug() unless v.types.size == 1
+        c = v.types[0]
+        bug() unless c.is_a?(ClassWrapper)
+        case c
+        when FloatWrapper
+          'double'
+        when FixnumWrapper
+          'long'
+        else
+          bug()
+        end
+      end
+
       def specialized_code(klass, mid, argc, recv, param)
         bug() unless klass.is_a?(ClassWrapper)
         return false unless @configuration.enable_inline_api?
-        # FIXME 関数ポインタが実行時に同一であることをチェック
+        # FIXME ロード時に、関数ポインタが想定しているものと同一であることをチェック
         if klass.String? || klass.Array? || klass.Fixnum? || klass.Float?
           entries = SpecializeTable0[[MethodWrapper.new(klass, mid), argc]]
           return false unless entries
@@ -1816,9 +1836,6 @@ You should not use #{@method_id} method in compilation target of CastOff.
             (param + [@return_value]).zip(t_param + [t_result]).each do |p, t|
               next if t.nil?
               unless p.is_just?(t)
-                #if @source && @configuration.development?
-                  #@translator.add_inlineapi_suggestion(["#{klass}###{mid}", "1st argument can be not #{t}", @source_line, @source]) 
-                #end
                 fin = false
                 break
               end
@@ -1832,24 +1849,12 @@ You should not use #{@method_id} method in compilation target of CastOff.
           name, t_param, t_result, exact_classes, can_unbox_result, can_unbox_param = entry
 
           s_param = param.empty? ? '' : ", #{param.join(", ")}"
-          if can_unbox_param
-            suffix = ([recv] + param + [@return_value]).map{|p|
-              if p.unboxed?
-                bug() if p.dynamic?
-                bug() unless p.types.size == 1
-                c = p.types[0]
-                case c
-                when FloatWrapper
-                  'double'
-                when FixnumWrapper
-                  'long'
-                else
-                  bug()
-                end
-              else
-                'VALUE'
-              end
-            }.join("_")
+          if can_unbox_param || can_unbox_result
+            bug() if !can_unbox_param && ([recv] + param).find{|p| p.unboxed? }
+            suffix = ([recv] + param).map{|p| p.unboxed? ? unboxed_decl(p) : 'VALUE'}
+            bug() if !can_unbox_result && @return_value.unboxed?
+            suffix << (@return_value.unboxed? ? unboxed_decl(@return_value) : 'VALUE')
+            suffix = suffix.join('_')
             return "  #{@return_value} = cast_off_inline_#{klass.to_s.downcase}_#{name}_#{suffix}(#{recv}#{s_param});"
           else
             return "  #{@return_value} = cast_off_inline_#{klass.to_s.downcase}_#{name}(#{recv}#{s_param});"
@@ -2030,7 +2035,7 @@ You should not use #{@method_id} method in compilation target of CastOff.
 %  if funcall
   <%= funcall_code(nil, id, recv, param, @argc) %>
 %  else
-    rb_raise(rb_eCastOffExecutionError, "type mismatch: reciever = <%= recv %>, method name = <%= id %>");
+    rb_bug("type mismatch: method name = <%= @method_id %>");
 %  end
   }
 %end
@@ -2071,7 +2076,7 @@ You should not use #{@method_id} method in compilation target of CastOff.
         id = @translator.allocate_id(@method_id)
         bug() if recv.undefined?
         if @configuration.development? && sampling_return_value?
-          ret << "  cast_off_tmp = #{recv};"
+          ret << "  sampling_tmp = #{recv};"
         end
         if blockarg?
           ret << funcall_code(nil, id, recv, param, @argc)
@@ -2146,7 +2151,7 @@ You should not use #{@method_id} method in compilation target of CastOff.
           end
         end
         if @configuration.development? && sampling_return_value?
-          ret << "  sampling_poscall(#{@return_value}, cast_off_tmp, ID2SYM(rb_intern(#{@method_id.to_s.inspect})));"
+          ret << "  sampling_poscall(#{@return_value}, sampling_tmp, ID2SYM(rb_intern(#{@method_id.to_s.inspect})));"
         end
         ret.join("\n")
       end
@@ -2189,6 +2194,8 @@ You should not use #{@method_id} method in compilation target of CastOff.
         recv.types.each do |t|
           ok = @configuration.use_method_information(t, @method_id)
           return false unless ok
+          # これのせいで依存するクラスなどが結構増える。読み込みが遅くなる。
+          @dependency.add(t, @method_id, true)
         end 
         return true
       end
@@ -2211,6 +2218,8 @@ You should not use #{@method_id} method in compilation target of CastOff.
           recv.types.each do |t|
             ok = @configuration.use_method_information(t, @method_id)
             return true unless ok
+            # これのせいで依存するクラスなどが結構増える。読み込みが遅くなる。
+            @dependency.add(t, @method_id, true)
           end 
         end
         se
@@ -2286,19 +2295,8 @@ You should not use #{@method_id} method in compilation target of CastOff.
             return
           end
           name, t_args, t_result, exact_classes, can_unbox_result, can_unbox_param = entry
-          if can_unbox_param
-            params.each do |p|
-              next unless p.box_unbox_undefined? # for guard
-              p.can_unbox? ? p.can_unbox() : p.can_not_unbox()
-            end
-          else
-            params.each{|p| p.can_not_unbox()}
-          end
-          if can_unbox_result
-            @return_value.can_unbox()
-          else
-            @return_value.can_not_unbox()
-          end
+          can_unbox_param ? params.each{|p| p.box() unless p.can_unbox?} : params.each{|p| p.box()}
+          @return_value.box() unless can_unbox_result && @return_value.can_unbox?
           return
         end
       end