mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merge from trunk (r28379)
* class.c: rdoc fix [ruby-core:30449] * object.c: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b76c33fead
commit
334f3dd5ce
2 changed files with 4 additions and 3 deletions
5
class.c
5
class.c
|
|
@ -865,8 +865,8 @@ class_instance_method_list(int argc, VALUE *argv, VALUE mod, int (*func) (ID, lo
|
|||
* call-seq:
|
||||
* mod.instance_methods(include_super=true) -> array
|
||||
*
|
||||
* Returns an array containing the names of instance methods that is callable
|
||||
* from outside in the receiver. For a module, these are the public methods;
|
||||
* Returns an array containing the names of the public and protected instance
|
||||
* methods in the receiver. For a module, these are the public and protected methods;
|
||||
* for a class, they are the instance (not singleton) methods. With no
|
||||
* argument, or with an argument that is <code>false</code>, the
|
||||
* instance methods in <i>mod</i> are returned, otherwise the methods
|
||||
|
|
@ -954,6 +954,7 @@ rb_class_public_instance_methods(int argc, VALUE *argv, VALUE mod)
|
|||
* Returns an array of the names of singleton methods for <i>obj</i>.
|
||||
* If the optional <i>all</i> parameter is true, the list will include
|
||||
* methods in modules included in <i>obj</i>.
|
||||
* Only public and protected singleton methods are returned.
|
||||
*
|
||||
* module Other
|
||||
* def three() end
|
||||
|
|
|
|||
2
object.c
2
object.c
|
|
@ -1755,7 +1755,7 @@ rb_mod_const_defined(int argc, VALUE *argv, VALUE mod)
|
|||
* call-seq:
|
||||
* obj.methods -> array
|
||||
*
|
||||
* Returns a list of the names of methods publicly accessible in
|
||||
* Returns a list of the names of public and protected methods of
|
||||
* <i>obj</i>. This will include all the methods accessible in
|
||||
* <i>obj</i>'s ancestors.
|
||||
*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue