cast_off 0.3.6 → 0.3.7

data/bin/cast_off

@@ -134,7 +134,7 @@ when '2'
     CastOff.development(false)
     CastOff.use_base_configuration(true)
     # step 3
-    CastOff.load(true)
+    CastOff.load()
   }
   fin = Object.new
   ObjectSpace.define_finalizer(fin){

data/cast_off.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name		      = "cast_off"
-  spec.version		      = "0.3.6"
+  spec.version		      = "0.3.7"
   spec.platform		      = Gem::Platform::RUBY
   spec.summary		      = "Compiler for Ruby1.9.3"
   spec.description	      = <<-EOS
@@ -8,15 +8,17 @@ CastOff is a compiler for Ruby1.9.3.
 Command line tool cast_off is available after installation.
 See 'cast_off --help' for more information.
   EOS
-  spec.files		      = Dir['{lib/**/*,ext/**/*}'] + %w[
+  spec.files		      = Dir['{lib/**/*,ext/**/*,bin/**/*,doc/**/*}'] + %w[
 				  cast_off.gemspec
+                                  README.en
+                                  README
 				]
   spec.bindir		      = 'bin'
   spec.executables	      << 'cast_off'
   spec.require_path	      = 'lib'
   spec.extensions	      = 'ext/cast_off/extconf.rb'
   spec.has_rdoc		      = false
-  spec.extra_rdoc_files      = ['README', 'README.en']
+  #spec.extra_rdoc_files      = ['README', 'README.en']
   #spec.test_files	      = Dir['test/*']
   spec.author		      = 'Satoshi Shiba'
   spec.email		      = 'shiba@rvm.jp'

data/ext/cast_off/cast_off.c.rb

@@ -61,6 +61,7 @@ VALUE rb_cCastOffSingletonClass;
 VALUE rb_cCastOffClassWrapper;
 VALUE rb_cCastOffMethodWrapper;
 VALUE rb_cCastOffModuleWrapper;
+VALUE oMain, cDumpMain;
 
 static VALUE
 gen_headers(void)
@@ -238,6 +239,8 @@ cast_off_instruction_stack_usage(VALUE self, VALUE insns)
   return INT2FIX(insn_stack_increase(0, insn, opes));
 }
 
+
+static int class_wrapper_support(VALUE obj, VALUE is_wrap);
 static VALUE
 cast_off_instruction_class_information_in_ic(VALUE self, VALUE iseqval)
 {
@@ -301,8 +304,7 @@ cast_off_instruction_class_information_in_ic(VALUE self, VALUE iseqval)
 
   if (FL_TEST(klass, FL_SINGLETON)) {
     VALUE obj = rb_iv_get(klass, "__attached__");
-    VALUE __klass = rb_obj_class(obj);
-    if (__klass != rb_cClass && __klass != rb_cModule) {
+    if (rb_class_of(obj) != klass || !class_wrapper_support(obj, Qfalse)) {
       return Qnil;
     }
     return rb_funcall(rb_cCastOffClassWrapper, rb_intern("new"), 2, obj, Qfalse);
@@ -447,6 +449,23 @@ static VALUE cast_off_get_iseq(VALUE self, VALUE obj, VALUE mid, VALUE singleton
   rb_raise(rb_eCastOffUnsupportedError, "%s (%s#%s)", msg, RSTRING_PTR(name), rb_id2name(SYM2ID(mid)));
 }
 
+static VALUE cast_off_get_compilable_iseq(VALUE self, VALUE obj, VALUE mid, VALUE singleton_p)
+{
+  rb_method_entry_t *me;
+  VALUE km = (RTEST(singleton_p)) ? rb_class_of(obj) : obj;
+
+  me = search_method(km, SYM2ID(mid));
+  if (!me) {
+    return Qnil;
+  }
+
+  if (me->def->type == VM_METHOD_TYPE_ISEQ) {
+    return me->def->body.iseq->self;
+  } else {
+    return Qnil;
+  }
+}
+
 static VALUE cast_off_get_iseq_from_block(VALUE self, VALUE block)
 {
   rb_iseq_t *iseq;
@@ -471,7 +490,7 @@ static VALUE cast_off_get_iseq_line(VALUE self, VALUE iseqval)
   rb_iseq_t *iseq;
 
   if (rb_class_of(iseqval) != rb_cISeq) {
-    rb_bug("cast_off_get_iseq_signiture: shoult not be reached");
+    rb_bug("cast_off_get_iseq_line: shoult not be reached");
   }
 
   iseq = DATA_PTR(iseqval);
@@ -484,7 +503,7 @@ static VALUE cast_off_get_iseq_filepath(VALUE self, VALUE iseqval)
   rb_iseq_t *iseq;
 
   if (rb_class_of(iseqval) != rb_cISeq) {
-    rb_bug("cast_off_get_iseq_signiture: shoult not be reached");
+    rb_bug("cast_off_get_iseq_filepath: shoult not be reached");
   }
 
   iseq = DATA_PTR(iseqval);
@@ -567,13 +586,16 @@ static VALUE cast_off_initialize_class_wrapper(VALUE self, VALUE obj, VALUE is_w
 
   switch(is_wrap) {
   case Qtrue:
+    if (rb_obj_class(obj) != rb_cClass) {
+      rb_bug("ClassWrapper#initialize: should not be reached(0)");
+    }
     wrap = 1;
     break;
   case Qfalse:
     wrap = 0;
     break;
   default:
-    rb_bug("ClassWrapper#initialize: should not be reached");
+    rb_bug("ClassWrapper#initialize: should not be reached(1)");
   }
 
   if (wrap) {
@@ -654,14 +676,10 @@ static VALUE cast_off_class_wrapper_singleton_p(VALUE self)
   VALUE obj = wrapper->obj;
 
   if (FL_TEST(klass, FL_SINGLETON)) {
-    VALUE __klass = rb_obj_class(obj);
-    if (__klass == rb_cClass) {
+    if (class_wrapper_support(obj, Qfalse)) {
       return Qtrue;
-    } else if (__klass == rb_cModule) {
-      return Qtrue;
-    } else {
-      rb_raise(rb_eCastOffCompileError, "CastOff can't handle singleton object without Class and Module");
     }
+    rb_raise(rb_eCastOffCompileError, "CastOff can't handle un-marshalable object");
   } else {
     return Qfalse;
   }
@@ -674,14 +692,17 @@ static VALUE cast_off_class_wrapper_to_s(VALUE self)
   VALUE obj = wrapper->obj;
 
   if (FL_TEST(klass, FL_SINGLETON)) {
-    VALUE __klass = rb_obj_class(obj);
-    if (__klass == rb_cClass) {
-      return rb_class_path(obj);
-    } else if (__klass == rb_cModule) {
-      return rb_mod_name(obj);
-    } else {
-      rb_raise(rb_eCastOffCompileError, "CastOff can't handle singleton object without Class and Module");
+    if (class_wrapper_support(obj, Qfalse)) {
+      VALUE __klass = rb_obj_class(obj);
+      if (__klass == rb_cClass) {
+        return rb_class_path(obj);
+      } else if (__klass == rb_cModule) {
+        return rb_mod_name(obj);
+      } else {
+        return rb_funcall(obj, rb_intern("to_s"), 0);
+      }
     }
+    rb_raise(rb_eCastOffCompileError, "CastOff can't handle un-marshalable object");
   } else {
     return rb_class_path(klass);
   }
@@ -696,7 +717,17 @@ static VALUE cast_off_class_wrapper_marshal_dump(VALUE self)
     rb_ary_push(ary, rb_class_path(wrapper->klass));
     rb_ary_push(ary, Qtrue);
   } else {
-    rb_ary_push(ary, wrapper->obj);
+    VALUE obj = wrapper->obj;
+
+    if (!class_wrapper_support(obj, Qfalse)) {
+      rb_bug("cast_off_class_wrapper_marshal_dump: should not be reached");
+    }
+
+    if (obj == oMain) {
+      rb_ary_push(ary, cDumpMain);
+    } else {
+      rb_ary_push(ary, obj);
+    }
     rb_ary_push(ary, Qfalse);
   }
 
@@ -710,6 +741,10 @@ static VALUE cast_off_class_wrapper_marshal_load(VALUE self, VALUE ary)
 
   if (is_wrap == Qtrue) {
     obj = rb_path_to_class(obj);
+  } else {
+    if (obj == cDumpMain) {
+      obj = oMain;
+    }
   }
 
   return cast_off_initialize_class_wrapper(self, obj, is_wrap);
@@ -863,6 +898,35 @@ static VALUE cast_off_class_wrapper_each_method_search_target(VALUE self, VALUE
   return Qtrue;
 }
 
+static int class_wrapper_support(VALUE obj, VALUE is_wrap)
+{
+  VALUE klass = rb_obj_class(obj);
+
+  if (RTEST(is_wrap)) {
+    return klass == rb_cClass;
+  }
+
+  if (klass == rb_cClass || klass == rb_cModule) {
+    return 1;
+  }
+
+  klass == rb_class_of(obj);
+  if (!FL_TEST(klass, FL_SINGLETON)) {
+    return 1;
+  }
+
+  if (obj == oMain) {
+    return 1;
+  }
+
+  return 0;
+}
+
+static VALUE cast_off_class_wrapper_s_support_p(VALUE self, VALUE obj, VALUE is_wrap)
+{
+  return class_wrapper_support(obj, is_wrap) ? Qtrue : Qfalse;
+}
+
 #define define_type_checker(klass) \
 static VALUE cast_off_class_wrapper_##klass##_p(VALUE self) \
 { \
@@ -1360,8 +1424,8 @@ static VALUE cast_off_hook_method_invocation(VALUE self, VALUE proc)
   return Qtrue;
 }
 
-static ID id_method_added, id_singleton_method_added, id_initialize_copy, id_clone;
-VALUE cast_off_ignore_overridden_p(VALUE dummy, VALUE target, VALUE midsym)
+static ID id_initialize_copy, id_clone;
+VALUE cast_off_ignore_overridden_p(VALUE dummy)
 {
   VALUE thval = rb_thread_current();
   rb_thread_t *th = DATA_PTR(thval);
@@ -1369,12 +1433,11 @@ VALUE cast_off_ignore_overridden_p(VALUE dummy, VALUE target, VALUE midsym)
   ID mid;
 
   cfp = th->cfp; /* this method frame */
-  cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); /* method_added or singleton_method_added frame */
+  cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); /* method_added or singleton_method_added or include or extend frame */
   if (!cfp->me) {
     rb_bug("cast_off_ignore_overridden_p: should not be reached(0)");
   }
-  mid = cfp->me->called_id;
-  if (mid != id_method_added && mid != id_singleton_method_added) {
+  if (cfp->me->def->type != VM_METHOD_TYPE_BMETHOD) {
     rb_bug("cast_off_ignore_overridden_p: should not be reached(1)");
   }
   cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
@@ -1393,7 +1456,7 @@ VALUE cast_off_ignore_overridden_p(VALUE dummy, VALUE target, VALUE midsym)
   return Qtrue;
 }
 
-VALUE cast_off_singleton_method_added_p(VALUE dummy)
+VALUE cast_off_current_method_id(VALUE dummy)
 {
   VALUE thval = rb_thread_current();
   rb_thread_t *th = DATA_PTR(thval);
@@ -1401,42 +1464,49 @@ VALUE cast_off_singleton_method_added_p(VALUE dummy)
   ID mid;
 
   cfp = th->cfp; /* this method frame */
-  cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); /* method_added or singleton_method_added frame */
+  cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); /* target frame */
   if (!cfp->me) {
-    rb_bug("cast_off_singleton_method_added_p: should not be reached(0)");
+    rb_bug("cast_off_current_method_id: should not be reached(0)");
   }
-  mid = cfp->me->called_id;
-  if (mid == id_method_added) {
-    return Qfalse;
+  if (cfp->me->def->type != VM_METHOD_TYPE_BMETHOD) {
+    rb_bug("cast_off_current_method_id: should not be reached(1)");
   }
-  if (mid == id_singleton_method_added) {
-    return Qtrue;
+  mid = cfp->me->called_id;
+  if (!mid) {
+    rb_bug("cast_off_current_method_id: should not be reached(2)");
   }
-  rb_bug("cast_off_singleton_method_added_p: should not be reached(1)");
+  return ID2SYM(mid);
 }
 
-static ID id_include, id_extend;
-VALUE cast_off_extend_p(VALUE dummy)
+VALUE cast_off_same_method_p(VALUE dummy, VALUE obj, VALUE mid)
 {
+  VALUE klass = rb_class_of(obj);
   VALUE thval = rb_thread_current();
   rb_thread_t *th = DATA_PTR(thval);
   rb_control_frame_t *cfp;
-  ID mid;
+  rb_method_entry_t *me0, *me1;
 
   cfp = th->cfp; /* this method frame */
-  cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); /* method_added or singleton_method_added frame */
+  cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); /* target frame */
   if (!cfp->me) {
-    rb_bug("cast_off_extend_p: should not be reached(0)");
+    rb_bug("cast_off_same_method_p: should not be reached(0)");
   }
-  mid = cfp->me->called_id;
-  if (mid == id_include) {
-    return Qfalse;
+  if (cfp->me->def->type != VM_METHOD_TYPE_BMETHOD) {
+    rb_bug("cast_off_same_method_p: should not be reached(1)");
   }
-  if (mid == id_extend) {
+
+  me0 = cfp->me;
+  me1 = search_method(klass, SYM2ID(mid));
+
+  if (!me1) {
+    rb_bug("cast_off_same_method_p: should not be reached(2)");
+  }
+
+  if (rb_method_definition_eq(me0->def, me1->def)) {
     return Qtrue;
+  } else {
+    return Qfalse;
   }
-  /* TODO 別名に対応 */
-  rb_bug("cast_off_extend_p: should not be reached(1)");
 }
 
 /* for deoptimization */
@@ -1463,7 +1533,8 @@ void Init_cast_off(void)
   rb_eCastOffLoadError = rb_define_class_under(rb_mCastOff, "LoadError", rb_eStandardError);
   rb_eCastOffUnsupportedError = rb_define_class_under(rb_mCastOff, "UnsupportedError", rb_eStandardError);
   rb_define_method(rb_mCastOffCompiler, "override_target", cast_off_override_target, 2);
-  rb_define_method(rb_mCastOffCompiler, "get_iseq", cast_off_get_iseq, 3);
+  rb_define_method(rb_mCastOffCompiler, "get_iseq", cast_off_get_iseq, 3); /* TODO rename => get_compilable_iseq! */
+  rb_define_method(rb_mCastOffCompiler, "get_compilable_iseq", cast_off_get_compilable_iseq, 3);
   rb_define_method(rb_mCastOffCompiler, "get_iseq_from_block", cast_off_get_iseq_from_block, 1);
   rb_define_method(rb_mCastOffCompiler, "get_iseq_filepath", cast_off_get_iseq_filepath, 1);
   rb_define_method(rb_mCastOffCompiler, "get_iseq_line", cast_off_get_iseq_line, 1);
@@ -1471,6 +1542,8 @@ void Init_cast_off(void)
   rb_define_method(rb_mCastOffCompiler, "get_caller", cast_off_get_caller, 0);
   rb_define_method(rb_mCastOffCompiler, "hook_method_invocation", cast_off_hook_method_invocation, 1);
   rb_define_method(rb_mCastOffCompiler, "hook_class_definition_end", cast_off_hook_class_definition_end, 1);
+  rb_define_method(rb_mCastOffCompiler, "current_method_id", cast_off_current_method_id, 0);
+  rb_define_method(rb_mCastOffCompiler, "same_method?", cast_off_same_method_p, 2);
   rb_define_method(rb_mCastOffCompilerInstruction, "get_child_iseq", cast_off_get_child_iseq, 2);
   rb_define_const(rb_mCastOffCompilerInstruction, "ROBJECT_EMBED_LEN_MAX", LONG2FIX(ROBJECT_EMBED_LEN_MAX));
   rb_define_const(rb_mCastOffCompilerInstruction, "THROW_TAG_RETURN", LONG2FIX(TAG_RETURN));
@@ -1523,6 +1596,7 @@ void Init_cast_off(void)
   rb_define_method(rb_cCastOffClassWrapper, "Array?", cast_off_class_wrapper_Array_p, 0);
   rb_define_method(rb_cCastOffClassWrapper, "Fixnum?", cast_off_class_wrapper_Fixnum_p, 0);
   rb_define_method(rb_cCastOffClassWrapper, "Float?", cast_off_class_wrapper_Float_p, 0);
+  rb_define_singleton_method(rb_cCastOffClassWrapper, "support?", cast_off_class_wrapper_s_support_p, 2);
 
   rb_define_alloc_func(rb_cCastOffModuleWrapper, cast_off_allocate_module_wrapper);
   rb_define_method(rb_cCastOffModuleWrapper, "initialize", cast_off_initialize_module_wrapper, 1);
@@ -1547,19 +1621,17 @@ void Init_cast_off(void)
   rb_define_const(rb_mCastOffCompiler, "Headers", gen_headers());
   rb_define_const(rb_mCastOffCompiler, "DEOPTIMIZATION_ISEQ_TABLE", rb_hash_new());
 
-  id_method_added = rb_intern("method_added");
-  id_singleton_method_added = rb_intern("singleton_method_added");
-  id_include = rb_intern("include");
-  id_extend = rb_intern("extend");
   id_initialize_copy = rb_intern("initialize_copy");
   id_clone = rb_intern("clone");
-  rb_define_singleton_method(rb_cCastOffDependency, "ignore_overridden?", cast_off_ignore_overridden_p, 2);
-  rb_define_singleton_method(rb_cCastOffDependency, "singleton_method_added?", cast_off_singleton_method_added_p, 0);
-  rb_define_singleton_method(rb_cCastOffDependency, "extend?", cast_off_extend_p, 0);
+  rb_define_singleton_method(rb_cCastOffDependency, "ignore_overridden?", cast_off_ignore_overridden_p, 0);
 
   rb_define_singleton_method(rb_mCastOffCompiler, "destroy_last_finish", cast_off_destroy_last_finish, 0);
   rb_funcall(rb_mCastOffCompiler, rb_intern("module_eval"), 1, rb_str_new2("def self.vm_exec(); destroy_last_finish() end"));
 
+  oMain = rb_funcall(rb_mKernel, rb_intern("eval"), 2, rb_str_new2("self"), rb_const_get(rb_cObject, rb_intern("TOPLEVEL_BINDING")));
+  rb_define_const(rb_mCastOffCompiler, "MAIN", oMain);
+  cDumpMain = rb_define_class_under(rb_cCastOffClassWrapper, "DumpMain", rb_cObject);
+
   init_insn_table();
 }
 

data/lib/cast_off/compile/code_manager.rb

@@ -27,14 +27,18 @@ module CastOff
       FileUtils.mkdir(BaseDir) unless File.exist?(BaseDir)
 
       @@program_name = File.basename($PROGRAM_NAME)
+      @@program_sign = generate_signiture(@@program_name)
       CastOff::Compiler.class_eval do
-        def program_name=(dir)
-          CastOff::Compiler::CodeManager.class_variable_set(:@@program_name, dir)
+        def program_name=(name)
+          sign = CastOff::Compiler::CodeManager.generate_signiture(name)
+          CastOff::Compiler::CodeManager.class_variable_set(:@@program_sign, sign)
+          CastOff::Compiler::CodeManager.class_variable_set(:@@program_name, name)
+          name
         end
       end
 
       def self.program_dir()
-        dir = "#{BaseDir}/#{generate_signiture(@@program_name)}"
+        dir = "#{BaseDir}/#{@@program_sign}"
         FileUtils.mkdir(dir) unless File.exist?(dir)
         dir
       end
@@ -54,6 +58,12 @@ module CastOff
         return true
       end
 
+      def self.compiled_method_exist?(filepath, line_no)
+        return false unless filepath && line_no >= 0
+        base_sign = generate_signiture("#{filepath}_#{line_no}")
+        File.exist?("#{BaseDir}/#{@@program_sign}/#{base_sign}/loadable")
+      end
+
       @@compiled_methods_fetch_str = nil
       @@compiled_methods_load_str  = nil
       def self.load_autocompiled()
@@ -156,6 +166,7 @@ Max length of signiture is #{FILEPATH_LIMIT} in this environment.
         @annotation_path = "#{@dstdir}/#{@signiture}.ann"
         @development_mark_file = "development"
         @development_mark_path = "#{@dstdir}/#{@development_mark_file}"
+        @loadable_mark_path = "#{@dstdir}/loadable"
         @dstbin = "#{@dstdir}/#{@signiture}.#{CONFIG['DLEXT']}"
         @longpath = @base_configuration_path # FIXME
         check_length()
@@ -264,6 +275,10 @@ Failed to compile c source: status = (#{$?})
         FileUtils.touch(@development_mark_path) if conf.development?
       end
 
+      def loadable()
+        FileUtils.touch(@loadable_mark_path)
+      end
+
       def save_base_configuration(conf)
         begin
           File.open(@base_configuration_path, 'wb:us-ascii') do |f|

data/lib/cast_off/compile/configuration.rb

@@ -304,7 +304,7 @@ o = Object
         # annotation of variables
         a0 = v
         a0 = a0.map{|(c, singleton_p)|
-          bug(c) unless c.is_a?(Class) || (c.is_a?(Module) && singleton_p)
+          bug(c) unless ClassWrapper.support?(c, !singleton_p)
           bug()  unless c != SingletonClass
           if singleton_p
             wrapper = ClassWrapper.new(c, false)
@@ -342,7 +342,7 @@ o = Object
         bug() unless sym == :singleton_methods || sym == :instance_methods
         bug() unless mtbl.is_a?(Hash)
         mtbl.each do |(k, v)|
-          bug() unless k.instance_of?(Class) || (k.instance_of?(Module) && sym == :singleton_methods)
+          bug() unless ClassWrapper.support?(k, sym == :instance_methods)
           bug() unless v.instance_of?(Hash)
           if k == SingletonClass
             bug() if sym == :singleton_methods
@@ -378,7 +378,7 @@ o = Object
             end
             next if @ignore_configuration_of_return_values[k] && @ignore_configuration_of_return_values[k].include?(mid)
             klasses0 = klasses0.map{|(c, singleton_p)|
-              bug(c) unless c.is_a?(Class) || (c.is_a?(Module) && singleton_p)
+              bug(c) unless ClassWrapper.support?(c, !singleton_p)
               bug()  unless c != SingletonClass
               if singleton_p
                 wrapper = ClassWrapper.new(c, false)
@@ -473,24 +473,14 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
       ary = []
       @variable_configuration.each do |(k, v)|
         bug() unless k.instance_of?(Symbol)
-        ary << "#{k.inspect} => #{v.inspect}"
+        ary << "#{k.inspect} => #{inspect_class_wrappers(v)}"
       end
       @return_value_configuration.each do |(k, v)|
-        bug() unless k.instance_of?(ClassWrapper)
-        ary << "#{k.inspect} => #{inspect_method_return_value(v)}"
+        ary << "#{inspect_class_wrapper(k)} => #{inspect_method_return_value(v)}"
       end
       "{#{ary.join(",\n ")}}"
     end
 
-    def inspect_method_return_value(h)
-      bug() unless h.instance_of?(Hash)
-      '{' + h.map{|(mid, classes)|
-        bug() unless mid.instance_of?(Symbol)
-        bug() unless classes.instance_of?(Array)
-        "#{mid.inspect} => #{classes.inspect}"
-      }.join(', ') + '}'
-    end
-
     DIRECT_CALL_TARGETS = [
       [BasicObject, :initialize, :class],
       [BasicObject, :==, :class],
@@ -2452,6 +2442,24 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
 
     private
 
+    def inspect_class_wrapper(k)
+      bug() unless k.instance_of?(ClassWrapper)
+      k.singleton? ? "SingletonClassOf<#{k.to_s}>" : k.to_s
+    end
+
+    def inspect_class_wrappers(a)
+      bug() unless a.instance_of?(Array)
+      a.map{|k| inspect_class_wrapper(k)}.inspect
+    end
+
+    def inspect_method_return_value(h)
+      bug() unless h.instance_of?(Hash)
+      '{' + h.map{|(mid, classes)|
+        bug() unless mid.instance_of?(Symbol)
+        "#{mid.inspect} => #{inspect_class_wrappers(classes)}"
+      }.join(', ') + '}'
+    end
+
     def __ignore_configuration_of_variables(sign)
       deletes = []
       @ignore_configuration_of_variables.each do |(k, v)|

data/lib/cast_off/compile/dependency.rb

@@ -77,7 +77,7 @@ module CastOff
       end
 
       def self.singleton_method_depend?(obj, mid)
-        bug() unless obj.instance_of?(Class) || obj.instance_of?(Module)
+        bug() unless ClassWrapper.support?(obj, false)
         dep = @@singleton_method_dependency[obj]
         return false unless dep
         return false unless dep.include?(mid)
@@ -92,7 +92,7 @@ module CastOff
       end
 
       def self.singleton_method_strongly_depend?(obj, mid)
-        bug() unless obj.instance_of?(Class) || obj.instance_of?(Module)
+        bug() unless ClassWrapper.support?(obj, false)
         dep = @@singleton_method_strong_dependency[obj]
         dep.instance_of?(Array) ? dep.include?(mid) : false
       end
@@ -189,8 +189,10 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
         end
         s.class_eval do
           def override_singleton_method(obj, mid, flag)
+            CastOff.dlog("singleton method added #{obj}.#{mid}")
+            CastOff.delete_original_singleton_method_iseq(self, mid)
             if initializers = Dependency.singleton_method_depend?(obj, mid)
-              if Dependency.singleton_method_strongly_depend?(obj, mid)
+              if Dependency.singleton_method_strongly_depend?(obj, mid) && !CastOff.method_replacing?
                 raise(ExecutionError.new("Should not be override #{obj}.#{mid}"))
               end
               # TODO Array.each の上書きチェック
@@ -202,8 +204,10 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
           end
 
           def override_method(obj, mid, flag)
+            CastOff.dlog("method added #{obj}##{mid}")
+            CastOff.delete_original_instance_method_iseq(self, mid)
             if initializers = Dependency.instance_method_depend?(obj, mid)
-              if Dependency.instance_method_strongly_depend?(obj, mid)
+              if Dependency.instance_method_strongly_depend?(obj, mid) && !CastOff.method_replacing?
                 raise(ExecutionError.new("Should not be override #{obj}##{mid}"))
               end
               # TODO Array.each の上書きチェック
@@ -214,69 +218,79 @@ 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).unbind
           rescue NameError
             singleton_method_added = nil
           end
+
           begin
             method_added = o.method(:method_added).unbind
           rescue NameError
             method_added = nil
           end
-          define_method(:method_added) do |mid|
-            if self == o && !Dependency.ignore_overridden?(self, mid)
-              if Dependency.singleton_method_added?
-                CastOff.dlog("singleton method added #{o}.#{mid}")
-                CastOff.delete_original_singleton_method_iseq(self, mid)
+
+          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(:method_added) do |*args|
+            ignore_overridden_p = Dependency.ignore_overridden?
+            current_mid = CastOff.current_method_id
+            case current_mid
+            when :extend, :include
+              mods = args
+              extend_p = current_mid == :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
+            when :singleton_method_added
+              mid = args.first
+              CastOff.bug() unless mid.instance_of?(Symbol)
+              if self == o && !ignore_overridden_p
                 override_singleton_method(o, mid, :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)
+              elsif o == Module && singleton_method_added
+                singleton_method_added.bind(self).call(mid)
+              end
+              super(mid) rescue NoMethodError
+            when :method_added
+              mid = args.first
+              CastOff.bug() unless mid.instance_of?(Symbol)
+              if self == o && !ignore_overridden_p
                 override_method(o, mid, :added)
                 method_added.bind(self).call(mid) if method_added
+              elsif o == Module && method_added
+                method_added.bind(self).call(mid)
               end
-            elsif o == BasicObject && method_added && !Dependency.singleton_method_added?
-              method_added.bind(self).call(mid)
+              super(mid) rescue NoMethodError
+            else
+              raise(ExecutionError.new("CastOff expected include, extend, method_added or singleton_method_added but #{current_mid} was called"))
             end
-            super(mid) rescue NoMethodError
           end
+          alias extend method_added
+          alias include method_added
           alias singleton_method_added method_added
           CastOff.dlog("hook #{o}")
         end
         @@singleton_method_dependency[o] ||= []
-        @@singleton_method_dependency[o] |= [:method_added, :singleton_method_added, :include]
+        @@singleton_method_dependency[o] |= [:method_added, :singleton_method_added, :include, :extend]
         @@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]
+        @@singleton_method_strong_dependency[o] |= [:method_added, :singleton_method_added, :include, :extend]
       end
 
       def hook(function_pointer_initializer)
@@ -286,7 +300,7 @@ Currently, CastOff doesn't support object, which cannot marshal dump (e.g. STDIN
             m.each{|mid| self.class.singleton_method_depend(klass, mid, function_pointer_initializer)}
             m.each{|mid| self.class.singleton_method_strongly_depend(klass, mid) if @strong_dependency.include?([klass, mid])}
             o = klass.contain_object
-            bug() unless o.instance_of?(Class) || o.instance_of?(Module)
+            bug() unless ClassWrapper.support?(o, false)
           else
             m.each{|mid| self.class.instance_method_depend(klass, mid, function_pointer_initializer)}
             m.each{|mid| self.class.instance_method_strongly_depend(klass, mid) if @strong_dependency.include?([klass, mid])}

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

@@ -1854,13 +1854,17 @@ You should not use #{@method_id} method in compilation target of CastOff.
             bug() if !can_unbox_result && @return_value.unboxed?
             suffix << (@return_value.unboxed? ? unboxed_decl(@return_value) : 'VALUE')
             suffix = suffix.join('_')
+            @dependency.add(klass, @method_id, true)
             return "  #{@return_value} = cast_off_inline_#{klass.to_s.downcase}_#{name}_#{suffix}(#{recv}#{s_param});"
           else
+            @dependency.add(klass, @method_id, true)
             return "  #{@return_value} = cast_off_inline_#{klass.to_s.downcase}_#{name}(#{recv}#{s_param});"
           end
         else
           m = SpecializeTable1[[mid, argc, MethodWrapper.new(klass, mid)]]
-          return m ? __send__(m, klass, mid, argc, recv, param) : false
+          return false unless m
+          @dependency.add(klass, @method_id, true)
+          return __send__(m, klass, mid, argc, recv, param)
         end
         bug()
       end
@@ -1923,42 +1927,32 @@ You should not use #{@method_id} method in compilation target of CastOff.
         bug()
       end
 
-      def recursive_call_class?(klass, mid)
+      def recursive_call?(klass)
         same_class = false
         bug() unless klass.is_a?(ClassWrapper)
         if @translator.reciever_class && @translator.reciever_class.include?(klass)
           same_class = true
         end
-        if same_class && mid == @translator.mid
+        if same_class && @method_id == @translator.mid
           true
         else
           false
         end
       end
 
-      def recursive_call_var?(recv, mid)
-        same_class = false
-        if @translator.reciever_class && @translator.reciever_class.size() == 1
-          same_class = true if recv.is_just?(@translator.reciever_class[0])
-        end
-        recv_defn = param_irs.first.get_definition(recv)
-        if recv_defn.size == 1 && (@translator.inline_block? || @insn.iseq.root?)
-          recv_defn = recv_defn.first
-          same_class |= recv_defn.is_a?(SubIR) && recv_defn.src.is_a?(Self)
-        end
-        if same_class && mid == @translator.mid
-          true
-        else
-          false
-        end
+      def recursive_call_depend(recv)
+        bug() if recv.dynamic?
+        classes = recv.types
+        classes.each{|klass| @dependency.add(klass, @method_id, true)}
       end
 
       def recursive_call_code(recv, param, argc)
-        return funcall_code(nil, @translator.allocate_id(@method_id), recv, param, @argc) if !@translator.inline_block?
+        return nil if !@translator.inline_block?
         fname = @translator.this_function_name()
         if @translator.complex_call?
           if splatcall?
             call_code = "#{@return_value} = #{fname}(argc, argv, #{recv});"
+            recursive_call_depend(recv)
             return SPLATCALL_TEMPLATE_ARGV.trigger(binding)
           else
             ret = ""
@@ -1966,18 +1960,21 @@ You should not use #{@method_id} method in compilation target of CastOff.
             param.each_with_index do |arg, i|
               ret += "  #{c_ary}[#{i}] = #{arg};\n"
             end
+            recursive_call_depend(recv)
             return ret + "  #{@return_value} = #{fname}(#{argc - 1}, #{c_ary}, #{recv});"
           end
         else
           if splatcall?
             splat_call_argc = @translator.root_iseq.args.arg_size
             fnam_code = fname
+            recursive_call_depend(recv)
             return SPLATCALL_TEMPLATE_CFUNC.trigger(binding)
           else
             if param.size == @translator.root_iseq.args.arg_size
+              recursive_call_depend(recv)
               return "  #{@return_value} = #{fname}(#{recv}#{param.empty? ? nil : ", #{param.join(", ")}"});"
             else
-              return funcall_code(nil, @translator.allocate_id(@method_id), recv, param, @argc) 
+              return nil
             end
           end
         end
@@ -2043,6 +2040,8 @@ You should not use #{@method_id} method in compilation target of CastOff.
 
       def not_funcall_code(klass, mid, recv, param, argc)
         bug() unless klass.is_a?(ClassWrapper)
+        code = recursive_call_code(recv, param, argc) if recursive_call?(klass)
+        return code if code
         case klass.get_method_type(mid)
         when :cfunc
           cfunc_argc = klass.get_cfunc_argc(mid)
@@ -2062,7 +2061,7 @@ You should not use #{@method_id} method in compilation target of CastOff.
           @dependency.add(klass, mid, false)
           return "  #{@return_value} = rb_attr_get(#{recv}, #{@translator.allocate_id(klass.get_attr_id(mid))});"
         when false
-          return recursive_call_class?(klass, mid) ? recursive_call_code(recv, param, argc) : nil
+          return nil
         end
         bug()
       end
@@ -2083,8 +2082,6 @@ You should not use #{@method_id} method in compilation target of CastOff.
           if @configuration.force_dispatch_method?
             # ユーザからの指定に基づいているので、Suggestion は吐かない
             ret << funcall_code(nil, id, recv, param, @argc)
-          elsif recursive_call_var?(recv, @method_id)
-            ret << recursive_call_code(recv, param, @argc)
           else
             if @configuration.development? && @source
               @translator.add_type_suggestion([get_definition_str(recv), @method_id.to_s, @source_line, @source])

data/lib/cast_off/compile/translator.rb

@@ -46,6 +46,7 @@ static VALUE rb_cCastOffSingletonClass;
 static VALUE rb_cCastOffConfiguration;
 static VALUE rb_cCastOffClassWrapper;
 static VALUE rb_cCastOffMethodWrapper;
+static VALUE oMain, cMain;
 
 #include "vm_api.h"
 #include "iter_api.h"
@@ -97,7 +98,7 @@ static void sampling_variable(VALUE val, VALUE sym)
   hash = RHASH_TBL(hashval);
 
   if (FL_TEST(klass, FL_SINGLETON)) {
-    if (rb_obj_class(val) == rb_cClass || rb_obj_class(val) == rb_cModule) {
+    if (rb_obj_class(val) == rb_cClass || rb_obj_class(val) == rb_cModule || val == oMain) {
       klass = val;
       singleton_class_or_module_obj_p = Qtrue;
     } else {
@@ -127,7 +128,7 @@ static void __sampling_poscall(VALUE val, VALUE method_klass, VALUE method_id)
   if (FL_TEST(method_klass, FL_SINGLETON)) {
     VALUE recv = rb_ivar_get(method_klass, rb_intern("__attached__"));
     if (rb_class_of(recv) == method_klass) {
-      if ((rb_obj_class(recv) == rb_cClass || rb_obj_class(recv) == rb_cModule)) {
+      if ((rb_obj_class(recv) == rb_cClass || rb_obj_class(recv) == rb_cModule) || recv == oMain) {
         method_klass = recv;
         class_method_or_module_function_p = Qtrue;
       } else {
@@ -190,7 +191,7 @@ static void sampling_poscall(VALUE val, VALUE recv, VALUE method_id)
 %end
 
 %@fptr.each do |(k, fps)|
-%  kids, mid, singleton, convention, argc = k
+%  name, mid, singleton, convention, argc = k
 %  mid = allocate_id(mid)
 %  fps.each do |fp|
 
@@ -324,12 +325,19 @@ static VALUE cast_off_initialize_fptr_<%= signiture() %>(VALUE dummy)
   feval = me->def->body.cfunc.func;
 
 %@fptr.each do |(k, v)|
-%  kids, mid, singleton, convention, argc = k
+%  name, mid, singleton, convention, argc = k
 %  mid = allocate_id(mid)
 %  fps = v
+%  case name
+%  when Symbol
+  klass = <%= name %>;
+%  when Array
   klass = rb_cObject;
-%  kids.each do |kid|
+%    name.each do |kid|
   klass = rb_const_get(klass, rb_intern("<%= kid %>"));
+%    end
+%  else
+%    bug()
 %  end
 %  if singleton
   should_be_singleton(klass);
@@ -734,6 +742,8 @@ void Init_<%= signiture() %>(void)
   rb_cCastOffConfiguration = rb_const_get(rb_mCastOffCompiler, rb_intern("Configuration"));
   rb_cCastOffClassWrapper = rb_const_get(rb_mCastOffCompiler, rb_intern("ClassWrapper"));
   rb_cCastOffMethodWrapper = rb_const_get(rb_mCastOffCompiler, rb_intern("MethodWrapper"));
+  oMain = rb_const_get(rb_mCastOffCompiler, rb_intern("MAIN"));
+  cMain = rb_class_of(oMain);
 
 %if !@mid
   rb_define_method(rb_mCastOffCompiler, "<%= signiture() %>", <%= this_function_name() %>, 1);
@@ -898,9 +908,14 @@ Source line is #{@root_iseq.source_line}.
       suffix = klass.singleton? ? 'singleton' : 'instance'
       fptr = "fptr_#{klass}_#{@namespace.new(mid).name}_#{suffix}"
       fptr.gsub!(/:/, '_')
-      ids = klass.to_s.split("::")
-      ids.each{|k| bug() if k == ''}
-      key = [ids, mid, klass.singleton?, convention, argc]
+      name = C_CLASS_MAP[klass]
+      unless name
+        path = klass.to_s
+        bug() if path == "::main"
+        name = path.split("::")
+        name.each{|k| bug() if k == ''}
+      end
+      key = [name, mid, klass.singleton?, convention, argc]
       entry = @fptr[key] || []
       fptr.concat("_#{argc}_#{entry.size}")
       entry << fptr
@@ -961,6 +976,7 @@ Source line is #{@root_iseq.source_line}.
     end
 
     def prefetch_constant(var, path, singleton_p)
+      bug() if path == "::main"
       if @prefetch_constants[var]
         bug() unless @prefetch_constants[var] == [path, singleton_p]
       else
@@ -1008,6 +1024,7 @@ Source line is #{@root_iseq.source_line}.
       ClassWrapper.new(Enumerator, true)     => :rb_cEnumerator,
       ClassWrapper.new(Fiber, true)          => :rb_cFiber,
       ClassWrapper.new(Data, true)           => :rb_cData,
+      ClassWrapper.new(MAIN, false)          => :cMain,
       #ClassWrapper.new(Generator, true)     => :rb_cGenerator,
       #ClassWrapper.new(Continuation, true)  => :rb_cContinuation,
       #ClassWrapper.new(ISeq, true)          => :rb_cISeq,

data/lib/cast_off/compile.rb

@@ -48,8 +48,7 @@ module CastOff
       true
     end
 
-    def load(force = false)
-      return @@autoload_proc.call() if autoload_running? && !force
+    def load()
       compiled = CodeManager.load_autocompiled()
       return false unless compiled
       __load(compiled)
@@ -174,7 +173,7 @@ module CastOff
         load_binary(manager, configuration, suggestion, iseq)
         t = override_target(target, mid)
         dlog("override target of #{target}##{mid} is #{t}")
-        __send__("register_method_#{manager.signiture}", t)
+        replace_method(t, manager, false)
         @@original_instance_method_iseq[[t, mid]] = iseq
         @@manager_table[manager.signiture] = manager
       end
@@ -194,7 +193,7 @@ module CastOff
         manager.compilation_target_is_a(obj, mid, true)
         set_direct_call(obj, mid, :singleton, manager, configuration)
         load_binary(manager, configuration, suggestion, iseq)
-        __send__("register_singleton_method_#{manager.signiture}", obj)
+        replace_method(obj, manager, true)
         @@original_singleton_method_iseq[[obj, mid]] = iseq
         @@manager_table[manager.signiture] = manager
       end
@@ -231,6 +230,10 @@ module CastOff
       !!Thread.current[COMPILER_RUNNING_KEY]
     end
 
+    def method_replacing?
+      !!Thread.current[METHOD_REPLACING_KEY]
+    end
+
     private
 
     COMPILER_RUNNING_KEY = :CastOffCompilerRunning
@@ -238,6 +241,11 @@ module CastOff
       Thread.current[COMPILER_RUNNING_KEY] = bool
     end
 
+    METHOD_REPLACING_KEY = :CastOffMethodReplacing
+    def method_replacing(bool)
+      Thread.current[METHOD_REPLACING_KEY] = bool
+    end
+
     Lock = Mutex.new()
     def execute_no_hook()
       bug() unless block_given?
@@ -409,6 +417,7 @@ Currently, CastOff cannot compile method which source file is not exist.
       manager.compile_c_source(c_source, conf, dep)
       manager.save_annotation(annotation)
       manager.dump_development_mark(conf)
+      manager.loadable()
       conf
     end
 
@@ -483,11 +492,11 @@ Currently, CastOff cannot compile method which source file is not exist.
         end
       end
     end
-    Module.class_eval do
-      define_method(:autoload) do |*args|
-        raise(ExecutionError.new("Currently, CastOff doesn't support Module#autoload"))
-      end
-    end
+    #Module.class_eval do
+      #define_method(:autoload) do |*args|
+        #raise(ExecutionError.new("Currently, CastOff doesn't support Module#autoload"))
+      #end
+    #end
     Kernel.module_eval do
       def set_trace_func(*args, &p)
         raise(ExecutionError.new("Currently, CastOff doesn't support set_trace_func"))
@@ -648,7 +657,7 @@ Currently, CastOff cannot compile method which source file is not exist.
           bug() unless mtbl.is_a?(Hash)
           bug() unless val0.is_a?(Hash)
           val0.each do |(klass, midtbl)|
-            bug() unless klass.is_a?(Class) || (klass.is_a?(Module) && sym == :singleton_methods)
+            bug() unless ClassWrapper.support?(klass, sym == :instance_methods)
             bug() unless midtbl.is_a?(Hash)
             newval = {}
             midtbl.each do |(key1, val1)|
@@ -707,14 +716,8 @@ Currently, CastOff cannot compile method which source file is not exist.
               val0.each do |(klass, singleton_p)|
                 kstr = klass.to_s
                 if singleton_p
-                  case klass # 変数名が klass だとわかりにくいので、変更すること
-                  when Class
-                    kstr = "Class<#{kstr}>"
-                  when Module
-                    kstr = "Module<#{kstr}>"
-                  else
-                    bug()
-                  end
+                  bug() unless ClassWrapper.support?(klass, false)
+                  kstr = "SingletonClassOf<#{kstr}>"
                 end
                 ary << [key0.to_s, kstr]
               end
@@ -728,20 +731,14 @@ Currently, CastOff cannot compile method which source file is not exist.
               bug() unless sym == :singleton_methods || sym == :instance_methods
               bug() unless mtbl.is_a?(Hash)
               mtbl.each do |key0, val0|
-                bug() unless key0.is_a?(Class) || (key0.is_a?(Module) && sym == :singleton_methods)
+                bug() unless ClassWrapper.support?(key0, sym == :instance_methods)
                 bug() unless val0.is_a?(Hash)
                 val0.each do |(mid, classes)|
                   classes.each do |(klass, singleton_p)|
                     kstr = klass.to_s
                     if singleton_p
-                      case klass # 変数名が klass だとわかりにくいので、変更すること
-                      when Class
-                        kstr = "Class<#{kstr}>"
-                      when Module
-                        kstr = "Module<#{kstr}>"
-                      else
-                        bug()
-                      end
+                      bug() unless ClassWrapper.support?(klass, false)
+                      kstr = "SingletonClassOf<#{kstr}>"
                     end
                     ary << ["#{key0}#{sym == :singleton_methods ? '.' : '#'}#{mid}", kstr]
                   end
@@ -771,6 +768,16 @@ Currently, CastOff cannot compile method which source file is not exist.
       end
     end
 
+    def replace_method(target, manager, singleton_p)
+      begin
+        method_replacing(true)
+        mid = "register#{singleton_p ? '_singleton_' : '_'}method_#{manager.signiture}"
+        __send__(mid, target)
+      ensure
+        method_replacing(false)
+      end
+    end
+
     def set_direct_call(obj, mid, type, manager, configuration)
       bug() unless configuration
       return if configuration.use_method_frame?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cast_off
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000 Z
+date: 2011-12-04 00:00:00.000000000 Z
 dependencies: []
 description: ! 'CastOff is a compiler for Ruby1.9.3.
 
@@ -23,9 +23,7 @@ executables:
 - cast_off
 extensions:
 - ext/cast_off/extconf.rb
-extra_rdoc_files:
-- README
-- README.en
+extra_rdoc_files: []
 files:
 - lib/cast_off.rb
 - lib/cast_off/compile.rb
@@ -96,10 +94,11 @@ files:
 - ext/cast_off/ruby_source/1.9.2/vm_insnhelper.c
 - ext/cast_off/ruby_source/1.9.2/vm_core.h
 - ext/cast_off/ruby_source/1.9.2/eval_intern.h
+- bin/cast_off
+- doc/about.pdf
 - cast_off.gemspec
-- README
 - README.en
-- bin/cast_off
+- README
 homepage: http://github.com/soba1104/CastOff
 licenses: []
 post_install_message: