admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2013-04-11 23:06:50 +09:00
parent cf7fb8819f 1f571dd5fc
commit f7313b6082
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-array-ext/mrblib/array.rb
+3 -3
View File
@@ -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 = []
src/object.c
+3 -1
View File
@@ -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 {