rhodes 3.1.1 → 3.2.0.beta.1

data/platform/shared/ruby/object.c

@@ -31,14 +31,15 @@ VALUE rb_cNilClass;
 VALUE rb_cTrueClass;
 VALUE rb_cFalseClass;
 
-static ID id_eq, id_eql, id_match, id_inspect, id_init_copy;
+static ID id_eq, id_eql, id_match, id_inspect;
+static ID id_init_copy, id_init_clone, id_init_dup;
 
 /*
  *  call-seq:
- *     obj === other   => true or false
- *  
+ *     obj === other   -> true or false
+ *
  *  Case Equality---For class <code>Object</code>, effectively the same
- *  as calling  <code>#==</code>, but typically overridden by descendents
+ *  as calling  <code>#==</code>, but typically overridden by descendants
  *  to provide meaningful semantics in <code>case</code> statements.
  */
 
@@ -61,13 +62,13 @@ rb_eql(VALUE obj1, VALUE obj2)
 
 /*
  *  call-seq:
- *     obj == other        => true or false
- *     obj.equal?(other)   => true or false
- *     obj.eql?(other)     => true or false
- *  
+ *     obj == other        -> true or false
+ *     obj.equal?(other)   -> true or false
+ *     obj.eql?(other)     -> true or false
+ *
  *  Equality---At the <code>Object</code> level, <code>==</code> returns
  *  <code>true</code> only if <i>obj</i> and <i>other</i> are the
- *  same object. Typically, this method is overridden in descendent
+ *  same object. Typically, this method is overridden in descendant
  *  classes to provide class-specific meaning.
  *
  *  Unlike <code>==</code>, the <code>equal?</code> method should never be
@@ -83,7 +84,7 @@ rb_eql(VALUE obj1, VALUE obj2)
  *  there are exceptions. <code>Numeric</code> types, for example,
  *  perform type conversion across <code>==</code>, but not across
  *  <code>eql?</code>, so:
- *     
+ *
  *     1 == 1.0     #=> true
  *     1.eql? 1.0   #=> false
  */
@@ -95,9 +96,17 @@ rb_obj_equal(VALUE obj1, VALUE obj2)
     return Qfalse;
 }
 
+VALUE
+rb_obj_hash(VALUE obj)
+{
+    VALUE oid = rb_obj_id(obj);
+    st_index_t h = rb_hash_end(rb_hash_start(NUM2LONG(oid)));
+    return LONG2FIX(h);
+}
+
 /*
  *  call-seq:
- *     !obj    => true or false
+ *     !obj    -> true or false
  *
  *  Boolean negate.
  */
@@ -110,7 +119,7 @@ rb_obj_not(VALUE obj)
 
 /*
  *  call-seq:
- *     obj != other        => true or false
+ *     obj != other        -> true or false
  *
  *  Returns true if two objects are not-equal, otherwise false.
  */
@@ -135,14 +144,12 @@ rb_class_real(VALUE cl)
 
 /*
  *  call-seq:
- *     obj.class    => class
- *  
- *  Returns the class of <i>obj</i>, now preferred over
- *  <code>Object#type</code>, as an object's type in Ruby is only
- *  loosely tied to that object's class. This method must always be
+ *     obj.class    -> class
+ *
+ *  Returns the class of <i>obj</i>. This method must always be
  *  called with an explicit receiver, as <code>class</code> is also a
  *  reserved word in Ruby.
- *     
+ *
  *     1.class      #=> Fixnum
  *     self.class   #=> Object
  */
@@ -153,6 +160,29 @@ rb_obj_class(VALUE obj)
     return rb_class_real(CLASS_OF(obj));
 }
 
+/*
+ *  call-seq:
+ *     obj.singleton_class    -> class
+ *
+ *  Returns the singleton class of <i>obj</i>.  This method creates
+ *  a new singleton class if <i>obj</i> does not have it.
+ *
+ *  If <i>obj</i> is <code>nil</code>, <code>true</code>, or
+ *  <code>false</code>, it returns NilClass, TrueClass, or FalseClass,
+ *  respectively.
+ *  If <i>obj</i> is a Fixnum or a Symbol, it raises a TypeError.
+ *
+ *     Object.new.singleton_class  #=> #<Class:#<Object:0xb7ce1e24>>
+ *     String.singleton_class      #=> #<Class:String>
+ *     nil.singleton_class         #=> NilClass
+ */
+
+static VALUE
+rb_obj_singleton_class(VALUE obj)
+{
+    return rb_singleton_class(obj);
+}
+
 static void
 init_copy(VALUE dest, VALUE obj)
 {
@@ -196,18 +226,17 @@ init_copy(VALUE dest, VALUE obj)
 	}
         break;
     }
-    rb_funcall(dest, id_init_copy, 1, obj);
 }
 
 /*
  *  call-seq:
  *     obj.clone -> an_object
- *  
+ *
  *  Produces a shallow copy of <i>obj</i>---the instance variables of
  *  <i>obj</i> are copied, but not the objects they reference. Copies
  *  the frozen and tainted state of <i>obj</i>. See also the discussion
  *  under <code>Object#dup</code>.
- *     
+ *
  *     class Klass
  *        attr_accessor :str
  *     end
@@ -235,6 +264,7 @@ rb_obj_clone(VALUE obj)
     RBASIC(clone)->klass = rb_singleton_class_clone(obj);
     RBASIC(clone)->flags = (RBASIC(obj)->flags | FL_TEST(clone, FL_TAINT) | FL_TEST(clone, FL_UNTRUSTED)) & ~(FL_FREEZE|FL_FINALIZE);
     init_copy(clone, obj);
+    rb_funcall(clone, id_init_clone, 1, obj);
     RBASIC(clone)->flags |= RBASIC(obj)->flags & FL_FREEZE;
 
     return clone;
@@ -243,15 +273,15 @@ rb_obj_clone(VALUE obj)
 /*
  *  call-seq:
  *     obj.dup -> an_object
- *  
+ *
  *  Produces a shallow copy of <i>obj</i>---the instance variables of
  *  <i>obj</i> are copied, but not the objects they reference.
  *  <code>dup</code> copies the tainted state of <i>obj</i>. See also
  *  the discussion under <code>Object#clone</code>. In general,
  *  <code>clone</code> and <code>dup</code> may have different semantics
- *  in descendent classes. While <code>clone</code> is used to duplicate
+ *  in descendant classes. While <code>clone</code> is used to duplicate
  *  an object, including its internal state, <code>dup</code> typically
- *  uses the class of the descendent object to create the new instance.
+ *  uses the class of the descendant object to create the new instance.
  *
  *  This method may have class-specific behavior.  If so, that
  *  behavior will be documented under the #+initialize_copy+ method of
@@ -268,6 +298,7 @@ rb_obj_dup(VALUE obj)
     }
     dup = rb_obj_alloc(rb_obj_class(obj));
     init_copy(dup, obj);
+    rb_funcall(dup, id_init_dup, 1, obj);
 
     return dup;
 }
@@ -284,10 +315,18 @@ rb_obj_init_copy(VALUE obj, VALUE orig)
     return obj;
 }
 
+/* :nodoc: */
+VALUE
+rb_obj_init_dup_clone(VALUE obj, VALUE orig)
+{
+    rb_funcall(obj, id_init_copy, 1, orig);
+    return obj;
+}
+
 /*
  *  call-seq:
- *     obj.to_s    => string
- *  
+ *     obj.to_s    -> string
+ *
  *  Returns a string representing <i>obj</i>. The default
  *  <code>to_s</code> prints the object's class and an encoding of the
  *  object id. As a special case, the top-level object that is the
@@ -356,22 +395,24 @@ inspect_obj(VALUE obj, VALUE str, int recur)
 
 /*
  *  call-seq:
- *     obj.inspect   => string
- *  
+ *     obj.inspect   -> string
+ *
  *  Returns a string containing a human-readable representation of
- *  <i>obj</i>. If not overridden, uses the <code>to_s</code> method to
+ *  <i>obj</i>. If not overridden and no instance variables, uses the
+ *  <code>to_s</code> method to generate the string.
+ *  <i>obj</i>.  If not overridden, uses the <code>to_s</code> method to
  *  generate the string.
- *     
+ *
  *     [ 1, 2, 3..4, 'five' ].inspect   #=> "[1, 2, 3..4, \"five\"]"
  *     Time.new.inspect                 #=> "2008-03-08 19:43:39 +0900"
  */
 
