Merge branch 'fix-type-error-message' of https://github.com/h2so5/mruby into h2so5-fix-type-error-message

2 files changed, 6 insertions, 4 deletions

diff --git a/mrbgems/mruby-array-ext/mrblib/array.rb b/mrbgems/mruby-array-ext/mrblib/array.rb
index b3ff9bfca..65ea717d2 100644
--- a/mrbgems/mruby-array-ext/mrblib/array.rb
+++ b/mrbgems/mruby-array-ext/mrblib/array.rb
@@ -20,7 +20,7 @@ class Array
   end
 
   def -(elem)
-    raise TypeError, "can't convert to Array" unless elem.class == Array
+    raise TypeError, "can't convert #{elem.class.to_s} into Array" unless elem.class == Array
 
     hash = {}
     array = []
@@ -30,14 +30,14 @@ class Array
   end
 
   def |(elem)
-    raise TypeError, "can't convert to Array" unless elem.class == Array
+    raise TypeError, "can't convert #{elem.class.to_s} into Array" unless elem.class == Array
 
     ary = self + elem
     ary.uniq! or ary
   end
 
   def &(elem)
-    raise TypeError, "can't convert to Array" unless elem.class == Array
+    raise TypeError, "can't convert #{elem.class.to_s} into Array" unless elem.class == Array
 
     hash = {}
     array = []
diff --git a/src/object.c b/src/object.c
index 23786e859..9625137f2 100644
--- a/src/object.c
+++ b/src/object.c
@@ -305,7 +305,9 @@ convert_type(mrb_state *mrb, mrb_value val, const char *tname, const char *metho
   m = mrb_intern(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));
+      const char *cname = mrb_obj_classname(mrb, val);
+      mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %S into %S",
+                 mrb_str_new_cstr(mrb, cname), mrb_str_new_cstr(mrb, tname));
       return mrb_nil_value();
     }
     else {