summaryrefslogtreecommitdiffhomepage
path: root/src/kernel.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-07-27 02:53:02 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2013-07-27 02:53:02 +0900
commite488393cbbdd4fd123d71c6c3bd067f1eee5c37a (patch)
treebcdb115f19288cfb5f4af14493c350233b29350f /src/kernel.c
parent63e5a3cfb10e238eaab2a77bcc83acd0d41e60fa (diff)
parentf6d686eae0fce7d93426e0eb188cdc9658dfee75 (diff)
downloadmruby-e488393cbbdd4fd123d71c6c3bd067f1eee5c37a.tar.gz
mruby-e488393cbbdd4fd123d71c6c3bd067f1eee5c37a.zip
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src/kernel.c')
-rw-r--r--src/kernel.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/kernel.c b/src/kernel.c
index eb123b51e..ce3aa89f0 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -4,8 +4,6 @@
** See Copyright Notice in mruby.h
*/
-#include <assert.h>
-
#include "mruby.h"
#include "mruby/array.h"
#include "mruby/class.h"
@@ -573,12 +571,13 @@ get_valid_iv_sym(mrb_state *mrb, mrb_value iv_name)
{
mrb_sym iv_name_id;
+ mrb_assert(mrb_symbol_p(iv_name) || mrb_string_p(iv_name));
+
if (mrb_string_p(iv_name)) {
iv_name_id = mrb_intern_cstr(mrb, RSTRING_PTR(iv_name));
valid_iv_name(mrb, iv_name_id, RSTRING_PTR(iv_name), RSTRING_LEN(iv_name));
}
else {
- assert(mrb_symbol_p(iv_name));
iv_name_id = mrb_symbol(iv_name);
check_iv_name(mrb, iv_name_id);
}