modules/mruby/src/object.c in webruby-0.2.4 vs modules/mruby/src/object.c in webruby-0.2.5

@@ -291,18 +291,29 @@
   mrb_define_method(mrb, f, "|",    false_or,       MRB_ARGS_REQ(1));  /* 15.2.6.3.4  */
   mrb_define_method(mrb, f, "inspect", false_to_s,  MRB_ARGS_NONE());
 }
 
 static mrb_value
+inspect_type(mrb_state *mrb, mrb_value val)
+{
+  if (mrb_type(val) == MRB_TT_FALSE || mrb_type(val) == MRB_TT_TRUE) {
+    return mrb_inspect(mrb, val);
+  }
+  else {
+    return mrb_str_new_cstr(mrb, mrb_obj_classname(mrb, val));
+  }
+}
+
+static mrb_value
 convert_type(mrb_state *mrb, mrb_value val, const char *tname, const char *method, int raise)
 {
   mrb_sym m = 0;
 
   m = mrb_intern_cstr(mrb, method);
   if (!mrb_respond_to(mrb, val, m)) {
     if (raise) {
-      mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %S into %S", val, mrb_str_new_cstr(mrb, tname));
+      mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %S into %S", inspect_type(mrb, val), mrb_str_new_cstr(mrb, tname));
       return mrb_nil_value();
     }
     else {
       return mrb_nil_value();
     }
@@ -497,11 +508,12 @@
   mrb_value v;
 
   if (mrb_fixnum_p(val)) return val;
   v = convert_type(mrb, val, "Integer", method, TRUE);
   if (!mrb_obj_is_kind_of(mrb, v, mrb->fixnum_class)) {
+    mrb_value type = inspect_type(mrb, val);
     mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %S to Integer (%S#%S gives %S)",
-               val, val, mrb_str_new_cstr(mrb, method), v);
+               type, type, mrb_str_new_cstr(mrb, method), inspect_type(mrb, v));
   }
   return v;
 }
 
 mrb_value