-
 static VALUE
 rb_obj_inspect(VALUE obj)
 {
+    extern int rb_obj_basic_to_s_p(VALUE);
 
-    if (TYPE(obj) == T_OBJECT) {
+    if (TYPE(obj) == T_OBJECT && rb_obj_basic_to_s_p(obj)) {
         int has_ivar = 0;
         VALUE *ptr = ROBJECT_IVPTR(obj);
         long len = ROBJECT_NUMIV(obj);
@@ -391,6 +432,7 @@ rb_obj_inspect(VALUE obj)
             str = rb_sprintf("-<%s:%p", c, (void*)obj);
             return rb_exec_recursive(inspect_obj, obj, str);
         }
+	return rb_any_to_s(obj);
     }
     return rb_funcall(obj, rb_intern("to_s"), 0, 0);
 }
@@ -398,8 +440,8 @@ rb_obj_inspect(VALUE obj)
 
 /*
  *  call-seq:
- *     obj.instance_of?(class)    => true or false
- *  
+ *     obj.instance_of?(class)    -> true or false
+ *
  *  Returns <code>true</code> if <i>obj</i> is an instance of the given
  *  class. See also <code>Object#kind_of?</code>.
  */
@@ -423,13 +465,13 @@ rb_obj_is_instance_of(VALUE obj, VALUE c)
 
 /*
  *  call-seq:
- *     obj.is_a?(class)       => true or false
- *     obj.kind_of?(class)    => true or false
- *  
+ *     obj.is_a?(class)       -> true or false
+ *     obj.kind_of?(class)    -> true or false
+ *
  *  Returns <code>true</code> if <i>class</i> is the class of
  *  <i>obj</i>, or if <i>class</i> is one of the superclasses of
  *  <i>obj</i> or modules included in <i>obj</i>.
- *     
+ *
  *     module M;    end
  *     class A
  *       include M
@@ -473,8 +515,8 @@ rb_obj_is_kind_of(VALUE obj, VALUE c)
 
 /*
  *  call-seq:
- *     obj.tap{|x|...}    => obj
- *  
+ *     obj.tap{|x|...}    -> obj
+ *
  *  Yields <code>x</code> to the block, and then returns <code>x</code>.
  *  The primary purpose of this method is to "tap into" a method chain,
  *  in order to perform operations on intermediate results within the chain.
@@ -527,10 +569,10 @@ rb_obj_tap(VALUE obj)
  *
  *  call-seq:
  *     singleton_method_added(symbol)
- *  
+ *
  *  Invoked as a callback whenever a singleton method is added to the
  *  receiver.
- *     
+ *
  *     module Chatty
  *       def Chatty.singleton_method_added(id)
  *         puts "Adding #{id.id2name}"
@@ -539,13 +581,13 @@ rb_obj_tap(VALUE obj)
  *       def two()          end
  *       def Chatty.three() end
  *     end
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     Adding singleton_method_added
  *     Adding one
  *     Adding three
- *     
+ *
  */
 
 /*
@@ -553,10 +595,10 @@ rb_obj_tap(VALUE obj)
  *
  *  call-seq:
  *     singleton_method_removed(symbol)
- *  
+ *
  *  Invoked as a callback whenever a singleton method is removed from
  *  the receiver.
- *     
+ *
  *     module Chatty
  *       def Chatty.singleton_method_removed(id)
  *         puts "Removing #{id.id2name}"
@@ -564,14 +606,14 @@ rb_obj_tap(VALUE obj)
  *       def self.one()     end
  *       def two()          end
  *       def Chatty.three() end
- *       class <<self
+ *       class << self
  *         remove_method :three
  *         remove_method :one
  *       end
  *     end
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     Removing three
  *     Removing one
  */
@@ -581,10 +623,10 @@ rb_obj_tap(VALUE obj)
  *
  *  call-seq:
  *     singleton_method_undefined(symbol)
- *  
+ *
  *  Invoked as a callback whenever a singleton method is undefined in
  *  the receiver.
- *     
+ *
  *     module Chatty
  *       def Chatty.singleton_method_undefined(id)
  *         puts "Undefining #{id.id2name}"
@@ -594,9 +636,9 @@ rb_obj_tap(VALUE obj)
  *          undef_method(:one)
  *       end
  *     end
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     Undefining one
  */
 
@@ -622,6 +664,14 @@ rb_obj_tap(VALUE obj)
  *        end
  */
 
+/*
+ * Document-method: initialize
+ *
+ * call-seq:
+ *    BasicObject.new( *args )
+ *
+ * Returns a new BasicObject. Arguments are ignored.
+ */
 
 /*
  * Not documented
@@ -635,8 +685,8 @@ rb_obj_dummy(void)
 
 /*
  *  call-seq:
- *     obj.tainted?    => true or false
- *  
+ *     obj.tainted?    -> true or false
+ *
  *  Returns <code>true</code> if the object is tainted.
  */
 
@@ -651,7 +701,7 @@ rb_obj_tainted(VALUE obj)
 /*
  *  call-seq:
  *     obj.taint -> obj
- *  
+ *
  *  Marks <i>obj</i> as tainted---if the <code>$SAFE</code> level is
  *  set appropriately, many method calls which might alter the running
  *  programs environment will refuse to accept tainted strings.
@@ -673,8 +723,8 @@ rb_obj_taint(VALUE obj)
 
 /*
  *  call-seq:
- *     obj.untaint    => obj
- *  
+ *     obj.untaint    -> obj
+ *
  *  Removes the taint from <i>obj</i>.
  */
 
@@ -693,8 +743,8 @@ rb_obj_untaint(VALUE obj)
 
 /*
  *  call-seq:
- *     obj.untrusted?    => true or false
- *  
+ *     obj.untrusted?    -> true or false
+ *
  *  Returns <code>true</code> if the object is untrusted.
  */
 
@@ -709,7 +759,7 @@ rb_obj_untrusted(VALUE obj)
 /*
  *  call-seq:
  *     obj.untrust -> obj
- *  
+ *
  *  Marks <i>obj</i> as untrusted.
  */
 
@@ -729,8 +779,8 @@ rb_obj_untrust(VALUE obj)
 
 /*
  *  call-seq:
- *     obj.trust    => obj
- *  
+ *     obj.trust    -> obj
+ *
  *  Removes the untrusted mark from <i>obj</i>.
  */
 
@@ -757,19 +807,21 @@ static st_table *immediate_frozen_tbl = 0;
 
 /*
  *  call-seq:
- *     obj.freeze    => obj
- *  
+ *     obj.freeze    -> obj
+ *
  *  Prevents further modifications to <i>obj</i>. A
  *  <code>RuntimeError</code> will be raised if modification is attempted.
  *  There is no way to unfreeze a frozen object. See also
  *  <code>Object#frozen?</code>.
- *     
+ *
+ *  This method returns self.
+ *
  *     a = [ "a", "b", "c" ]
  *     a.freeze
  *     a << "z"
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     prog.rb:3:in `<<': can't modify frozen array (RuntimeError)
  *     	from prog.rb:3
  */
@@ -794,10 +846,10 @@ rb_obj_freeze(VALUE obj)
 
 /*
  *  call-seq:
- *     obj.frozen?    => true or false
- *  
+ *     obj.frozen?    -> true or false
+ *
  *  Returns the freeze status of <i>obj</i>.
- *     
+ *
  *     a = [ "a", "b", "c" ]
  *     a.freeze    #=> ["a", "b", "c"]
  *     a.frozen?   #=> true
@@ -823,10 +875,10 @@ rb_obj_frozen_p(VALUE obj)
 
 /*
  *  call-seq:
- *     nil.to_i => 0
- *  
+ *     nil.to_i -> 0
+ *
  *  Always returns zero.
- *     
+ *
  *     nil.to_i   #=> 0
  */
 
@@ -839,10 +891,10 @@ nil_to_i(VALUE obj)
 
 /*
  *  call-seq:
- *     nil.to_f    => 0.0
- *  
+ *     nil.to_f    -> 0.0
+ *
  *  Always returns zero.
- *     
+ *
  *     nil.to_f   #=> 0.0
  */
 
