From 78b0abcfafa06d04c814015ac51dad87443a88bc Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Thu, 11 Apr 2013 23:11:43 +0900 Subject: string interpolation (#{foo}) does stringify implicitly; no need to call #to_s --- mrbgems/mruby-array-ext/mrblib/array.rb | 6 +++--- src/object.c | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mrbgems/mruby-array-ext/mrblib/array.rb b/mrbgems/mruby-array-ext/mrblib/array.rb index 65ea717d2..9aacfc3dc 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 #{elem.class.to_s} into Array" unless elem.class == Array + raise TypeError, "can't convert #{elem.class} into Array" unless elem.class == Array hash = {} array = [] @@ -30,14 +30,14 @@ class Array end def |(elem) - raise TypeError, "can't convert #{elem.class.to_s} into Array" unless elem.class == Array + raise TypeError, "can't convert #{elem.class} into Array" unless elem.class == Array ary = self + elem ary.uniq! or ary end def &(elem) - raise TypeError, "can't convert #{elem.class.to_s} into Array" unless elem.class == Array + raise TypeError, "can't convert #{elem.class} into Array" unless elem.class == Array hash = {} array = [] diff --git a/src/object.c b/src/object.c index 9625137f2..23786e859 100644 --- a/src/object.c +++ b/src/object.c @@ -305,9 +305,7 @@ 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) { - 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)); + mrb_raisef(mrb, E_TYPE_ERROR, "can't convert %S into %S", val, mrb_str_new_cstr(mrb, tname)); return mrb_nil_value(); } else { -- cgit v1.2.3