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

* class.c (rb_generic_class_instance_methods): merge argument

Browse Source 
check (and warning) into one function; following DRY principle.
  [ruby-core:01193]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2003-06-25 07:12:10 +00:00
parent 9a47a04607
commit dff438fba3
2 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Jun 25 12:52:58 2003 Matthew Dempsky <jivera@flame.org>
* class.c (rb_generic_class_instance_methods): merge argument
check (and warning) into one function; following DRY principle.
[ruby-core:01193]
Wed Jun 25 00:14:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org> Wed Jun 25 00:14:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* variable.c (autoload_delete): should delete Qundef from iv_tbl. * variable.c (autoload_delete): should delete Qundef from iv_tbl.

56
class.c
View File

@ -549,23 +549,33 @@ method_list(mod, recur, func)
return ary; return ary;
} }
VALUE static VALUE
rb_class_instance_methods(argc, argv, mod) class_instance_method_list(argc, argv, mod, func)
int argc; int argc;
VALUE *argv; VALUE *argv;
VALUE mod; VALUE mod;
void (*func)();
{ {
VALUE recur; VALUE recur;
rb_scan_args(argc, argv, "01", &recur); rb_scan_args(argc, argv, "01", &recur);
if (argc == 0) { if (argc == 0) {
#if RUBY_VERSION_CODE < 181 #if RUBY_VERSION_CODE < 181
rb_warn("instance_methods parameter will default to 'true' after 1.8.1"); rb_warn("%s: parameter will default to 'true' as of 1.8.1", rb_id2name(rb_frame_last_func()));
#else #else
recur = Qtrue; recur = Qtrue;
#endif #endif
} }
return method_list(mod, RTEST(recur), ins_methods_i); return method_list(mod, RTEST(recur), func);
}
VALUE
rb_class_instance_methods(argc, argv, mod)
int argc;
VALUE *argv;
VALUE mod;
{
return class_instance_method_list(argc, argv, mod, ins_methods_i);
} }
VALUE VALUE
@ -574,17 +584,7 @@ rb_class_protected_instance_methods(argc, argv, mod)
VALUE *argv; VALUE *argv;
VALUE mod; VALUE mod;
{ {
VALUE recur; return class_instance_method_list(argc, argv, mod, ins_methods_prot_i);
rb_scan_args(argc, argv, "01", &recur);
if (argc == 0) {
#if RUBY_VERSION_CODE < 181
rb_warn("protected_instance_methods parameter will default to 'true' after 1.8.1");
#else
recur = Qtrue;
#endif
}
return method_list(mod, RTEST(recur), ins_methods_prot_i);
} }
VALUE VALUE
@ -593,17 +593,7 @@ rb_class_private_instance_methods(argc, argv, mod)
VALUE *argv; VALUE *argv;
VALUE mod; VALUE mod;
{ {
VALUE recur; return class_instance_method_list(argc, argv, mod, ins_methods_priv_i);
rb_scan_args(argc, argv, "01", &recur);
if (argc == 0) {
#if RUBY_VERSION_CODE < 181
rb_warn("private_instance_methods parameter will default to 'true' after 1.8.1");
#else
recur = Qtrue;
#endif
}
return method_list(mod, RTEST(recur), ins_methods_priv_i);
} }
VALUE VALUE
@ -612,17 +602,7 @@ rb_class_public_instance_methods(argc, argv, mod)
VALUE *argv; VALUE *argv;
VALUE mod; VALUE mod;
{ {
VALUE recur; return class_instance_method_list(argc, argv, mod, ins_methods_pub_i);
rb_scan_args(argc, argv, "01", &recur);
if (argc == 0) {
#if RUBY_VERSION_CODE < 181
rb_warn("public_instance_methods parameter will default to 'true' after 1.8.1");
#else
recur = Qtrue;
#endif
}
return method_list(mod, RTEST(recur), ins_methods_pub_i);
} }
VALUE VALUE
@ -637,7 +617,7 @@ rb_obj_singleton_methods(argc, argv, obj)
rb_scan_args(argc, argv, "01", &recur); rb_scan_args(argc, argv, "01", &recur);
if (argc == 0) { if (argc == 0) {
#if RUBY_VERSION_CODE < 181 #if RUBY_VERSION_CODE < 181
rb_warn("singleton_methods parameter will default to 'true' after 1.8.1"); rb_warn("singleton_methods: parameter will default to 'true' as of 1.8.1");
#else #else
recur = Qtrue; recur = Qtrue;
#endif #endif