@@ -854,8 +906,8 @@ nil_to_f(VALUE obj)
 
 /*
  *  call-seq:
- *     nil.to_s    => ""
- *  
+ *     nil.to_s    -> ""
+ *
  *  Always returns the empty string.
  */
 
@@ -869,10 +921,10 @@ nil_to_s(VALUE obj)
  * Document-method: to_a
  *
  *  call-seq:
- *     nil.to_a    => []
- *  
+ *     nil.to_a    -> []
+ *
  *  Always returns an empty array.
- *     
+ *
  *     nil.to_a   #=> []
  */
 
@@ -884,7 +936,7 @@ nil_to_a(VALUE obj)
 
 /*
  *  call-seq:
- *    nil.inspect  => "nil"
+ *    nil.inspect  -> "nil"
  *
  *  Always returns the string "nil".
  */
@@ -907,7 +959,7 @@ nil_inspect(VALUE obj)
 
 /*
  * call-seq:
- *   true.to_s   =>  "true"
+ *   true.to_s   ->  "true"
  *
  * The string representation of <code>true</code> is "true".
  */
@@ -921,8 +973,8 @@ true_to_s(VALUE obj)
 
 /*
  *  call-seq:
- *     true & obj    => true or false
- *  
+ *     true & obj    -> true or false
+ *
  *  And---Returns <code>false</code> if <i>obj</i> is
  *  <code>nil</code> or <code>false</code>, <code>true</code> otherwise.
  */
@@ -935,17 +987,17 @@ true_and(VALUE obj, VALUE obj2)
 
 /*
  *  call-seq:
- *     true | obj   => true
- *  
+ *     true | obj   -> true
+ *
  *  Or---Returns <code>true</code>. As <i>anObject</i> is an argument to
  *  a method call, it is always evaluated; there is no short-circuit
  *  evaluation in this case.
- *     
+ *
  *     true |  puts("or")
  *     true || puts("logical or")
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     or
  */
 
@@ -958,8 +1010,8 @@ true_or(VALUE obj, VALUE obj2)
 
 /*
  *  call-seq:
- *     true ^ obj   => !obj
- *  
+ *     true ^ obj   -> !obj
+ *
  *  Exclusive Or---Returns <code>true</code> if <i>obj</i> is
  *  <code>nil</code> or <code>false</code>, <code>false</code>
  *  otherwise.
@@ -979,12 +1031,12 @@ true_xor(VALUE obj, VALUE obj2)
  *  <code>FalseClass</code> and represents a logically false value in
  *  boolean expressions. The class provides operators allowing
  *  <code>false</code> to participate correctly in logical expressions.
- *     
+ *
  */
 
 /*
  * call-seq:
- *   false.to_s   =>  "false"
+ *   false.to_s   ->  "false"
  *
  * 'nuf said...
  */
@@ -997,9 +1049,9 @@ false_to_s(VALUE obj)
 
 /*
  *  call-seq:
- *     false & obj   => false
- *     nil & obj     => false
- *  
+ *     false & obj   -> false
+ *     nil & obj     -> false
+ *
  *  And---Returns <code>false</code>. <i>obj</i> is always
  *  evaluated as it is the argument to a method call---there is no
  *  short-circuit evaluation in this case.
@@ -1014,9 +1066,9 @@ false_and(VALUE obj, VALUE obj2)
 
 /*
  *  call-seq:
- *     false | obj   =>   true or false
- *     nil   | obj   =>   true or false
- *  
+ *     false | obj   ->   true or false
+ *     nil   | obj   ->   true or false
+ *
  *  Or---Returns <code>false</code> if <i>obj</i> is
  *  <code>nil</code> or <code>false</code>; <code>true</code> otherwise.
  */
@@ -1031,13 +1083,13 @@ false_or(VALUE obj, VALUE obj2)
 
 /*
  *  call-seq:
- *     false ^ obj    => true or false
- *     nil   ^ obj    => true or false
- *  
+ *     false ^ obj    -> true or false
+ *     nil   ^ obj    -> true or false
+ *
  *  Exclusive Or---If <i>obj</i> is <code>nil</code> or
  *  <code>false</code>, returns <code>false</code>; otherwise, returns
  *  <code>true</code>.
- *     
+ *
  */
 
 static VALUE
@@ -1048,7 +1100,7 @@ false_xor(VALUE obj, VALUE obj2)
 
 /*
  * call_seq:
- *   nil.nil?               => true
+ *   nil.nil?               -> true
  *
  * Only the object <i>nil</i> responds <code>true</code> to <code>nil?</code>.
  */
@@ -1061,8 +1113,8 @@ rb_true(VALUE obj)
 
 /*
  * call_seq:
- *   nil.nil?               => true
- *   <anything_else>.nil?   => false
+ *   nil.nil?               -> true
+ *   <anything_else>.nil?   -> false
  *
  * Only the object <i>nil</i> responds <code>true</code> to <code>nil?</code>.
  */
@@ -1077,9 +1129,9 @@ rb_false(VALUE obj)
 
 /*
  *  call-seq:
- *     obj =~ other  => nil
- *  
- *  Pattern Match---Overridden by descendents (notably
+ *     obj =~ other  -> nil
+ *
+ *  Pattern Match---Overridden by descendants (notably
  *  <code>Regexp</code> and <code>String</code>) to provide meaningful
  *  pattern-match semantics.
  */
@@ -1092,8 +1144,8 @@ rb_obj_match(VALUE obj1, VALUE obj2)
 
 /*
  *  call-seq:
- *     obj !~ other  => true or false
- *  
+ *     obj !~ other  -> true or false
+ *
  *  Returns true if two objects do not match (using the <i>=~</i>
  *  method), otherwise false.
  */
@@ -1106,6 +1158,15 @@ rb_obj_not_match(VALUE obj1, VALUE obj2)
 }
 
 
+/* :nodoc: */
+static VALUE
+rb_obj_cmp(VALUE obj1, VALUE obj2)
+{
+    if (obj1 == obj2 || rb_equal(obj1, obj2))
+	return INT2FIX(0);
+    return Qnil;
+}
+
 /***********************************************************************
  *
  * Document-class: Module
@@ -1116,11 +1177,11 @@ rb_obj_not_match(VALUE obj1, VALUE obj2)
  *  included, module methods do not. Conversely, module methods may be
  *  called without creating an encapsulating object, while instance
  *  methods may not. (See <code>Module#module_function</code>)
- *     
- *  In the descriptions that follow, the parameter <i>syml</i> refers
+ *
+ *  In the descriptions that follow, the parameter <i>sym</i> refers
  *  to a symbol, which is either a quoted string or a
  *  <code>Symbol</code> (such as <code>:name</code>).
- *     
+ *
  *     module Mod
  *       include Math
  *       CONST = 1
@@ -1131,12 +1192,12 @@ rb_obj_not_match(VALUE obj1, VALUE obj2)
  *     Mod.class              #=> Module
  *     Mod.constants          #=> [:CONST, :PI, :E]
  *     Mod.instance_methods   #=> [:meth]
- *     
+ *
  */
 
 /*
  * call-seq:
- *   mod.to_s   => string
+ *   mod.to_s   -> string
  *
  * Return a string representing this module or class. For basic
  * classes and modules, this is the name. For singletons, we
@@ -1168,9 +1229,11 @@ rb_mod_to_s(VALUE klass)
 
 /*
  *  call-seq:
- *     mod.freeze
- *  
+ *     mod.freeze       -> mod
+ *
  *  Prevents further modifications to <i>mod</i>.
+ *
+ *  This method returns self.
  */
 
 static VALUE
@@ -1182,10 +1245,10 @@ rb_mod_freeze(VALUE mod)
 
 /*
  *  call-seq:
- *     mod === obj    => true or false
- *  
+ *     mod === obj    -> true or false
+ *
  *  Case Equality---Returns <code>true</code> if <i>anObject</i> is an
- *  instance of <i>mod</i> or one of <i>mod</i>'s descendents. Of
+ *  instance of <i>mod</i> or one of <i>mod</i>'s descendants. Of
  *  limited use for modules, but can be used in <code>case</code>
  *  statements to classify objects by class.
  */
