1 files changed, 53 insertions, 25 deletions

diff --git a/mrbgems/mruby-object-ext/src/object.c b/mrbgems/mruby-object-ext/src/object.c
index 0dcc3cba7..69f1763ce 100644
--- a/mrbgems/mruby-object-ext/src/object.c
+++ b/mrbgems/mruby-object-ext/src/object.c
@@ -1,6 +1,9 @@
-#include "mruby.h"
-#include "mruby/array.h"
-#include "mruby/class.h"
+#include <mruby.h>
+#include <mruby/array.h>
+#include <mruby/class.h>
+#include <mruby/hash.h>
+#include <mruby/proc.h>
+#include <mruby/presym.h>
 
 /*
  *  call-seq:
@@ -12,9 +15,10 @@
 static mrb_value
 nil_to_a(mrb_state *mrb, mrb_value obj)
 {
-    return mrb_ary_new(mrb);
+  return mrb_ary_new(mrb);
 }
 
+#ifndef MRB_NO_FLOAT
 /*
  *  call-seq:
  *     nil.to_f    -> 0.0
@@ -25,7 +29,21 @@ nil_to_a(mrb_state *mrb, mrb_value obj)
 static mrb_value
 nil_to_f(mrb_state *mrb, mrb_value obj)
 {
-    return mrb_float_value(mrb, 0.0);
+  return mrb_float_value(mrb, 0.0);
+}
+#endif
+
+/*
+ *  call-seq:
+ *     nil.to_h    -> {}
+ *
+ *  Always returns an empty hash.
+ */
+
+static mrb_value
+nil_to_h(mrb_state *mrb, mrb_value obj)
+{
+  return mrb_hash_new(mrb);
 }
 
 /*
@@ -38,7 +56,23 @@ nil_to_f(mrb_state *mrb, mrb_value obj)
 static mrb_value
 nil_to_i(mrb_state *mrb, mrb_value obj)
 {
-    return mrb_fixnum_value(0);
+  return mrb_fixnum_value(0);
+}
+
+/*
+ *  call-seq:
+ *     obj.itself -> an_object
+ *
+ *  Returns <i>obj</i>.
+ *
+ *      string = 'my string' #=> "my string"
+ *      string.itself.object_id == string.object_id #=> true
+ *
+ */
+static mrb_value
+mrb_f_itself(mrb_state *mrb, mrb_value self)
+{
+  return self;
 }
 
 /*
@@ -62,29 +96,18 @@ nil_to_i(mrb_state *mrb, mrb_value obj)
 static mrb_value
 mrb_obj_instance_exec(mrb_state *mrb, mrb_value self)
 {
-  mrb_value *argv;
+  const mrb_value *argv;
   mrb_int argc;
   mrb_value blk;
   struct RClass *c;
 
-  mrb_get_args(mrb, "*&", &argv, &argc, &blk);
-
-  if (mrb_nil_p(blk)) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "no block given");
-  }
-
-  switch (mrb_type(self)) {
-  case MRB_TT_SYMBOL:
-  case MRB_TT_FIXNUM:
-  case MRB_TT_FLOAT:
-    c = NULL;
-    break;
-  default:
-    c = mrb_class_ptr(mrb_singleton_class(mrb, self));
-    break;
+  mrb_get_args(mrb, "*&!", &argv, &argc, &blk);
+  c = mrb_singleton_class_ptr(mrb, self);
+  if (mrb->c->ci->cci > 0) {
+    return mrb_yield_with_class(mrb, blk, argc, argv, self, c);
   }
-
-  return mrb_yield_with_class(mrb, blk, argc, argv, self, c);
+  mrb_vm_ci_target_class_set(mrb->c->ci, c);
+  return mrb_yield_cont(mrb, blk, self, argc, argv);
 }
 
 void
@@ -93,10 +116,15 @@ mrb_mruby_object_ext_gem_init(mrb_state* mrb)
   struct RClass * n = mrb->nil_class;
 
   mrb_define_method(mrb, n, "to_a", nil_to_a,       MRB_ARGS_NONE());
+#ifndef MRB_NO_FLOAT
   mrb_define_method(mrb, n, "to_f", nil_to_f,       MRB_ARGS_NONE());
+#endif
+  mrb_define_method(mrb, n, "to_h", nil_to_h,       MRB_ARGS_NONE());
   mrb_define_method(mrb, n, "to_i", nil_to_i,       MRB_ARGS_NONE());
 
-  mrb_define_method(mrb, mrb->object_class, "instance_exec", mrb_obj_instance_exec, MRB_ARGS_ANY() | MRB_ARGS_BLOCK());
+  mrb_define_method(mrb, mrb->kernel_module, "itself", mrb_f_itself, MRB_ARGS_NONE());
+
+  mrb_define_method(mrb, mrb_class_get_id(mrb, MRB_SYM(BasicObject)), "instance_exec", mrb_obj_instance_exec, MRB_ARGS_ANY() | MRB_ARGS_BLOCK());
 }
 
 void