kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* proc.c (rb_obj_public_method): Object#public_method to retrieve

Browse source 
public method object.

* proc.c (rb_mod_public_instance_method): Module#public_instance_method 
  to retrieve public instance method from class / module.

* proc.c (mnew): visibility check added.

* eval_error.ci (rb_print_undef): add rb_ prefix.

* eval_error.ci (rb_print_undef): add visibility in the error
  message.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-12-17 23:01:50 +00:00
parent 97591e82d9
commit 1281cb00e5
5 changed files with 51 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
Tue Dec 18 07:56:57 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* proc.c (rb_obj_public_method): Object#public_method to retrieve
public method object.
* proc.c (rb_mod_public_instance_method): Module#public_instance_method
to retrieve public instance method from class / module.
* proc.c (mnew): visibility check added.
* eval_error.ci (rb_print_undef): add rb_ prefix.
* eval_error.ci (rb_print_undef): add visibility in the error
message.
Tue Dec 18 05:54:26 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/Env.rb, lib/base64.rb, lib/importenv.rb, lib/eregex.rb: removed.

12
eval_error.ci
View file

@ -207,9 +207,17 @@ ruby_error_print(void)
}
void
print_undef(VALUE klass, ID id)
rb_print_undef(VALUE klass, ID id, int scope)
{
rb_name_error(id, "undefined method `%s' for %s `%s'",
char *v;
switch (scope) {
default:
case NOEX_PUBLIC: v = ""; break;
case NOEX_PRIVATE: v = " private"; break;
case NOEX_PROTECTED: v = " protected"; break;
}
rb_name_error(id, "undefined%s method `%s' for %s `%s'", v,
rb_id2name(id),
(TYPE(klass) == T_MODULE) ? "module" : "class",
rb_class2name(klass));

2
eval_intern.h
View file

@ -204,7 +204,7 @@ VALUE rb_make_exception _((int argc, VALUE *argv));
NORETURN(void rb_fiber_start(void));
NORETURN(void rb_raise_jump _((VALUE)));
NORETURN(void print_undef _((VALUE, ID)));
NORETURN(void rb_print_undef _((VALUE, ID, int)));
NORETURN(void vm_localjump_error(const char *, VALUE, int));
NORETURN(void vm_jump_tag_but_local_jump(int, VALUE));

4
eval_method.ci
View file

@ -385,7 +385,7 @@ rb_export_method(VALUE klass, ID name, ID noex)
fbody = search_method(rb_cObject, name, &origin);
}
if (!fbody || !fbody->nd_body) {
print_undef(klass, name);
rb_print_undef(klass, name, 0);
}
if (fbody->nd_body->nd_noex != noex) {
if (klass == origin) {
@ -573,7 +573,7 @@ rb_alias(VALUE klass, ID name, ID def)
}
}
if (!orig_fbody || !orig_fbody->nd_body) {
print_undef(klass, def);
rb_print_undef(klass, def, 0);
}
if (FL_TEST(klass, FL_SINGLETON)) {
singleton = rb_iv_get(klass, "__attached__");

29
proc.c
View file

@ -638,7 +638,7 @@ bm_mark(struct METHOD *data)
NODE *rb_get_method_body(VALUE klass, ID id, ID *idp);
static VALUE
mnew(VALUE klass, VALUE obj, ID id, VALUE mclass)
mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope)
{
VALUE method;
NODE *body;
@ -648,7 +648,10 @@ mnew(VALUE klass, VALUE obj, ID id, VALUE mclass)
again:
if ((body = rb_get_method_body(klass, id, 0)) == 0) {
print_undef(rclass, oid);
rb_print_undef(rclass, oid, 0);
}
if (scope && (body->nd_noex & NOEX_MASK) != NOEX_PUBLIC) {
rb_print_undef(rclass, oid, (body->nd_noex & NOEX_MASK));
}
klass = body->nd_clss;
@ -864,7 +867,13 @@ method_owner(VALUE obj)
VALUE
rb_obj_method(VALUE obj, VALUE vid)
{
return mnew(CLASS_OF(obj), obj, rb_to_id(vid), rb_cMethod);
return mnew(CLASS_OF(obj), obj, rb_to_id(vid), rb_cMethod, Qfalse);
}
VALUE
rb_obj_public_method(VALUE obj, VALUE vid)
{
return mnew(CLASS_OF(obj), obj, rb_to_id(vid), rb_cMethod, Qtrue);
}
/*
@ -900,9 +909,15 @@ rb_obj_method(VALUE obj, VALUE vid)
*/
static VALUE
rb_mod_method(VALUE mod, VALUE vid)
rb_mod_instance_method(VALUE mod, VALUE vid)
{
return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod);
return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod, Qfalse);
}
static VALUE
rb_mod_public_instance_method(VALUE mod, VALUE vid)
{
return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod, Qtrue);
}
/*
@ -1518,6 +1533,7 @@ Init_Proc(void)
rb_define_method(rb_cMethod, "owner", method_owner, 0);
rb_define_method(rb_cMethod, "unbind", method_unbind, 0);
rb_define_method(rb_mKernel, "method", rb_obj_method, 1);
rb_define_method(rb_mKernel, "public_method", rb_obj_public_method, 1);
/* UnboundMethod */
rb_cUnboundMethod = rb_define_class("UnboundMethod", rb_cObject);
@ -1535,7 +1551,8 @@ Init_Proc(void)
rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1);
/* Module#*_method */
rb_define_method(rb_cModule, "instance_method", rb_mod_method, 1);
rb_define_method(rb_cModule, "instance_method", rb_mod_instance_method, 1);
rb_define_method(rb_cModule, "public_instance_method", rb_mod_public_instance_method, 1);
rb_define_private_method(rb_cModule, "define_method", rb_mod_define_method, -1);
/* Kernel */