@@ -1198,12 +1261,12 @@ rb_mod_eqq(VALUE mod, VALUE arg)
 
 /*
  * call-seq:
- *   mod <= other   =>  true, false, or nil
+ *   mod <= other   ->  true, false, or nil
  *
  * Returns true if <i>mod</i> is a subclass of <i>other</i> or
- * is the same as <i>other</i>. Returns 
- * <code>nil</code> if there's no relationship between the two. 
- * (Think of the relationship in terms of the class definition: 
+ * is the same as <i>other</i>. Returns
+ * <code>nil</code> if there's no relationship between the two.
+ * (Think of the relationship in terms of the class definition:
  * "class A<B" implies "A<B").
  *
  */
@@ -1237,11 +1300,11 @@ rb_class_inherited_p(VALUE mod, VALUE arg)
 
 /*
  * call-seq:
- *   mod < other   =>  true, false, or nil
+ *   mod < other   ->  true, false, or nil
  *
- * Returns true if <i>mod</i> is a subclass of <i>other</i>. Returns 
- * <code>nil</code> if there's no relationship between the two. 
- * (Think of the relationship in terms of the class definition: 
+ * Returns true if <i>mod</i> is a subclass of <i>other</i>. Returns
+ * <code>nil</code> if there's no relationship between the two.
+ * (Think of the relationship in terms of the class definition:
  * "class A<B" implies "A<B").
  *
  */
@@ -1256,12 +1319,12 @@ rb_mod_lt(VALUE mod, VALUE arg)
 
 /*
  * call-seq:
- *   mod >= other   =>  true, false, or nil
+ *   mod >= other   ->  true, false, or nil
  *
  * Returns true if <i>mod</i> is an ancestor of <i>other</i>, or the
- * two modules are the same. Returns 
- * <code>nil</code> if there's no relationship between the two. 
- * (Think of the relationship in terms of the class definition: 
+ * two modules are the same. Returns
+ * <code>nil</code> if there's no relationship between the two.
+ * (Think of the relationship in terms of the class definition:
  * "class A<B" implies "B>A").
  *
  */
@@ -1282,11 +1345,11 @@ rb_mod_ge(VALUE mod, VALUE arg)
 
 /*
  * call-seq:
- *   mod > other   =>  true, false, or nil
+ *   mod > other   ->  true, false, or nil
  *
- * Returns true if <i>mod</i> is an ancestor of <i>other</i>. Returns 
- * <code>nil</code> if there's no relationship between the two. 
- * (Think of the relationship in terms of the class definition: 
+ * Returns true if <i>mod</i> is an ancestor of <i>other</i>. Returns
+ * <code>nil</code> if there's no relationship between the two.
+ * (Think of the relationship in terms of the class definition:
  * "class A<B" implies "B>A").
  *
  */
@@ -1300,12 +1363,12 @@ rb_mod_gt(VALUE mod, VALUE arg)
 
 /*
  *  call-seq:
- *     mod <=> other_mod   => -1, 0, +1, or nil
- *  
+ *     mod <=> other_mod   -> -1, 0, +1, or nil
+ *
  *  Comparison---Returns -1 if <i>mod</i> includes <i>other_mod</i>, 0 if
  *  <i>mod</i> is the same as <i>other_mod</i>, and +1 if <i>mod</i> is
- *  included by <i>other_mod</i> or if <i>mod</i> has no relationship with
- *  <i>other_mod</i>. Returns <code>nil</code> if <i>other_mod</i> is
+ *  included by <i>other_mod</i>. Returns <code>nil</code> if <i>mod</i>
+ *  has no relationship with <i>other_mod</i> or if <i>other_mod</i> is
  *  not a module.
  */
 
@@ -1348,13 +1411,13 @@ rb_class_s_alloc(VALUE klass)
 
 /*
  *  call-seq:
- *    Module.new                  => mod
- *    Module.new {|mod| block }   => mod
- *  
+ *    Module.new                  -> mod
+ *    Module.new {|mod| block }   -> mod
+ *
  *  Creates a new anonymous module. If a block is given, it is passed
  *  the module object, and the block is evaluated in the context of this
  *  module using <code>module_eval</code>.
- *     
+ *
  *     Fred = Module.new do
  *       def meth1
  *         "hello"
@@ -1382,12 +1445,12 @@ rb_mod_initialize(VALUE module)
 
 /*
  *  call-seq:
- *     Class.new(super_class=Object)   =>    a_class
- *  
+ *     Class.new(super_class=Object)   ->    a_class
+ *
  *  Creates a new anonymous (unnamed) class with the given superclass
  *  (or <code>Object</code> if no parameter is given). You can give a
  *  class a name by assigning the class object to a constant.
- *     
+ *
  */
 
 static VALUE
