ruby-changes:20864
From: yugui <ko1@a...>
Date: Thu, 11 Aug 2011 09:38:44 +0900 (JST)
Subject: [ruby-changes:20864] yugui:r32914 (ruby_1_9_2): merges r32261 from trunk into ruby_1_9_2.
yugui 2011-08-11 09:38:07 +0900 (Thu, 11 Aug 2011) New Revision: 32914 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32914 Log: merges r32261 from trunk into ruby_1_9_2. -- * object.c (Init_Object): Teach RDoc what Init_class_hierarchy does to hook up ri for BasicObject, Object, Module and Class. Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/object.c branches/ruby_1_9_2/version.h Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 32913) +++ ruby_1_9_2/ChangeLog (revision 32914) @@ -1,3 +1,8 @@ +Tue Jun 28 07:50:32 2011 Eric Hodel <drbrain@s...> + + * object.c (Init_Object): Teach RDoc what Init_class_hierarchy does to + hook up ri for BasicObject, Object, Module and Class. + Tue Jun 28 01:19:52 2011 Keiju Ishitsuka <keiju@i...> * lib/irb/ruby-lex.rb: fix [Bug #4232]. Index: ruby_1_9_2/object.c =================================================================== --- ruby_1_9_2/object.c (revision 32913) +++ ruby_1_9_2/object.c (revision 32914) @@ -2458,23 +2458,24 @@ * \ingroup class */ -/* +/* Document-class: BasicObject * - * <code>BasicObject</code> is the parent class of all classes in Ruby. - * It's an explicit blank class. <code>Object</code>, the root of Ruby's - * class hierarchy is a direct subclass of <code>BasicObject</code>. Its - * methods are therefore available to all objects unless explicitly - * overridden. + * BasicObject is the parent class of all classes in Ruby. It's an explicit + * blank class. + */ + +/* Document-class: Object * - * <code>Object</code> mixes in the <code>Kernel</code> module, making - * the built-in kernel functions globally accessible. Although the - * instance methods of <code>Object</code> are defined by the - * <code>Kernel</code> module, we have chosen to document them here for - * clarity. + * Object is the root of Ruby's class hierarchy. Its methods are available + * to all classes unless explicitly overridden. * + * Object mixes in the Kernel module, making the built-in kernel functions + * globally accessible. Although the instance methods of Object are defined + * by the Kernel module, we have chosen to document them here for clarity. + * * In the descriptions of Object's methods, the parameter <i>symbol</i> refers - * to a symbol, which is either a quoted string or a - * <code>Symbol</code> (such as <code>:name</code>). + * to a symbol, which is either a quoted string or a Symbol (such as + * <code>:name</code>). */ void @@ -2485,6 +2486,14 @@ Init_class_hierarchy(); +#if 0 + // teach RDoc about these classes + rb_cBasicObject = rb_define_class("BasicObject", Qnil); + rb_cObject = rb_define_class("Object", rb_cBasicObject); + rb_cModule = rb_define_class("Module", rb_cObject); + rb_cClass = rb_define_class("Class", rb_cModule); +#endif + #undef rb_intern #define rb_intern(str) rb_intern_const(str) Index: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 32913) +++ ruby_1_9_2/version.h (revision 32914) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 299 +#define RUBY_PATCHLEVEL 300 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/