1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* eval.c (method_call): check receiver is defined.

Browse Source 
* eval.c (umethod_call): removed.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2002-08-23 15:01:13 +00:00
parent cb8f50c4b5
commit de6c650f44
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Aug 23 23:59:57 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* eval.c (method_call): check receiver is defined.
* eval.c (umethod_call): removed.
Fri Aug 23 17:06:48 2002 WATANABE Hirofumi <eban@ruby-lang.org> Fri Aug 23 17:06:48 2002 WATANABE Hirofumi <eban@ruby-lang.org>
* configure.in: RUBY_SO_NAME is msvcrt-rubyXX on mswin32/mingw32. * configure.in: RUBY_SO_NAME is msvcrt-rubyXX on mswin32/mingw32.

17
eval.c
View File

@ -6914,6 +6914,9 @@ method_call(argc, argv, method)
volatile int safe = ruby_safe_level; volatile int safe = ruby_safe_level;
Data_Get_Struct(method, struct METHOD, data); Data_Get_Struct(method, struct METHOD, data);
if (data->recv == Qundef) {
rb_raise(rb_eTypeError, "you cannot call unbound method; bind first");
}
PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT); PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
PUSH_TAG(PROT_NONE); PUSH_TAG(PROT_NONE);
if (OBJ_TAINTED(method) && ruby_safe_level < 4) { if (OBJ_TAINTED(method) && ruby_safe_level < 4) {
@ -6929,16 +6932,6 @@ method_call(argc, argv, method)
return result; return result;
} }
static VALUE
umethod_call(argc, argv, method)
int argc;
VALUE *argv;
VALUE method;
{
rb_raise(rb_eTypeError, "you cannot call unbound method; bind first");
return Qnil; /* not reached */
}
static VALUE static VALUE
umethod_bind(method, recv) umethod_bind(method, recv)
VALUE method, recv; VALUE method, recv;
@ -7078,7 +7071,7 @@ static VALUE
umcall(args, method) umcall(args, method)
VALUE args, method; VALUE args, method;
{ {
return umethod_call(0, 0, method); return method_call(0, 0, method);
} }
VALUE VALUE
@ -7212,8 +7205,6 @@ Init_Proc()
rb_define_method(rb_mKernel, "method", rb_obj_method, 1); rb_define_method(rb_mKernel, "method", rb_obj_method, 1);
rb_cUnboundMethod = rb_define_class("UnboundMethod", rb_cMethod); rb_cUnboundMethod = rb_define_class("UnboundMethod", rb_cMethod);
rb_define_method(rb_cUnboundMethod, "call", umethod_call, -1);
rb_define_method(rb_cUnboundMethod, "[]", umethod_call, -1);
rb_define_method(rb_cUnboundMethod, "to_proc", umethod_proc, 0); rb_define_method(rb_cUnboundMethod, "to_proc", umethod_proc, 0);
rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1); rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1);
rb_define_method(rb_cUnboundMethod, "unbind", umethod_unbind, 0); rb_define_method(rb_cUnboundMethod, "unbind", umethod_unbind, 0);