@@ -1395,7 +1458,7 @@ rb_class_initialize(int argc, VALUE *argv, VALUE klass)
 {
     VALUE super;
 
-    if (RCLASS_SUPER(klass) != 0) {
+    if (RCLASS_SUPER(klass) != 0 || klass == rb_cBasicObject) {
 	rb_raise(rb_eTypeError, "already initialized class");
     }
     if (argc == 0) {
@@ -1415,24 +1478,24 @@ rb_class_initialize(int argc, VALUE *argv, VALUE klass)
 
 /*
  *  call-seq:
- *     class.allocate()   =>   obj
- *  
+ *     class.allocate()   ->   obj
+ *
  *  Allocates space for a new object of <i>class</i>'s class and does not
  *  call initialize on the new instance. The returned object must be an
  *  instance of <i>class</i>.
- *  
+ *
  *      klass = Class.new do
  *        def initialize(*args)
  *          @initialized = true
  *        end
- *      
+ *
  *        def initialized?
  *          @initialized || false
  *        end
  *      end
- *      
+ *
  *      klass.allocate.initialized? #=> false
- *     
+ *
  */
 
 VALUE
@@ -1463,14 +1526,14 @@ rb_class_allocate_instance(VALUE klass)
 
 /*
  *  call-seq:
- *     class.new(args, ...)    =>  obj
- *  
+ *     class.new(args, ...)    ->  obj
+ *
  *  Calls <code>allocate</code> to create a new object of
  *  <i>class</i>'s class, then invokes that object's
  *  <code>initialize</code> method, passing it <i>args</i>.
  *  This is the method that ends up getting called whenever
  *  an object is constructed using .new.
- *     
+ *
  */
 
 VALUE
@@ -1487,9 +1550,9 @@ rb_class_new_instance(int argc, VALUE *argv, VALUE klass)
 /*
  *  call-seq:
  *     class.superclass -> a_super_class or nil
- *  
+ *
  *  Returns the superclass of <i>class</i>, or <code>nil</code>.
- *     
+ *
  *     File.superclass          #=> IO
  *     IO.superclass            #=> Object
  *     Object.superclass        #=> BasicObject
@@ -1500,7 +1563,7 @@ rb_class_new_instance(int argc, VALUE *argv, VALUE klass)
  *  returns nil when the given class hasn't a parent class:
  *
  *     BasicObject.superclass   #=> nil
- *     
+ *
  */
 
 static VALUE
@@ -1523,9 +1586,9 @@ rb_class_superclass(VALUE klass)
 
 /*
  *  call-seq:
- *     attr_reader(symbol, ...)    => nil
- *     attr(symbol, ...)             => nil
- *  
+ *     attr_reader(symbol, ...)    -> nil
+ *     attr(symbol, ...)             -> nil
+ *
  *  Creates instance variables and corresponding methods that return the
  *  value of each instance variable. Equivalent to calling
  *  ``<code>attr</code><i>:name</i>'' on each name in turn.
@@ -1537,7 +1600,7 @@ rb_mod_attr_reader(int argc, VALUE *argv, VALUE klass)
     int i;
 
     for (i=0; i<argc; i++) {
-	rb_attr(klass, rb_to_id(argv[i]), Qtrue, Qfalse, Qtrue);
+	rb_attr(klass, rb_to_id(argv[i]), TRUE, FALSE, TRUE);
     }
     return Qnil;
 }
@@ -1547,7 +1610,7 @@ rb_mod_attr(int argc, VALUE *argv, VALUE klass)
 {
     if (argc == 2 && (argv[1] == Qtrue || argv[1] == Qfalse)) {
 	rb_warning("optional boolean argument is obsoleted");
-	rb_attr(klass, rb_to_id(argv[0]), 1, RTEST(argv[1]), Qtrue);
+	rb_attr(klass, rb_to_id(argv[0]), 1, RTEST(argv[1]), TRUE);
 	return Qnil;
     }
     return rb_mod_attr_reader(argc, argv, klass);
@@ -1555,8 +1618,8 @@ rb_mod_attr(int argc, VALUE *argv, VALUE klass)
 
 /*
  *  call-seq:
- *      attr_writer(symbol, ...)    => nil
- *  
+ *      attr_writer(symbol, ...)    -> nil
+ *
  *  Creates an accessor method to allow assignment to the attribute
  *  <i>aSymbol</i><code>.id2name</code>.
  */
@@ -1567,20 +1630,20 @@ rb_mod_attr_writer(int argc, VALUE *argv, VALUE klass)
     int i;
 
     for (i=0; i<argc; i++) {
-	rb_attr(klass, rb_to_id(argv[i]), Qfalse, Qtrue, Qtrue);
+	rb_attr(klass, rb_to_id(argv[i]), FALSE, TRUE, TRUE);
     }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     attr_accessor(symbol, ...)    => nil
- *  
+ *     attr_accessor(symbol, ...)    -> nil
+ *
  *  Defines a named attribute for this module, where the name is
  *  <i>symbol.</i><code>id2name</code>, creating an instance variable
  *  (<code>@name</code>) and a corresponding access method to read it.
  *  Also creates a method called <code>name=</code> to set the attribute.
- *     
+ *
  *     module Mod
  *       attr_accessor(:one, :two)
  *     end
@@ -1593,17 +1656,17 @@ rb_mod_attr_accessor(int argc, VALUE *argv, VALUE klass)
     int i;
 
     for (i=0; i<argc; i++) {
-	rb_attr(klass, rb_to_id(argv[i]), Qtrue, Qtrue, Qtrue);
+	rb_attr(klass, rb_to_id(argv[i]), TRUE, TRUE, TRUE);
     }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     mod.const_get(sym, inherit=true)    => obj
- *  
+ *     mod.const_get(sym, inherit=true)    -> obj
+ *
  *  Returns the value of the named constant in <i>mod</i>.
- *     
+ *
  *     Math.const_get(:PI)   #=> 3.14159265358979
  *
  *  If the constant is not defined or is defined by the ancestors and
@@ -1632,12 +1695,12 @@ rb_mod_const_get(int argc, VALUE *argv, VALUE mod)
 
 /*
  *  call-seq:
- *     mod.const_set(sym, obj)    => obj
- *  
+ *     mod.const_set(sym, obj)    -> obj
+ *
  *  Sets the named constant to the given object, returning that object.
  *  Creates a new constant if no constant with the given name previously
  *  existed.
- *     
+ *
  *     Math.const_set("HIGH_SCHOOL_PI", 22.0/7.0)   #=> 3.14285714285714
  *     Math::HIGH_SCHOOL_PI - Math::PI              #=> 0.00126448926734968
  */
@@ -1656,11 +1719,11 @@ rb_mod_const_set(VALUE mod, VALUE name, VALUE value)
 
 /*
  *  call-seq:
- *     mod.const_defined?(sym, inherit=true)   => true or false
- *  
+ *     mod.const_defined?(sym, inherit=true)   -> true or false
+ *
  *  Returns <code>true</code> if a constant with the given name is
  *  defined by <i>mod</i>, or its ancestors if +inherit+ is not false.
- *     
+ *
  *     Math.const_defined? "PI"   #=> true
  *     IO.const_defined? "SYNC"   #=> true
  *     IO.const_defined? "SYNC", false   #=> false
@@ -1686,120 +1749,21 @@ rb_mod_const_defined(int argc, VALUE *argv, VALUE mod)
     return RTEST(recur) ? rb_const_defined(mod, id) : rb_const_defined_at(mod, id);
 }
 
-/*
- *  call-seq:
- *     obj.methods    => array
- *  
- *  Returns a list of the names of methods publicly accessible in
- *  <i>obj</i>. This will include all the methods accessible in
- *  <i>obj</i>'s ancestors.
- *     
- *     class Klass
- *       def kMethod()
- *       end
- *     end
- *     k = Klass.new
- *     k.methods[0..9]    #=> ["kMethod", "freeze", "nil?", "is_a?", 
- *                        #    "class", "instance_variable_set",
- *                        #    "methods", "extend", "__send__", "instance_eval"]
- *     k.methods.length   #=> 42
- */
-
-static VALUE
-rb_obj_methods(int argc, VALUE *argv, VALUE obj)
-{
-  retry:
-    if (argc == 0) {
-	VALUE args[1];
-
-	args[0] = Qtrue;
-	return rb_class_instance_methods(1, args, CLASS_OF(obj));
-    }
-    else {
-	VALUE recur;
-
-	rb_scan_args(argc, argv, "1", &recur);
-	if (RTEST(recur)) {
-	    argc = 0;
-	    goto retry;
-	}
-	return rb_obj_singleton_methods(argc, argv, obj);
-    }
-}
-
-/*
- *  call-seq:
- *     obj.protected_methods(all=true)   => array
- *  
- *  Returns the list of protected methods accessible to <i>obj</i>. If
- *  the <i>all</i> parameter is set to <code>false</code>, only those methods
- *  in the receiver will be listed.
- */
-
-static VALUE
-rb_obj_protected_methods(int argc, VALUE *argv, VALUE obj)
-{
-    if (argc == 0) {		/* hack to stop warning */
-	VALUE args[1];
-
-	args[0] = Qtrue;
-	return rb_class_protected_instance_methods(1, args, CLASS_OF(obj));
-    }
-    return rb_class_protected_instance_methods(argc, argv, CLASS_OF(obj));
-}
+VALUE rb_obj_methods(int argc, VALUE *argv, VALUE obj);
+VALUE rb_obj_protected_methods(int argc, VALUE *argv, VALUE obj);
+VALUE rb_obj_private_methods(int argc, VALUE *argv, VALUE obj);
+VALUE rb_obj_public_methods(int argc, VALUE *argv, VALUE obj);
 
 /*
  *  call-seq:
- *     obj.private_methods(all=true)   => array
- *  
- *  Returns the list of private methods accessible to <i>obj</i>. If
- *  the <i>all</i> parameter is set to <code>false</code>, only those methods
- *  in the receiver will be listed.
- */
-
-static VALUE
-rb_obj_private_methods(int argc, VALUE *argv, VALUE obj)
-{
-    if (argc == 0) {		/* hack to stop warning */
-	VALUE args[1];
-
-	args[0] = Qtrue;
-	return rb_class_private_instance_methods(1, args, CLASS_OF(obj));
-    }
-    return rb_class_private_instance_methods(argc, argv, CLASS_OF(obj));
-}
-
-/*
- *  call-seq:
- *     obj.public_methods(all=true)   => array
- *  
- *  Returns the list of public methods accessible to <i>obj</i>. If
- *  the <i>all</i> parameter is set to <code>false</code>, only those methods
- *  in the receiver will be listed.
- */
-
-static VALUE
-rb_obj_public_methods(int argc, VALUE *argv, VALUE obj)
-{
-    if (argc == 0) {		/* hack to stop warning */
-	VALUE args[1];
-
-	args[0] = Qtrue;
-	return rb_class_public_instance_methods(1, args, CLASS_OF(obj));
-    }
-    return rb_class_public_instance_methods(argc, argv, CLASS_OF(obj));
-}
-
-/*
- *  call-seq:
- *     obj.instance_variable_get(symbol)    => obj
+ *     obj.instance_variable_get(symbol)    -> obj
  *
  *  Returns the value of the given instance variable, or nil if the
  *  instance variable is not set. The <code>@</code> part of the
  *  variable name should be included for regular instance
  *  variables. Throws a <code>NameError</code> exception if the
  *  supplied symbol is not valid as an instance variable name.
- *     
+ *
  *     class Fred
  *       def initialize(p1, p2)
  *         @a, @b = p1, p2
@@ -1823,13 +1787,13 @@ rb_obj_ivar_get(VALUE obj, VALUE iv)
 
 /*
  *  call-seq:
- *     obj.instance_variable_set(symbol, obj)    => obj
- *  
+ *     obj.instance_variable_set(symbol, obj)    -> obj
+ *
  *  Sets the instance variable names by <i>symbol</i> to
  *  <i>object</i>, thereby frustrating the efforts of the class's
  *  author to attempt to provide proper encapsulation. The variable
  *  did not have to exist prior to this call.
- *     
+ *
  *     class Fred
  *       def initialize(p1, p2)
  *         @a, @b = p1, p2
@@ -1854,7 +1818,7 @@ rb_obj_ivar_set(VALUE obj, VALUE iv, VALUE val)
 
 /*
  *  call-seq:
- *     obj.instance_variable_defined?(symbol)    => true or false
+ *     obj.instance_variable_defined?(symbol)    -> true or false
  *
  *  Returns <code>true</code> if the given instance variable is
  *  defined in <i>obj</i>.
@@ -1883,12 +1847,12 @@ rb_obj_ivar_defined(VALUE obj, VALUE iv)
 
 /*
  *  call-seq:
- *     mod.class_variable_get(symbol)    => obj
- *  
+ *     mod.class_variable_get(symbol)    -> obj
+ *
  *  Returns the value of the given class variable (or throws a
  *  <code>NameError</code> exception). The <code>@@</code> part of the
  *  variable name should be included for regular class variables
- *     
+ *
  *     class Fred
  *       @@foo = 99
  *     end
@@ -1908,11 +1872,11 @@ rb_mod_cvar_get(VALUE obj, VALUE iv)
 
 /*
  *  call-seq:
- *     obj.class_variable_set(symbol, obj)    => obj
- *  
+ *     obj.class_variable_set(symbol, obj)    -> obj
+ *
  *  Sets the class variable names by <i>symbol</i> to
  *  <i>object</i>.
- *     
+ *
  *     class Fred
  *       @@foo = 99
  *       def foo
@@ -1937,7 +1901,7 @@ rb_mod_cvar_set(VALUE obj, VALUE iv, VALUE val)
 
 /*
  *  call-seq:
- *     obj.class_variable_defined?(symbol)    => true or false
+ *     obj.class_variable_defined?(symbol)    -> true or false
  *
  *  Returns <code>true</code> if the given class variable is defined
  *  in <i>obj</i>.
@@ -1981,6 +1945,7 @@ convert_type(VALUE val, const char *tname, const char *method, int raise)
 {
     ID m = 0;
     int i;
+    VALUE r;
 
     for (i=0; conv_method_names[i].method; i++) {
 	if (conv_method_names[i].method[0] == method[0] &&
@@ -1990,20 +1955,19 @@ convert_type(VALUE val, const char *tname, const char *method, int raise)
 	}
     }
     if (!m) m = rb_intern(method);
-    if (!rb_respond_to(val, m)) {
+    r = rb_check_funcall(val, m, 0, 0);
+    if (r == Qundef) {
 	if (raise) {
 	    rb_raise(rb_eTypeError, "can't convert %s into %s",
 		     NIL_P(val) ? "nil" :
 		     val == Qtrue ? "true" :
 		     val == Qfalse ? "false" :
-		     rb_obj_classname(val), 
+		     rb_obj_classname(val),
 		     tname);
 	}
-	else {
-	    return Qnil;
-	}
+	return Qnil;
     }
-    return rb_funcall(val, m, 0);
+    return r;
 }
 
 VALUE
@@ -2012,7 +1976,7 @@ rb_convert_type(VALUE val, int type, const char *tname, const char *method)
     VALUE v;
 
     if (TYPE(val) == type) return val;
-    v = convert_type(val, tname, method, Qtrue);
+    v = convert_type(val, tname, method, TRUE);
     if (TYPE(v) != type) {
 	const char *cname = rb_obj_classname(val);
 	rb_raise(rb_eTypeError, "can't convert %s to %s (%s#%s gives %s)",
@@ -2028,7 +1992,7 @@ rb_check_convert_type(VALUE val, int type, const char *tname, const char *method
 
     /* always convert T_DATA */
     if (TYPE(val) == type && type != T_DATA) return val;
-    v = convert_type(val, tname, method, Qfalse);
+    v = convert_type(val, tname, method, FALSE);
     if (NIL_P(v)) return Qnil;
     if (TYPE(v) != type) {
 	const char *cname = rb_obj_classname(val);
@@ -2045,7 +2009,8 @@ rb_to_integer(VALUE val, const char *method)
     VALUE v;
 
     if (FIXNUM_P(val)) return val;
-    v = convert_type(val, "Integer", method, Qtrue);
+    if (TYPE(val) == T_BIGNUM) return val;
+    v = convert_type(val, "Integer", method, TRUE);
     if (!rb_obj_is_kind_of(v, rb_cInteger)) {
 	const char *cname = rb_obj_classname(val);
 	rb_raise(rb_eTypeError, "can't convert %s to Integer (%s#%s gives %s)",
@@ -2060,7 +2025,8 @@ rb_check_to_integer(VALUE val, const char *method)
     VALUE v;
 
     if (FIXNUM_P(val)) return val;
-    v = convert_type(val, "Integer", method, Qfalse);
+    if (TYPE(val) == T_BIGNUM) return val;
+    v = convert_type(val, "Integer", method, FALSE);
     if (!rb_obj_is_kind_of(v, rb_cInteger)) {
 	return Qnil;
     }
@@ -2073,13 +2039,14 @@ rb_to_int(VALUE val)
     return rb_to_integer(val, "to_int");
 }
 
-VALUE
-rb_Integer(VALUE val)
+static VALUE
+rb_convert_to_integer(VALUE val, int base)
 {
     VALUE tmp;
 
     switch (TYPE(val)) {
       case T_FLOAT:
+	if (base != 0) goto arg_error;
 	if (RFLOAT_VALUE(val) <= (double)FIXNUM_MAX
 	    && RFLOAT_VALUE(val) >= (double)FIXNUM_MIN) {
 	    break;
@@ -2088,46 +2055,78 @@ rb_Integer(VALUE val)
 
       case T_FIXNUM:
       case T_BIGNUM:
+	if (base != 0) goto arg_error;
 	return val;
 
       case T_STRING:
-	return rb_str_to_inum(val, 0, Qtrue);
+      string_conv:
+	return rb_str_to_inum(val, base, TRUE);
 
       case T_NIL:
+	if (base != 0) goto arg_error;
 	rb_raise(rb_eTypeError, "can't convert nil into Integer");
 	break;
 
       default:
 	break;
     }
-    tmp = convert_type(val, "Integer", "to_int", Qfalse);
+    if (base != 0) {
+	tmp = rb_check_string_type(val);
+	if (!NIL_P(tmp)) goto string_conv;
+      arg_error:
+	rb_raise(rb_eArgError, "base specified for non string value");
+    }
+    tmp = convert_type(val, "Integer", "to_int", FALSE);
     if (NIL_P(tmp)) {
 	return rb_to_integer(val, "to_i");
     }
     return tmp;
+
+}
+
+VALUE
+rb_Integer(VALUE val)
+{
+    return rb_convert_to_integer(val, 0);
 }
 
 /*
  *  call-seq:
- *     Integer(arg)    => integer
- *  
+ *     Integer(arg,base=0)    -> integer
+ *
  *  Converts <i>arg</i> to a <code>Fixnum</code> or <code>Bignum</code>.
  *  Numeric types are converted directly (with floating point numbers
- *  being truncated). If <i>arg</i> is a <code>String</code>, leading
- *  radix indicators (<code>0</code>, <code>0b</code>, and
- *  <code>0x</code>) are honored. Others are converted using
- *  <code>to_int</code> and <code>to_i</code>. This behavior is
- *  different from that of <code>String#to_i</code>.
- *     
+ *  being truncated).    <i>base</i> (0, or between 2 and 36) is a base for
+ *  integer string representation.  If <i>arg</i> is a <code>String</code>,
+ *  when <i>base</i> is omitted or equals to zero, radix indicators
+ *  (<code>0</code>, <code>0b</code>, and <code>0x</code>) are honored.
+ *  In any case, strings should be strictly conformed to numeric
+ *  representation. This behavior is different from that of
+ *  <code>String#to_i</code>.  Non string values will be converted using
+ *  <code>to_int</code>, and <code>to_i</code>.
+ *
  *     Integer(123.999)    #=> 123
  *     Integer("0x1a")     #=> 26
  *     Integer(Time.new)   #=> 1204973019
  */
 
 static VALUE
-rb_f_integer(VALUE obj, VALUE arg)
+rb_f_integer(int argc, VALUE *argv, VALUE obj)
 {
-    return rb_Integer(arg);
+    VALUE arg = Qnil;
+    int base = 0;
+
+    switch (argc) {
+      case 2:
+	base = NUM2INT(argv[1]);
+      case 1:
+	arg = argv[0];
+	break;
+      default:
+	/* should cause ArgumentError */
+	rb_scan_args(argc, argv, "11", NULL, NULL);
+    }
+    return rb_convert_to_integer(arg, base);
 }
 
 double
@@ -2138,11 +2137,19 @@ rb_cstr_to_dbl(const char *p, int badcheck)
     double d;
     const char *ellipsis = "";
     int w;
-#define OutOfRange() (((w = end - p) > 20) ? (w = 20, ellipsis = "...") : (ellipsis = ""))
+    enum {max_width = 20};
+#define OutOfRange() ((end - p > max_width) ? \
+		      (w = max_width, ellipsis = "...") : \
+		      (w = (int)(end - p), ellipsis = ""))
 
     if (!p) return 0.0;
     q = p;
     while (ISSPACE(*p)) p++;
+
+    if (!badcheck && p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) {
+	return 0.0;
+    }
+
     d = strtod(p, &end);
     if (errno == ERANGE) {
 	OutOfRange();
@@ -2181,6 +2188,11 @@ rb_cstr_to_dbl(const char *p, int badcheck)
 	}
 	*n = '\0';
 	p = buf;
+
+	if (!badcheck && p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) {
+	    return 0.0;
+	}
+
 	d = strtod(p, &end);
 	if (errno == ERANGE) {
 	    OutOfRange();
@@ -2211,6 +2223,9 @@ rb_str_to_dbl(VALUE str, int badcheck)
     s = RSTRING_PTR(str);
     len = RSTRING_LEN(str);
     if (s) {
+	if (badcheck && memchr(s, '\0', len)) {
+	    rb_raise(rb_eArgError, "string for Float contains null byte");
+	}
 	if (s[len]) {		/* no sentinel somehow */
 	    char *p = ALLOCA_N(char, len+1);
 
@@ -2218,9 +2233,6 @@ rb_str_to_dbl(VALUE str, int badcheck)
 	    p[len] = '\0';
 	    s = p;
 	}
-	if (badcheck && len != strlen(s)) {
-	    rb_raise(rb_eArgError, "string for Float contains null byte");
-	}
     }
     return rb_cstr_to_dbl(s, badcheck);
 }
@@ -2239,7 +2251,7 @@ rb_Float(VALUE val)
 	return DBL2NUM(rb_big2dbl(val));
 
       case T_STRING:
-	return DBL2NUM(rb_str_to_dbl(val, Qtrue));
+	return DBL2NUM(rb_str_to_dbl(val, TRUE));
 
       case T_NIL:
 	rb_raise(rb_eTypeError, "can't convert nil into Float");
@@ -2252,12 +2264,12 @@ rb_Float(VALUE val)
 
 /*
  *  call-seq:
- *     Float(arg)    => float
- *  
+ *     Float(arg)    -> float
+ *
  *  Returns <i>arg</i> converted to a float. Numeric types are converted
  *  directly, the rest are converted using <i>arg</i>.to_f. As of Ruby
  *  1.8, converting <code>nil</code> generates a <code>TypeError</code>.
- *     
+ *
  *     Float(1)           #=> 1.0
  *     Float("123.456")   #=> 123.456
  */
@@ -2282,6 +2294,16 @@ rb_to_float(VALUE val)
     return rb_convert_type(val, T_FLOAT, "Float", "to_f");
 }
 
+VALUE
+rb_check_to_float(VALUE val)
+{
+    if (TYPE(val) == T_FLOAT) return val;
+    if (!rb_obj_is_kind_of(val, rb_cNumeric)) {
+	return Qnil;
+    }
+    return rb_check_convert_type(val, T_FLOAT, "Float", "to_f");
+}
+
 double
 rb_num2dbl(VALUE val)
 {
@@ -2304,17 +2326,6 @@ rb_num2dbl(VALUE val)
     return RFLOAT_VALUE(rb_Float(val));
 }
 
-char*
-rb_str2cstr(VALUE str, long *len)
-{
-    StringValue(str);
-    if (len) *len = RSTRING_LEN(str);
-    else if (RTEST(ruby_verbose) && RSTRING_LEN(str) != strlen(RSTRING_PTR(str))) {
-	rb_warn("string contains \\0 character");
-    }
-    return RSTRING_PTR(str);
-}
-
 VALUE
 rb_String(VALUE val)
 {
@@ -2324,11 +2335,11 @@ rb_String(VALUE val)
 
 /*
  *  call-seq:
- *     String(arg)   => string
- *  
+ *     String(arg)   -> string
+ *
  *  Converts <i>arg</i> to a <code>String</code> by calling its
  *  <code>to_s</code> method.
- *     
+ *
  *     String(self)        #=> "main"
  *     String(self.class)  #=> "Object"
  *     String(123456)      #=> "123456"
@@ -2356,11 +2367,11 @@ rb_Array(VALUE val)
 
 /*
  *  call-seq:
- *     Array(arg)    => array
- *  
+ *     Array(arg)    -> array
+ *
  *  Returns <i>arg</i> as an <code>Array</code>. First tries to call
  *  <i>arg</i><code>.to_ary</code>, then <i>arg</i><code>.to_a</code>.
- *     
+ *
  *     Array(1..5)   #=> [1, 2, 3, 4, 5]
  */
 
@@ -2370,31 +2381,12 @@ rb_f_array(VALUE obj, VALUE arg)
     return rb_Array(arg);
 }
 
-static VALUE
-boot_defclass(const char *name, VALUE super)
-{
-    extern st_table *rb_class_tbl;
-    VALUE obj = rb_class_boot(super);
-    ID id = rb_intern(name);
-
-    rb_name_class(obj, id);
-    st_add_direct(rb_class_tbl, id, obj);
-    rb_const_set((rb_cObject ? rb_cObject : obj), id, obj);
-    return obj;
-}
-
-static void
-boot_defmetametaclass(VALUE klass, VALUE metametaclass)
-{
-    RBASIC(RBASIC(klass)->klass)->klass = metametaclass;
-}
-
 /*
  *  Document-class: Class
  *
  *  Classes in Ruby are first-class objects---each is an instance of
  *  class <code>Class</code>.
- *     
+ *
  *  When a new class is created (typically using <code>class Name ...
  *  end</code>), an object of type <code>Class</code> is created and
  *  assigned to a global constant (<code>Name</code> in this case). When
@@ -2402,7 +2394,7 @@ boot_defmetametaclass(VALUE klass, VALUE metametaclass)
  *  <code>new</code> method in <code>Class</code> is run by default.
  *  This can be demonstrated by overriding <code>new</code> in
  *  <code>Class</code>:
- *     
+ *
  *     class Class
  *        alias oldNew  new
  *        def new(*args)
@@ -2410,59 +2402,76 @@ boot_defmetametaclass(VALUE klass, VALUE metametaclass)
  *          oldNew(*args)
  *        end
  *      end
- *     
- *     
+ *
+ *
  *      class Name
  *      end
- *     
- *     
+ *
+ *
  *      n = Name.new
- *     
+ *
  *  <em>produces:</em>
- *     
+ *
  *     Creating a new Name
- *     
+ *
  *  Classes, modules, and objects are interrelated. In the diagram
  *  that follows, the vertical arrows represent inheritance, and the
- *  parentheses meta-classes. All metaclasses are instances 
+ *  parentheses meta-classes. All metaclasses are instances
  *  of the class `Class'.
+ *                             +---------+             +-...
+ *                             |         |             |
+ *             BasicObject-----|-->(BasicObject)-------|-...
+ *                 ^           |         ^             |
+ *                 |           |         |             |
+ *              Object---------|----->(Object)---------|-...
+ *                 ^           |         ^             |
+ *                 |           |         |             |
+ *                 +-------+   |         +--------+    |
+ *                 |       |   |         |        |    |
+ *                 |    Module-|---------|--->(Module)-|-...
+ *                 |       ^   |         |        ^    |
+ *                 |       |   |         |        |    |
+ *                 |     Class-|---------|---->(Class)-|-...
+ *                 |       ^   |         |        ^    |
+ *                 |       +---+         |        +----+
+ *                 |                     |
+ *    obj--->OtherClass---------->(OtherClass)-----------...
  *
- *                             +-----------------+
- *                            |                  |
- *           BasicObject-->(BasicObject)         |
- *                ^           ^                  |
- *                |           |                  |
- *              Object---->(Object)              |
- *               ^  ^        ^  ^                |
- *               |  |        |  |                |
- *               |  |  +-----+  +---------+      |
- *               |  |  |                  |      |
- *               |  +-----------+         |      |
- *               |     |        |         |      |
- *        +------+     |     Module--->(Module)  |
- *        |            |        ^         ^      |
- *   OtherClass-->(OtherClass)  |         |      |
- *                              |         |      |
- *                            Class---->(Class)  |
- *                              ^                |
- *                              |                |
- *                              +----------------+
  */
 
 
+/*!
+ * Initializes the world of objects and classes.
+ *
+ * At first, the function bootstraps the class hierarchy.
+ * It initializes the most fundamental classes and their metaclasses.
+ * - \c BasicObject
+ * - \c Object
+ * - \c Module
+ * - \c Class
+ * After the bootstrap step, the class hierarchy becomes as the following
+ * diagram.
+ *
+ * \image html boottime-classes.png
+ *
+ * Then, the function defines classes, modules and methods as usual.
+ * \ingroup class
+ */
+
 /*
+ *
  *  <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.
- *     
+ *
  *  <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.
- *     
+ *
  *  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>).
@@ -2471,27 +2480,15 @@ boot_defmetametaclass(VALUE klass, VALUE metametaclass)
 void
 Init_Object(void)
 {
+    extern void Init_class_hierarchy(void);
     int i;
 
+    Init_class_hierarchy();
+
 #undef rb_intern
 #define rb_intern(str) rb_intern_const(str)
 
-    VALUE metaclass;
-
-    rb_cBasicObject = boot_defclass("BasicObject", 0);
-    rb_cObject = boot_defclass("Object", rb_cBasicObject);
-    rb_cModule = boot_defclass("Module", rb_cObject);
-    rb_cClass =  boot_defclass("Class",  rb_cModule);
-
-    metaclass = rb_make_metaclass(rb_cBasicObject, rb_cClass);
-    metaclass = rb_make_metaclass(rb_cObject, metaclass);
-    metaclass = rb_make_metaclass(rb_cModule, metaclass);
-    metaclass = rb_make_metaclass(rb_cClass, metaclass);
-    boot_defmetametaclass(rb_cModule, metaclass);
-    boot_defmetametaclass(rb_cObject, metaclass);
-    boot_defmetametaclass(rb_cBasicObject, metaclass);
-
-    rb_define_private_method(rb_cBasicObject, "initialize", rb_obj_dummy, 0);
+    rb_define_private_method(rb_cBasicObject, "initialize", rb_obj_dummy, -1);
     rb_define_alloc_func(rb_cBasicObject, rb_class_allocate_instance);
     rb_define_method(rb_cBasicObject, "==", rb_obj_equal, 1);
     rb_define_method(rb_cBasicObject, "equal?", rb_obj_equal, 1);
@@ -2512,15 +2509,20 @@ Init_Object(void)
     rb_define_private_method(rb_cModule, "method_undefined", rb_obj_dummy, 1);
 
     rb_define_method(rb_mKernel, "nil?", rb_false, 0);
-    rb_define_method(rb_mKernel, "===", rb_equal, 1); 
+    rb_define_method(rb_mKernel, "===", rb_equal, 1);
     rb_define_method(rb_mKernel, "=~", rb_obj_match, 1);
     rb_define_method(rb_mKernel, "!~", rb_obj_not_match, 1);
     rb_define_method(rb_mKernel, "eql?", rb_obj_equal, 1);
+    rb_define_method(rb_mKernel, "hash", rb_obj_hash, 0);
+    rb_define_method(rb_mKernel, "<=>", rb_obj_cmp, 1);
 
     rb_define_method(rb_mKernel, "class", rb_obj_class, 0);
+    rb_define_method(rb_mKernel, "singleton_class", rb_obj_singleton_class, 0);
     rb_define_method(rb_mKernel, "clone", rb_obj_clone, 0);
     rb_define_method(rb_mKernel, "dup", rb_obj_dup, 0);
     rb_define_method(rb_mKernel, "initialize_copy", rb_obj_init_copy, 1);
+    rb_define_method(rb_mKernel, "initialize_dup", rb_obj_init_dup_clone, 1);
+    rb_define_method(rb_mKernel, "initialize_clone", rb_obj_init_dup_clone, 1);
 
     rb_define_method(rb_mKernel, "taint", rb_obj_taint, 0);
     rb_define_method(rb_mKernel, "tainted?", rb_obj_tainted, 0);
@@ -2553,7 +2555,7 @@ Init_Object(void)
     rb_define_global_function("sprintf", rb_f_sprintf, -1); /* in sprintf.c */
     rb_define_global_function("format", rb_f_sprintf, -1);  /* in sprintf.c */
 
-    rb_define_global_function("Integer", rb_f_integer, 1);
+    rb_define_global_function("Integer", rb_f_integer, -1);
     rb_define_global_function("Float", rb_f_float, 1);
 
     rb_define_global_function("String", rb_f_string, 1);
@@ -2597,24 +2599,24 @@ Init_Object(void)
     rb_define_alloc_func(rb_cModule, rb_module_s_alloc);
     rb_define_method(rb_cModule, "initialize", rb_mod_initialize, 0);
     rb_define_method(rb_cModule, "instance_methods", rb_class_instance_methods, -1); /* in class.c */
-    rb_define_method(rb_cModule, "public_instance_methods", 
+    rb_define_method(rb_cModule, "public_instance_methods",
 		     rb_class_public_instance_methods, -1);    /* in class.c */
-    rb_define_method(rb_cModule, "protected_instance_methods", 
+    rb_define_method(rb_cModule, "protected_instance_methods",
 		     rb_class_protected_instance_methods, -1); /* in class.c */
-    rb_define_method(rb_cModule, "private_instance_methods", 
+    rb_define_method(rb_cModule, "private_instance_methods",
 		     rb_class_private_instance_methods, -1);   /* in class.c */
 
     rb_define_method(rb_cModule, "constants", rb_mod_constants, -1); /* in variable.c */
     rb_define_method(rb_cModule, "const_get", rb_mod_const_get, -1);
     rb_define_method(rb_cModule, "const_set", rb_mod_const_set, 2);
     rb_define_method(rb_cModule, "const_defined?", rb_mod_const_defined, -1);
-    rb_define_private_method(rb_cModule, "remove_const", 
+    rb_define_private_method(rb_cModule, "remove_const",
 			     rb_mod_remove_const, 1); /* in variable.c */
-    rb_define_method(rb_cModule, "const_missing", 
+    rb_define_method(rb_cModule, "const_missing",
 		     rb_mod_const_missing, 1); /* in variable.c */
-    rb_define_method(rb_cModule, "class_variables", 
+    rb_define_method(rb_cModule, "class_variables",
 		     rb_mod_class_variables, 0); /* in variable.c */
-    rb_define_method(rb_cModule, "remove_class_variable", 
+    rb_define_method(rb_cModule, "remove_class_variable",
 		     rb_mod_remove_cvar, 1); /* in variable.c */
     rb_define_method(rb_cModule, "class_variable_get", rb_mod_cvar_get, 1);
     rb_define_method(rb_cModule, "class_variable_set", rb_mod_cvar_set, 2);
@@ -2655,6 +2657,8 @@ Init_Object(void)
     id_match = rb_intern("=~");
     id_inspect = rb_intern("inspect");
     id_init_copy = rb_intern("initialize_copy");
+    id_init_clone = rb_intern("initialize_clone");
+    id_init_dup = rb_intern("initialize_dup");
 
     for (i=0; conv_method_names[i].method; i++) {
 	conv_method_names[i].id = rb_intern(conv_method_names[i].method);