summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-03-21 23:02:56 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-03-21 23:02:56 +0900
commit9bf983ae02b66c6acbae3768e26dedd41847ae6d (patch)
treed03a7a906f01d602211853ec1e09453bcafc3204 /src
parent041b5a9f67b73fcc08aa41dedc5c4ba4e63c701d (diff)
parent01162ce812e57760bca76878f972a3883e942fef (diff)
downloadmruby-9bf983ae02b66c6acbae3768e26dedd41847ae6d.tar.gz
mruby-9bf983ae02b66c6acbae3768e26dedd41847ae6d.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src')
-rw-r--r--src/class.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/class.c b/src/class.c
index 30d376648..e73a28c56 100644
--- a/src/class.c
+++ b/src/class.c
@@ -612,6 +612,9 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
*p = (mrb_int)f;
}
break;
+ case MRB_TT_STRING:
+ mrb_raise(mrb, E_TYPE_ERROR, "String can't be coerced into int");
+ break;
default:
*p = mrb_fixnum(mrb_Integer(mrb, *sp));
break;