diff options
| -rw-r--r-- | src/class.c | 4 | ||||
| -rw-r--r-- | test/assert.rb | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/class.c b/src/class.c index 2be56a004..d6a120f2f 100644 --- a/src/class.c +++ b/src/class.c @@ -2200,9 +2200,9 @@ mrb_init_class(mrb_state *mrb) mrb_define_method(mrb, bob, "==", mrb_obj_equal_m, MRB_ARGS_REQ(1)); /* 15.3.1.3.1 */ mrb_define_method(mrb, bob, "!=", mrb_obj_not_equal_m, MRB_ARGS_REQ(1)); mrb_define_method(mrb, bob, "__id__", mrb_obj_id_m, MRB_ARGS_NONE()); /* 15.3.1.3.4 */ - mrb_define_method(mrb, bob, "__send__", mrb_f_send, MRB_ARGS_ANY()); /* 15.3.1.3.5 */ + mrb_define_method(mrb, bob, "__send__", mrb_f_send, MRB_ARGS_REQ(1)|MRB_ARGS_REST()|MRB_ARGS_BLOCK()); /* 15.3.1.3.5 */ mrb_define_method(mrb, bob, "equal?", mrb_obj_equal_m, MRB_ARGS_REQ(1)); /* 15.3.1.3.11 */ - mrb_define_method(mrb, bob, "instance_eval", mrb_obj_instance_eval, MRB_ARGS_ANY()); /* 15.3.1.3.18 */ + mrb_define_method(mrb, bob, "instance_eval", mrb_obj_instance_eval, MRB_ARGS_OPT(1)|MRB_ARGS_BLOCK()); /* 15.3.1.3.18 */ mrb_define_class_method(mrb, cls, "new", mrb_class_new_class, MRB_ARGS_OPT(1)); mrb_define_method(mrb, cls, "allocate", mrb_instance_alloc, MRB_ARGS_NONE()); diff --git a/test/assert.rb b/test/assert.rb index 32dd4ddc6..9b04f5b48 100644 --- a/test/assert.rb +++ b/test/assert.rb @@ -208,6 +208,13 @@ def assert_nil(obj, msg = nil) assert_true(ret, msg, diff) end +def assert_not_nil(obj, msg = nil) + if ret = obj.nil? + diff = " Expected #{obj.inspect} to not be nil." + end + assert_false(ret, msg, diff) +end + def assert_include(*args); _assert_include(true, *args) end def assert_not_include(*args); _assert_include(false, *args) end def _assert_include(affirmed, collection, obj, msg = nil) |