--BXVAT5kNtrzKuDFl
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Hi Core,
I readed class.allocate's documentation and I think that's
a little incomplete and I added a bit explanation and an example.
I Attached the patch.
Looking forward for this being applied.
Regards.
--
"Premature optimization is the root of all evil (or at least most of it) in
programming."
(Donald Knuth)
+-------------------------------------+
Gastóī Ramos
http://gastonramos.wordpress.com/
GNU/Linux Counter user #450312
--BXVAT5kNtrzKuDFl
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="improve_class_allocate_doc.patch"
Index: object.c
--- object.c (revision 16741)
+++ object.c (working copy)
@@ -36,7 +36,7 @@
/*
* call-seq:
* obj other true or false
- *
+ *
* Case Equality---For class <code>Object</code>, effectively the same
* as calling <code># /code>, but typically overridden by descendents
* to provide meaningful semantics in <code>case</code> statements.
@@ -66,7 +66,7 @@
* 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
@@ -85,7 +85,7 @@
* tradition, but 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
*/
@@ -101,7 +101,7 @@
/*
* call-seq:
* obj.id fixnum
- *
+ *
* Soon-to-be deprecated version of <code>Object#object_id</code>.
*/
@@ -118,7 +118,7 @@
VALUE cl;
{
while (FL_TEST(cl, FL_SINGLETON) || TYPE(cl) T_ICLASS) {
- cl CLASS(cl)->super;
+ cl CLASS(cl)->super;
}
return cl;
}
@@ -126,7 +126,7 @@
/*
* call-seq:
* obj.type class
- *
+ *
* Deprecated synonym for <code>Object#class</code>.
*/
@@ -142,13 +142,13 @@
/*
* 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
* called with an explicit receiver, as <code>class</code> is also a
* reserved word in Ruby.
- *
+ *
* 1.class # Fixnum
* self.class # Object
*/
@@ -170,20 +170,20 @@
RBASIC(dest)->flags & (T_MASK|FL_EXIVAR);
RBASIC(dest)->flags | BASIC(obj)->flags & (T_MASK|FL_EXIVAR|FL_TAINT);
if (FL_TEST(obj, FL_EXIVAR)) {
- rb_copy_generic_ivar(dest, obj);
+ rb_copy_generic_ivar(dest, obj);
}
rb_gc_copy_finalizer(dest, obj);
switch (TYPE(obj)) {
case T_OBJECT:
case T_CLASS:
case T_MODULE:
- if (ROBJECT(dest)->iv_tbl) {
- st_free_table(ROBJECT(dest)->iv_tbl);
- ROBJECT(dest)->iv_tbl ;
- }
- if (ROBJECT(obj)->iv_tbl) {
- ROBJECT(dest)->iv_tbl t_copy(ROBJECT(obj)->iv_tbl);
- }
+ if (ROBJECT(dest)->iv_tbl) {
+ st_free_table(ROBJECT(dest)->iv_tbl);
+ ROBJECT(dest)->iv_tbl ;
+ }
+ if (ROBJECT(obj)->iv_tbl) {
+ ROBJECT(dest)->iv_tbl t_copy(ROBJECT(obj)->iv_tbl);
+ }
}
rb_funcall(dest, id_init_copy, 1, obj);
}
@@ -191,12 +191,12 @@
/*
* 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
@@ -233,7 +233,7 @@
/*
* 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
@@ -271,7 +271,7 @@
if (obj orig) return obj;
rb_check_frozen(obj);
if (TYPE(obj) ! YPE(orig) || rb_obj_class(obj) ! b_obj_class(orig)) {
- rb_raise(rb_eTypeError, "initialize_copy should take same class object");
+ rb_raise(rb_eTypeError, "initialize_copy should take same class object");
}
return obj;
}
@@ -279,12 +279,12 @@
/*
* call-seq:
* obj.to_a -> anArray
- *
+ *
* Returns an array representation of <i>obj</i>. For objects of class
* <code>Object</code> and others that don't explicitly override the
- * method, the return value is an array containing <code>self</code>.
+ * method, the return value is an array containing <code>self</code>.
* However, this latter behavior will soon be obsolete.
- *
+ *
* self.to_a # -:1: warning: default `to_a' will be obsolete
* "hello".to_a # ["hello"]
* Time.new.to_a # [39, 54, 8, 9, 4, 2003, 3, 99, true, "CDT"]
@@ -303,7 +303,7 @@
/*
* call-seq:
* 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
@@ -347,11 +347,11 @@
if (CLASS_OF(value) 0) return ST_CONTINUE;
if (!rb_is_instance_id(id)) return ST_CONTINUE;
if (RSTRING(str)->ptr[0] '-') { /* first element */
- RSTRING(str)->ptr[0] #';
- rb_str_cat2(str, " ");
+ RSTRING(str)->ptr[0] #';
+ rb_str_cat2(str, " ");
}
else {
- rb_str_cat2(str, ", ");
+ rb_str_cat2(str, ", ");
}
ivname b_id2name(id);
rb_str_cat2(str, ivname);
@@ -378,11 +378,11 @@
/*
* call-seq:
* 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
* generate the string.
- *
+ *
* [ 1, 2, 3..4, 'five' ].inspect # "[1, 2, 3..4, \"five\"]"
* Time.new.inspect # "Wed Apr 09 08:54:39 CDT 2003"
*/
@@ -393,24 +393,24 @@
VALUE obj;
{
if (TYPE(obj) T_OBJECT
- && ROBJECT(obj)->iv_tbl
- && ROBJECT(obj)->iv_tbl->num_entries > 0) {
- VALUE str;
- size_t len;
- const char *c b_obj_classname(obj);
+ && ROBJECT(obj)->iv_tbl
+ && ROBJECT(obj)->iv_tbl->num_entries > 0) {
+ VALUE str;
+ size_t len;
+ const char *c b_obj_classname(obj);
- if (rb_inspecting_p(obj)) {
- len trlen(c)+10+16+1;
- str b_str_new(0, len); /* 10:tags 16:addr 1:nul */
- snprintf(RSTRING(str)->ptr, len, "#<%s:0x%lx ...>", c, obj);
- RSTRING(str)->len trlen(RSTRING(str)->ptr);
- return str;
- }
- len trlen(c)+6+16+1;
- str b_str_new(0, len); /* 6:tags 16:addr 1:nul */
- snprintf(RSTRING(str)->ptr, len, "-<%s:0x%lx", c, obj);
- RSTRING(str)->len trlen(RSTRING(str)->ptr);
- return rb_protect_inspect(inspect_obj, obj, str);
+ if (rb_inspecting_p(obj)) {
+ len trlen(c)+10+16+1;
+ str b_str_new(0, len); /* 10:tags 16:addr 1:nul */
+ snprintf(RSTRING(str)->ptr, len, "#<%s:0x%lx ...>", c, obj);
+ RSTRING(str)->len trlen(RSTRING(str)->ptr);
+ return str;
+ }
+ len trlen(c)+6+16+1;
+ str b_str_new(0, len); /* 6:tags 16:addr 1:nul */
+ snprintf(RSTRING(str)->ptr, len, "-<%s:0x%lx", c, obj);
+ RSTRING(str)->len trlen(RSTRING(str)->ptr);
+ return rb_protect_inspect(inspect_obj, obj, str);
}
return rb_funcall(obj, rb_intern("to_s"), 0, 0);
}
@@ -419,7 +419,7 @@
/*
* call-seq:
* 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>.
*/
@@ -432,9 +432,9 @@
case T_MODULE:
case T_CLASS:
case T_ICLASS:
- break;
+ break;
default:
- rb_raise(rb_eTypeError, "class or module required");
+ rb_raise(rb_eTypeError, "class or module required");
}
if (rb_obj_class(obj) c) return Qtrue;
@@ -446,11 +446,11 @@
* call-seq:
* 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
@@ -478,16 +478,16 @@
case T_MODULE:
case T_CLASS:
case T_ICLASS:
- break;
+ break;
default:
- rb_raise(rb_eTypeError, "class or module required");
+ rb_raise(rb_eTypeError, "class or module required");
}
while (cl) {
- if (cl c || RCLASS(cl)->m_tbl RCLASS(c)->m_tbl)
- return Qtrue;
- cl CLASS(cl)->super;
+ if (cl c || RCLASS(cl)->m_tbl RCLASS(c)->m_tbl)
+ return Qtrue;
+ cl CLASS(cl)->super;
}
return Qfalse;
}
@@ -496,20 +496,20 @@
/*
* call-seq:
* 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.
*
- * (1..10).tap {
- * |x| puts "original: #{x.inspect}"
- * }.to_a.tap {
- * |x| puts "array: #{x.inspect}"
- * }.select {|x| x%2 }.tap {
- * |x| puts "evens: #{x.inspect}"
- * }.map {|x| x*x}.tap {
- * |x| puts "squares: #{x.inspect}"
- * }
+ * (1..10).tap {
+ * |x| puts "original: #{x.inspect}"
+ * }.to_a.tap {
+ * |x| puts "array: #{x.inspect}"
+ * }.select {|x| x%2 }.tap {
+ * |x| puts "evens: #{x.inspect}"
+ * }.map {|x| x*x}.tap {
+ * |x| puts "squares: #{x.inspect}"
+ * }
*
*/
@@ -555,10 +555,10 @@
*
* 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}"
@@ -567,13 +567,13 @@
* def two() end
* def Chatty.three() end
* end
- *
+ *
* <em>produces:</em>
- *
+ *
* Adding singleton_method_added
* Adding one
* Adding three
- *
+ *
*/
/*
@@ -581,10 +581,10 @@
*
* 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}"
@@ -597,9 +597,9 @@
* remove_method :one
* end
* end
- *
+ *
* <em>produces:</em>
- *
+ *
* Removing three
* Removing one
*/
@@ -609,10 +609,10 @@
*
* 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}"
@@ -622,9 +622,9 @@
* undef_method(:one)
* end
* end
- *
+ *
* <em>produces:</em>
- *
+ *
* Undefining one
*/
@@ -664,7 +664,7 @@
/*
* call-seq:
* obj.tainted? true or false
- *
+ *
* Returns <code>true</code> if the object is tainted.
*/
@@ -673,14 +673,14 @@
VALUE obj;
{
if (OBJ_TAINTED(obj))
- return Qtrue;
+ return Qtrue;
return Qfalse;
}
/*
* 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.
@@ -692,10 +692,10 @@
{
rb_secure(4);
if (!OBJ_TAINTED(obj)) {
- if (OBJ_FROZEN(obj)) {
- rb_error_frozen("object");
- }
- OBJ_TAINT(obj);
+ if (OBJ_FROZEN(obj)) {
+ rb_error_frozen("object");
+ }
+ OBJ_TAINT(obj);
}
return obj;
}
@@ -704,7 +704,7 @@
/*
* call-seq:
* obj.untaint obj
- *
+ *
* Removes the taint from <i>obj</i>.
*/
@@ -714,10 +714,10 @@
{
rb_secure(3);
if (OBJ_TAINTED(obj)) {
- if (OBJ_FROZEN(obj)) {
- rb_error_frozen("object");
- }
- FL_UNSET(obj, FL_TAINT);
+ if (OBJ_FROZEN(obj)) {
+ rb_error_frozen("object");
+ }
+ FL_UNSET(obj, FL_TAINT);
}
return obj;
}
@@ -733,20 +733,20 @@
/*
* call-seq:
* obj.freeze obj
- *
+ *
* Prevents further modifications to <i>obj</i>. A
* <code>TypeError</code> will be raised if modification is attempted.
* There is no way to unfreeze a frozen object. See also
* <code>Object#frozen?</code>.
- *
+ *
* a "a", "b", "c" ]
* a.freeze
* a << "z"
- *
+ *
* <em>produces:</em>
- *
+ *
* prog.rb:3:in `<<': can't modify frozen array (TypeError)
- * from prog.rb:3
+ * from prog.rb:3
*/
VALUE
@@ -754,10 +754,10 @@
VALUE obj;
{
if (!OBJ_FROZEN(obj)) {
- if (rb_safe_level() > && !OBJ_TAINTED(obj)) {
- rb_raise(rb_eSecurityError, "Insecure: can't freeze object");
- }
- OBJ_FREEZE(obj);
+ if (rb_safe_level() > && !OBJ_TAINTED(obj)) {
+ rb_raise(rb_eSecurityError, "Insecure: can't freeze object");
+ }
+ OBJ_FREEZE(obj);
}
return obj;
}
@@ -765,9 +765,9 @@
/*
* call-seq:
* 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
@@ -791,9 +791,9 @@
/*
* call-seq:
* nil.to_i 0
- *
+ *
* Always returns zero.
- *
+ *
* nil.to_i # 0
*/
@@ -808,9 +808,9 @@
/*
* call-seq:
* nil.to_f 0.0
- *
+ *
* Always returns zero.
- *
+ *
* nil.to_f # 0.0
*/
@@ -824,9 +824,9 @@
/*
* call-seq:
* nil.to_s ""
- *
+ *
* Always returns the empty string.
- *
+ *
* nil.to_s # ""
*/
@@ -840,9 +840,9 @@
/*
* call-seq:
* nil.to_a []
- *
+ *
* Always returns an empty array.
- *
+ *
* nil.to_a # []
*/
@@ -903,7 +903,7 @@
/*
* call-seq:
* 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.
*/
@@ -918,16 +918,16 @@
/*
* call-seq:
* 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
*/
@@ -942,7 +942,7 @@
/*
* call-seq:
* 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.
@@ -963,7 +963,7 @@
* <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.
- *
+ *
*/
/*
@@ -984,7 +984,7 @@
* call-seq:
* 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.
@@ -1002,7 +1002,7 @@
* call-seq:
* 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.
*/
@@ -1020,11 +1020,11 @@
* call-seq:
* 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
@@ -1068,7 +1068,7 @@
/*
* call-seq:
* obj other false
- *
+ *
* Pattern Match---Overridden by descendents (notably
* <code>Regexp</code> and <code>String</code>) to provide meaningful
* pattern-match semantics.
@@ -1095,7 +1095,7 @@
* one context, a method in another, and a class in a third, the
* <code>Symbol</code> <code>:Fred</code> will be the same object in
* all three contexts.
- *
+ *
* module One
* class Fred
* end
@@ -1111,16 +1111,16 @@
* $f1.id # 2514190
* $f2.id # 2514190
* $f3.id # 2514190
- *
+ *
*/
/*
* call-seq:
* sym.to_i fixnum
- *
+ *
* Returns an integer that is unique for each symbol within a
* particular execution of a program.
- *
+ *
* :fred.to_i # 9809
* "fred".to_sym.to_i # 9809
*/
@@ -1149,9 +1149,9 @@
/*
* call-seq:
* sym.inspect string
- *
+ *
* Returns the representation of <i>sym</i> as a symbol literal.
- *
+ *
* :fred.inspect # ":fred"
*/
@@ -1168,8 +1168,8 @@
RSTRING(str)->ptr[0] :';
strcpy(RSTRING(str)->ptr+1, name);
if (!rb_symname_p(name)) {
- str b_str_dump(str);
- strncpy(RSTRING(str)->ptr, ":\"", 2);
+ str b_str_dump(str);
+ strncpy(RSTRING(str)->ptr, ":\"", 2);
}
return str;
}
@@ -1179,9 +1179,9 @@
* call-seq:
* sym.id2name string
* sym.to_s string
- *
+ *
* Returns the name or string corresponding to <i>sym</i>.
- *
+ *
* :fred.id2name # "fred"
*/
@@ -1218,7 +1218,7 @@
VALUE obj;
if (RARRAY(args)->len < 1) {
- rb_raise(rb_eArgError, "no receiver given");
+ rb_raise(rb_eArgError, "no receiver given");
}
obj b_ary_shift(args);
return rb_apply(obj, (ID)mid, args);
@@ -1252,11 +1252,11 @@
* 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
* to a symbol, which is either a quoted string or a
* <code>Symbol</code> (such as <code>:name</code>).
- *
+ *
* module Mod
* include Math
* CONST
@@ -1267,7 +1267,7 @@
* Mod.class # Module
* Mod.constants # ["E", "PI", "CONST"]
* Mod.instance_methods # ["meth"]
- *
+ *
*/
/*
@@ -1285,21 +1285,21 @@
{
if (FL_TEST(klass, FL_SINGLETON)) {
- VALUE s b_str_new2("#<");
- VALUE v b_iv_get(klass, "__attached__");
+ VALUE s b_str_new2("#<");
+ VALUE v b_iv_get(klass, "__attached__");
- rb_str_cat2(s, "Class:");
- switch (TYPE(v)) {
- case T_CLASS: case T_MODULE:
- rb_str_append(s, rb_inspect(v));
- break;
- default:
- rb_str_append(s, rb_any_to_s(v));
- break;
- }
- rb_str_cat2(s, ">");
+ rb_str_cat2(s, "Class:");
+ switch (TYPE(v)) {
+ case T_CLASS: case T_MODULE:
+ rb_str_append(s, rb_inspect(v));
+ break;
+ default:
+ rb_str_append(s, rb_any_to_s(v));
+ break;
+ }
+ rb_str_cat2(s, ">");
- return s;
+ return s;
}
return rb_str_dup(rb_class_name(klass));
}
@@ -1307,7 +1307,7 @@
/*
* call-seq:
* mod.freeze
- *
+ *
* Prevents further modifications to <i>mod</i>.
*/
@@ -1322,7 +1322,7 @@
/*
* call-seq:
* 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
* limited use for modules, but can be used in <code>case</code>
@@ -1341,9 +1341,9 @@
* mod < ther 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").
*
*/
@@ -1358,26 +1358,26 @@
switch (TYPE(arg)) {
case T_MODULE:
case T_CLASS:
- break;
+ break;
default:
- rb_raise(rb_eTypeError, "compared with non class/module");
+ rb_raise(rb_eTypeError, "compared with non class/module");
}
if (FL_TEST(mod, FL_SINGLETON)) {
- if (RCLASS(mod)->m_tbl RCLASS(arg)->m_tbl)
- return Qtrue;
- mod BASIC(mod)->klass;
+ if (RCLASS(mod)->m_tbl RCLASS(arg)->m_tbl)
+ return Qtrue;
+ mod BASIC(mod)->klass;
}
while (mod) {
- if (RCLASS(mod)->m_tbl RCLASS(arg)->m_tbl)
- return Qtrue;
- mod CLASS(mod)->super;
+ if (RCLASS(mod)->m_tbl RCLASS(arg)->m_tbl)
+ return Qtrue;
+ mod CLASS(mod)->super;
}
/* not mod < arg; check if mod > arg */
while (arg) {
- if (RCLASS(arg)->m_tbl RCLASS(start)->m_tbl)
- return Qfalse;
- arg CLASS(arg)->super;
+ if (RCLASS(arg)->m_tbl RCLASS(start)->m_tbl)
+ return Qfalse;
+ arg CLASS(arg)->super;
}
return Qnil;
}
@@ -1386,9 +1386,9 @@
* call-seq:
* 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").
*
*/
@@ -1407,9 +1407,9 @@
* mod > ther 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").
*
*/
@@ -1421,9 +1421,9 @@
switch (TYPE(arg)) {
case T_MODULE:
case T_CLASS:
- break;
+ break;
default:
- rb_raise(rb_eTypeError, "compared with non class/module");
+ rb_raise(rb_eTypeError, "compared with non class/module");
}
return rb_class_inherited_p(arg, mod);
@@ -1433,9 +1433,9 @@
* call-seq:
* 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").
*
*/
@@ -1451,7 +1451,7 @@
/*
* call-seq:
* 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
@@ -1469,15 +1469,15 @@
switch (TYPE(arg)) {
case T_MODULE:
case T_CLASS:
- break;
+ break;
default:
- return Qnil;
+ return Qnil;
}
cmp b_class_inherited_p(mod, arg);
if (NIL_P(cmp)) return Qnil;
if (cmp) {
- return INT2FIX(-1);
+ return INT2FIX(-1);
}
return INT2FIX(1);
}
@@ -1505,11 +1505,11 @@
* call-seq:
* 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 odule.new do
* def meth1
* "hello"
@@ -1529,7 +1529,7 @@
VALUE module;
{
if (rb_block_given_p()) {
- rb_mod_module_eval(0, 0, module);
+ rb_mod_module_eval(0, 0, module);
}
return Qnil;
}
@@ -1537,11 +1537,11 @@
/*
* call-seq:
* Class.new(super_class ject) 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
@@ -1553,13 +1553,13 @@
VALUE super;
if (RCLASS(klass)->super ! ) {
- rb_raise(rb_eTypeError, "already initialized class");
+ rb_raise(rb_eTypeError, "already initialized class");
}
if (rb_scan_args(argc, argv, "01", &super) 0) {
- super b_cObject;
+ super b_cObject;
}
else {
- rb_check_inheritable(super);
+ rb_check_inheritable(super);
}
RCLASS(klass)->super uper;
rb_make_metaclass(klass, RBASIC(super)->klass);
@@ -1572,10 +1572,22 @@
/*
* call-seq:
* class.allocate() obj
- *
- * Allocates space for a new object of <i>class</i>'s class. The
- * returned object must be an instance of <i>class</i>.
- *
+ *
+ * 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 lass.new do
+ * def initialize(*args)
+ * @initialized rue
+ * end
+ *
+ * def initialized?
+ * @initialized || false
+ * end
+ * end
+ *
+ * klass.allocate.initialized? # false
*/
VALUE
@@ -1585,14 +1597,14 @@
VALUE obj;
if (RCLASS(klass)->super 0) {
- rb_raise(rb_eTypeError, "can't instantiate uninitialized class");
+ rb_raise(rb_eTypeError, "can't instantiate uninitialized class");
}
if (FL_TEST(klass, FL_SINGLETON)) {
- rb_raise(rb_eTypeError, "can't create instance of virtual class");
+ rb_raise(rb_eTypeError, "can't create instance of virtual class");
}
obj b_funcall(klass, ID_ALLOCATOR, 0, 0);
if (rb_obj_class(obj) ! b_class_real(klass)) {
- rb_raise(rb_eTypeError, "wrong instance allocation");
+ rb_raise(rb_eTypeError, "wrong instance allocation");
}
return obj;
}
@@ -1610,13 +1622,13 @@
/*
* call-seq:
* 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
@@ -1636,13 +1648,13 @@
/*
* 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 # nil
- *
+ *
*/
static VALUE
@@ -1652,16 +1664,16 @@
VALUE super CLASS(klass)->super;
if (!super) {
- rb_raise(rb_eTypeError, "uninitialized class");
+ rb_raise(rb_eTypeError, "uninitialized class");
}
if (FL_TEST(klass, FL_SINGLETON)) {
- super BASIC(klass)->klass;
+ super BASIC(klass)->klass;
}
while (TYPE(super) T_ICLASS) {
- super CLASS(super)->super;
+ super CLASS(super)->super;
}
if (!super) {
- return Qnil;
+ return Qnil;
}
return super;
}
@@ -1684,23 +1696,23 @@
switch (TYPE(name)) {
case T_STRING:
- return str_to_id(name);
+ return str_to_id(name);
case T_FIXNUM:
- rb_warn("do not use Fixnums as Symbols");
- id IX2LONG(name);
- if (!rb_id2name(id)) {
- rb_raise(rb_eArgError, "%ld is not a symbol", id);
- }
- break;
+ rb_warn("do not use Fixnums as Symbols");
+ id IX2LONG(name);
+ if (!rb_id2name(id)) {
+ rb_raise(rb_eArgError, "%ld is not a symbol", id);
+ }
+ break;
case T_SYMBOL:
- id YM2ID(name);
- break;
+ id YM2ID(name);
+ break;
default:
- tmp b_check_string_type(name);
- if (!NIL_P(tmp)) {
- return str_to_id(tmp);
- }
- rb_raise(rb_eTypeError, "%s is not a symbol", RSTRING(rb_inspect(name))->ptr);
+ tmp b_check_string_type(name);
+ if (!NIL_P(tmp)) {
+ return str_to_id(tmp);
+ }
+ rb_raise(rb_eTypeError, "%s is not a symbol", RSTRING(rb_inspect(name))->ptr);
}
return id;
}
@@ -1708,19 +1720,19 @@
/*
* call-seq:
* attr(symbol, writableł±se) 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.
* If the optional <i>writable</i> argument is <code>true</code>, also
* creates a method called <code>name code> to set the attribute.
- *
+ *
* module Mod
* attr :size, true
* end
- *
+ *
* <em>is equivalent to:</em>
- *
+ *
* module Mod
* def size
* @size
@@ -1747,7 +1759,7 @@
/*
* call-seq:
* attr_reader(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.
@@ -1762,7 +1774,7 @@
int i;
for (i i<argc; i++) {
- rb_attr(klass, rb_to_id(argv[i]), 1, 0, Qtrue);
+ rb_attr(klass, rb_to_id(argv[i]), 1, 0, Qtrue);
}
return Qnil;
}
@@ -1770,7 +1782,7 @@
/*
* call-seq:
* attr_writer(symbol, ...) nil
- *
+ *
* Creates an accessor method to allow assignment to the attribute
* <i>aSymbol</i><code>.id2name</code>.
*/
@@ -1784,7 +1796,7 @@
int i;
for (i i<argc; i++) {
- rb_attr(klass, rb_to_id(argv[i]), 0, 1, Qtrue);
+ rb_attr(klass, rb_to_id(argv[i]), 0, 1, Qtrue);
}
return Qnil;
}
@@ -1792,10 +1804,10 @@
/*
* call-seq:
* attr_accessor(symbol, ...) nil
- *
+ *
* Equivalent to calling ``<code>attr</code><i>symbol</i><code>,
* true</code>'' on each <i>symbol</i> in turn.
- *
+ *
* module Mod
* attr_accessor(:one, :two)
* end
@@ -1811,7 +1823,7 @@
int i;
for (i i<argc; i++) {
- rb_attr(klass, rb_to_id(argv[i]), 1, 1, Qtrue);
+ rb_attr(klass, rb_to_id(argv[i]), 1, 1, Qtrue);
}
return Qnil;
}
@@ -1819,9 +1831,9 @@
/*
* call-seq:
* mod.const_get(sym) obj
- *
+ *
* Returns the value of the named constant in <i>mod</i>.
- *
+ *
* Math.const_get(:PI) # 3.14159265358979
*/
@@ -1832,7 +1844,7 @@
ID id b_to_id(name);
if (!rb_is_const_id(id)) {
- rb_name_error(id, "wrong constant name %s", rb_id2name(id));
+ rb_name_error(id, "wrong constant name %s", rb_id2name(id));
}
return rb_const_get(mod, id);
}
@@ -1840,11 +1852,11 @@
/*
* call-seq:
* 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
*/
@@ -1856,7 +1868,7 @@
ID id b_to_id(name);
if (!rb_is_const_id(id)) {
- rb_name_error(id, "wrong constant name %s", rb_id2name(id));
+ rb_name_error(id, "wrong constant name %s", rb_id2name(id));
}
rb_const_set(mod, id, value);
return value;
@@ -1865,10 +1877,10 @@
/*
* call-seq:
* mod.const_defined?(sym) true or false
- *
+ *
* Returns <code>true</code> if a constant with the given name is
* defined by <i>mod</i>.
- *
+ *
* Math.const_defined? "PI" # true
*/
@@ -1879,7 +1891,7 @@
ID id b_to_id(name);
if (!rb_is_const_id(id)) {
- rb_name_error(id, "wrong constant name %s", rb_id2name(id));
+ rb_name_error(id, "wrong constant name %s", rb_id2name(id));
}
return rb_const_defined_at(mod, id);
}
@@ -1887,17 +1899,17 @@
/*
* 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 lass.new
- * k.methods[0..9] # ["kMethod", "freeze", "nil?", "is_a?",
+ * k.methods[0..9] # ["kMethod", "freeze", "nil?", "is_a?",
* "class", "instance_variable_set",
* "methods", "extend", "__send__", "instance_eval"]
* k.methods.length # 42
@@ -1911,27 +1923,27 @@
{
retry:
if (argc 0) {
- VALUE args[1];
+ VALUE args[1];
- args[0] true;
- return rb_class_instance_methods(1, args, CLASS_OF(obj));
+ args[0] true;
+ return rb_class_instance_methods(1, args, CLASS_OF(obj));
}
else {
- VALUE recur;
+ VALUE recur;
- rb_scan_args(argc, argv, "1", &recur);
- if (RTEST(recur)) {
- argc ;
- goto retry;
- }
- return rb_obj_singleton_methods(argc, argv, obj);
+ rb_scan_args(argc, argv, "1", &recur);
+ if (RTEST(recur)) {
+ argc ;
+ goto retry;
+ }
+ return rb_obj_singleton_methods(argc, argv, obj);
}
}
/*
* call-seq:
* obj.protected_methods(all ue) 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.
@@ -1943,11 +1955,11 @@
VALUE *argv;
VALUE obj;
{
- if (argc 0) { /* hack to stop warning */
- VALUE args[1];
+ if (argc 0) { /* hack to stop warning */
+ VALUE args[1];
- args[0] true;
- return rb_class_protected_instance_methods(1, args, CLASS_OF(obj));
+ args[0] true;
+ return rb_class_protected_instance_methods(1, args, CLASS_OF(obj));
}
return rb_class_protected_instance_methods(argc, argv, CLASS_OF(obj));
}
@@ -1955,7 +1967,7 @@
/*
* call-seq:
* obj.private_methods(all ue) 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.
@@ -1967,11 +1979,11 @@
VALUE *argv;
VALUE obj;
{
- if (argc 0) { /* hack to stop warning */
- VALUE args[1];
+ if (argc 0) { /* hack to stop warning */
+ VALUE args[1];
- args[0] true;
- return rb_class_private_instance_methods(1, args, CLASS_OF(obj));
+ args[0] true;
+ return rb_class_private_instance_methods(1, args, CLASS_OF(obj));
}
return rb_class_private_instance_methods(argc, argv, CLASS_OF(obj));
}
@@ -1979,7 +1991,7 @@
/*
* call-seq:
* obj.public_methods(all ue) 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.
@@ -1991,11 +2003,11 @@
VALUE *argv;
VALUE obj;
{
- if (argc 0) { /* hack to stop warning */
- VALUE args[1];
+ if (argc 0) { /* hack to stop warning */
+ VALUE args[1];
- args[0] true;
- return rb_class_public_instance_methods(1, args, CLASS_OF(obj));
+ args[0] true;
+ return rb_class_public_instance_methods(1, args, CLASS_OF(obj));
}
return rb_class_public_instance_methods(argc, argv, CLASS_OF(obj));
}
@@ -2009,7 +2021,7 @@
* 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 1, p2
@@ -2027,7 +2039,7 @@
ID id b_to_id(iv);
if (!rb_is_instance_id(id)) {
- rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
+ rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
}
return rb_ivar_get(obj, id);
}
@@ -2035,12 +2047,12 @@
/*
* call-seq:
* 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 1, p2
@@ -2059,7 +2071,7 @@
ID id b_to_id(iv);
if (!rb_is_instance_id(id)) {
- rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
+ rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
}
return rb_ivar_set(obj, id, val);
}
@@ -2089,7 +2101,7 @@
ID id b_to_id(iv);
if (!rb_is_instance_id(id)) {
- rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
+ rb_name_error(id, "`%s' is not allowed as an instance variable name", rb_id2name(id));
}
return rb_ivar_defined(obj, id);
}
@@ -2097,11 +2109,11 @@
/*
* call-seq:
* 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 9
* end
@@ -2118,7 +2130,7 @@
ID id b_to_id(iv);
if (!rb_is_class_id(id)) {
- rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
+ rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
}
return rb_cvar_get(obj, id);
}
@@ -2126,10 +2138,10 @@
/*
* call-seq:
* obj.class_variable_set(symbol, obj) obj
- *
+ *
* Sets the class variable names by <i>symbol</i> to
* <i>object</i>.
- *
+ *
* class Fred
* @@foo 9
* def foo
@@ -2151,7 +2163,7 @@
ID id b_to_id(iv);
if (!rb_is_class_id(id)) {
- rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
+ rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
}
rb_cvar_set(obj, id, val, Qfalse);
return val;
@@ -2178,7 +2190,7 @@
ID id b_to_id(iv);
if (!rb_is_class_id(id)) {
- rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
+ rb_name_error(id, "`%s' is not allowed as a class variable name", rb_id2name(id));
}
return rb_cvar_defined(obj, id);
}
@@ -2193,17 +2205,17 @@
m b_intern(method);
if (!rb_obj_respond_to(val, m, Qtrue)) {
- 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),
- tname);
- }
- else {
- return Qnil;
- }
+ 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),
+ tname);
+ }
+ else {
+ return Qnil;
+ }
}
return rb_funcall(val, m, 0);
}
@@ -2219,8 +2231,8 @@
if (TYPE(val) type) return val;
v onvert_type(val, tname, method, Qtrue);
if (TYPE(v) ! ype) {
- rb_raise(rb_eTypeError, "%s#%s should return %s",
- rb_obj_classname(val), method, tname);
+ rb_raise(rb_eTypeError, "%s#%s should return %s",
+ rb_obj_classname(val), method, tname);
}
return v;
}
@@ -2238,8 +2250,8 @@
v onvert_type(val, tname, method, Qfalse);
if (NIL_P(v)) return Qnil;
if (TYPE(v) ! ype) {
- rb_raise(rb_eTypeError, "%s#%s should return %s",
- rb_obj_classname(val), method, tname);
+ rb_raise(rb_eTypeError, "%s#%s should return %s",
+ rb_obj_classname(val), method, tname);
}
return v;
}
@@ -2252,8 +2264,8 @@
{
VALUE v onvert_type(val, "Integer", method, Qtrue);
if (!rb_obj_is_kind_of(v, rb_cInteger)) {
- rb_raise(rb_eTypeError, "%s#%s should return Integer",
- rb_obj_classname(val), method);
+ rb_raise(rb_eTypeError, "%s#%s should return Integer",
+ rb_obj_classname(val), method);
}
return v;
}
@@ -2266,7 +2278,7 @@
if (FIXNUM_P(val)) return val;
v onvert_type(val, "Integer", method, Qfalse);
if (!rb_obj_is_kind_of(v, rb_cInteger)) {
- return Qnil;
+ return Qnil;
}
return v;
}
@@ -2286,25 +2298,25 @@
switch (TYPE(val)) {
case T_FLOAT:
- if (RFLOAT(val)->value < double)FIXNUM_MAX
- && RFLOAT(val)->value > double)FIXNUM_MIN) {
- break;
- }
- return rb_dbl2big(RFLOAT(val)->value);
+ if (RFLOAT(val)->value < double)FIXNUM_MAX
+ && RFLOAT(val)->value > double)FIXNUM_MIN) {
+ break;
+ }
+ return rb_dbl2big(RFLOAT(val)->value);
case T_FIXNUM:
case T_BIGNUM:
- return val;
+ return val;
case T_STRING:
- return rb_str_to_inum(val, 0, Qtrue);
+ return rb_str_to_inum(val, 0, Qtrue);
default:
- break;
+ break;
}
tmp onvert_type(val, "Integer", "to_int", Qfalse);
if (NIL_P(tmp)) {
- return rb_to_integer(val, "to_i");
+ return rb_to_integer(val, "to_i");
}
return tmp;
}
@@ -2312,7 +2324,7 @@
/*
* call-seq:
* Integer(arg) 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
@@ -2320,7 +2332,7 @@
* <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>.
- *
+ *
* Integer(123.999) # 123
* Integer("0x1a") # 26
* Integer(Time.new) # 1049896590
@@ -2348,63 +2360,63 @@
if (!p) return 0.0;
q ;
if (badcheck) {
- while (ISSPACE(*p)) p++;
+ while (ISSPACE(*p)) p++;
}
else {
- while (ISSPACE(*p) || *p '_') p++;
+ while (ISSPACE(*p) || *p '_') p++;
}
errno ;
d trtod(p, &end);
if (errno ERANGE) {
- OutOfRange();
- rb_warn("Float %.*s%s out of range", w, p, ellipsis);
- errno ;
+ OutOfRange();
+ rb_warn("Float %.*s%s out of range", w, p, ellipsis);
+ errno ;
}
if (p end) {
- if (badcheck) {
- bad:
- rb_invalid_str(q, "Float()");
- }
- return d;
+ if (badcheck) {
+ bad:
+ rb_invalid_str(q, "Float()");
+ }
+ return d;
}
if (*end) {
- char *buf LLOCA_N(char, strlen(p)+1);
- char *n uf;
+ char *buf LLOCA_N(char, strlen(p)+1);
+ char *n uf;
- while (p < end) *n++ p++;
- while (*p) {
- if (*p '_') {
- /* remove underscores between digits */
- if (badcheck) {
- if (n buf || !ISDIGIT(n[-1])) goto bad;
- ++p;
- if (!ISDIGIT(*p)) goto bad;
- }
- else {
- while (*++p '_');
- continue;
- }
- }
- *n++ p++;
- }
- *n \0';
- p uf;
- d trtod(p, &end);
- if (errno ERANGE) {
- OutOfRange();
- rb_warn("Float %.*s%s out of range", w, p, ellipsis);
- errno ;
- }
- if (badcheck) {
- if (!end || p end) goto bad;
- while (*end && ISSPACE(*end)) end++;
- if (*end) goto bad;
- }
+ while (p < end) *n++ p++;
+ while (*p) {
+ if (*p '_') {
+ /* remove underscores between digits */
+ if (badcheck) {
+ if (n buf || !ISDIGIT(n[-1])) goto bad;
+ ++p;
+ if (!ISDIGIT(*p)) goto bad;
+ }
+ else {
+ while (*++p '_');
+ continue;
+ }
+ }
+ *n++ p++;
+ }
+ *n \0';
+ p uf;
+ d trtod(p, &end);
+ if (errno ERANGE) {
+ OutOfRange();
+ rb_warn("Float %.*s%s out of range", w, p, ellipsis);
+ errno ;
+ }
+ if (badcheck) {
+ if (!end || p end) goto bad;
+ while (*end && ISSPACE(*end)) end++;
+ if (*end) goto bad;
+ }
}
if (errno ERANGE) {
- errno ;
- OutOfRange();
- rb_raise(rb_eArgError, "Float %.*s%s out of range", w, q, ellipsis);
+ errno ;
+ OutOfRange();
+ rb_raise(rb_eArgError, "Float %.*s%s out of range", w, q, ellipsis);
}
return d;
}
@@ -2421,16 +2433,16 @@
s STRING(str)->ptr;
len STRING(str)->len;
if (s) {
- if (s[len]) { /* no sentinel somehow */
- char *p LLOCA_N(char, len+1);
+ if (s[len]) { /* no sentinel somehow */
+ char *p LLOCA_N(char, len+1);
- MEMCPY(p, s, char, len);
- p[len] \0';
- s ;
- }
- if (badcheck && len ! trlen(s)) {
- rb_raise(rb_eArgError, "string for Float contains null byte");
- }
+ MEMCPY(p, s, char, len);
+ p[len] \0';
+ s ;
+ }
+ if (badcheck && len ! trlen(s)) {
+ rb_raise(rb_eArgError, "string for Float contains null byte");
+ }
}
return rb_cstr_to_dbl(s, badcheck);
}
@@ -2441,28 +2453,28 @@
{
switch (TYPE(val)) {
case T_FIXNUM:
- return rb_float_new((double)FIX2LONG(val));
+ return rb_float_new((double)FIX2LONG(val));
case T_FLOAT:
- return val;
+ return val;
case T_BIGNUM:
- return rb_float_new(rb_big2dbl(val));
+ return rb_float_new(rb_big2dbl(val));
case T_STRING:
- return rb_float_new(rb_str_to_dbl(val, Qtrue));
+ return rb_float_new(rb_str_to_dbl(val, Qtrue));
case T_NIL:
- rb_raise(rb_eTypeError, "can't convert nil into Float");
- break;
+ rb_raise(rb_eTypeError, "can't convert nil into Float");
+ break;
default:
{
- VALUE f b_convert_type(val, T_FLOAT, "Float", "to_f");
- if (isnan(RFLOAT(f)->value)) {
- rb_raise(rb_eArgError, "invalid value for Float()");
- }
- return f;
+ VALUE f b_convert_type(val, T_FLOAT, "Float", "to_f");
+ if (isnan(RFLOAT(f)->value)) {
+ rb_raise(rb_eArgError, "invalid value for Float()");
+ }
+ return f;
}
}
}
@@ -2470,11 +2482,11 @@
/*
* call-seq:
* 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
*/
@@ -2492,18 +2504,18 @@
{
switch (TYPE(val)) {
case T_FLOAT:
- return RFLOAT(val)->value;
+ return RFLOAT(val)->value;
case T_STRING:
- rb_raise(rb_eTypeError, "no implicit conversion to float from string");
- break;
+ rb_raise(rb_eTypeError, "no implicit conversion to float from string");
+ break;
case T_NIL:
- rb_raise(rb_eTypeError, "no implicit conversion to float from nil");
- break;
+ rb_raise(rb_eTypeError, "no implicit conversion to float from nil");
+ break;
default:
- break;
+ break;
}
return RFLOAT(rb_Float(val))->value;
@@ -2517,7 +2529,7 @@
StringValue(str);
if (len) *len STRING(str)->len;
else if (RTEST(ruby_verbose) && RSTRING(str)->len ! trlen(RSTRING(str)->ptr)) {
- rb_warn("string contains \\0 character");
+ rb_warn("string contains \\0 character");
}
return RSTRING(str)->ptr;
}
@@ -2533,10 +2545,10 @@
/*
* call-seq:
* 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"
@@ -2557,10 +2569,10 @@
VALUE tmp b_check_array_type(val);
if (NIL_P(tmp)) {
- tmp b_check_convert_type(val, T_ARRAY, "Array", "to_a");
- if (NIL_P(tmp)) {
- return rb_ary_new3(1, val);
- }
+ tmp b_check_convert_type(val, T_ARRAY, "Array", "to_a");
+ if (NIL_P(tmp)) {
+ return rb_ary_new3(1, val);
+ }
}
return tmp;
}
@@ -2569,12 +2581,12 @@
/*
* call-seq:
* 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>.
* If both fail, creates a single element array containing <i>arg</i>
* (unless <i>arg</i> is <code>nil</code>).
- *
+ *
* Array(1..5) # [1, 2, 3, 4, 5]
*/
@@ -2607,7 +2619,7 @@
*
* 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
@@ -2615,7 +2627,7 @@
* <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)
@@ -2623,21 +2635,21 @@
* oldNew(*args)
* end
* end
- *
- *
+ *
+ *
* class Name
* end
- *
- *
+ *
+ *
* n ame.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'.
*
* +------------------+
@@ -2664,13 +2676,13 @@
* <code>Object</code> is the parent class of all classes in Ruby. 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>).
@@ -2704,7 +2716,7 @@
rb_define_method(rb_mKernel, "nil?", rb_false, 0);
rb_define_method(rb_mKernel, " , rb_obj_equal, 1);
rb_define_method(rb_mKernel, "equal?", rb_obj_equal, 1);
- rb_define_method(rb_mKernel, " ", rb_equal, 1);
+ rb_define_method(rb_mKernel, " ", rb_equal, 1);
rb_define_method(rb_mKernel, " , rb_obj_pattern_match, 1);
rb_define_method(rb_mKernel, "eql?", rb_obj_equal, 1);
@@ -2727,19 +2739,19 @@
rb_define_method(rb_mKernel, "to_s", rb_any_to_s, 0);
rb_define_method(rb_mKernel, "inspect", rb_obj_inspect, 0);
rb_define_method(rb_mKernel, "methods", rb_obj_methods, -1);
- rb_define_method(rb_mKernel, "singleton_methods",
- rb_obj_singleton_methods, -1); /* in class.c */
- rb_define_method(rb_mKernel, "protected_methods",
- rb_obj_protected_methods, -1);
+ rb_define_method(rb_mKernel, "singleton_methods",
+ rb_obj_singleton_methods, -1); /* in class.c */
+ rb_define_method(rb_mKernel, "protected_methods",
+ rb_obj_protected_methods, -1);
rb_define_method(rb_mKernel, "private_methods", rb_obj_private_methods, -1);
rb_define_method(rb_mKernel, "public_methods", rb_obj_public_methods, -1);
- rb_define_method(rb_mKernel, "instance_variables",
- rb_obj_instance_variables, 0); /* in variable.c */
+ rb_define_method(rb_mKernel, "instance_variables",
+ rb_obj_instance_variables, 0); /* in variable.c */
rb_define_method(rb_mKernel, "instance_variable_get", rb_obj_ivar_get, 1);
rb_define_method(rb_mKernel, "instance_variable_set", rb_obj_ivar_set, 2);
rb_define_method(rb_mKernel, "instance_variable_defined?", rb_obj_ivar_defined, 1);
rb_define_private_method(rb_mKernel, "remove_instance_variable",
- rb_obj_remove_instance_variable, 1); /* in variable.c */
+ rb_obj_remove_instance_variable, 1); /* in variable.c */
rb_define_method(rb_mKernel, "instance_of?", rb_obj_is_instance_of, 1);
rb_define_method(rb_mKernel, "kind_of?", rb_obj_is_kind_of, 1);
@@ -2775,8 +2787,8 @@
rb_define_global_const("NIL", Qnil);
rb_cSymbol b_define_class("Symbol", rb_cObject);
- rb_define_singleton_method(rb_cSymbol, "all_symbols",
- rb_sym_all_symbols, 0); /* in parse.y */
+ rb_define_singleton_method(rb_cSymbol, "all_symbols",
+ rb_sym_all_symbols, 0); /* in parse.y */
rb_undef_alloc_func(rb_cSymbol);
rb_undef_method(CLASS_OF(rb_cSymbol), "new");
@@ -2787,7 +2799,7 @@
rb_define_method(rb_cSymbol, "id2name", sym_to_s, 0);
rb_define_method(rb_cSymbol, "to_sym", sym_to_sym, 0);
rb_define_method(rb_cSymbol, "to_proc", sym_to_proc, 0);
- rb_define_method(rb_cSymbol, " ", rb_obj_equal, 1);
+ rb_define_method(rb_cSymbol, " ", rb_obj_equal, 1);
rb_define_method(rb_cModule, "freeze", rb_mod_freeze, 0);
rb_define_method(rb_cModule, " ", rb_mod_eqq, 1);
@@ -2799,8 +2811,8 @@
rb_define_method(rb_cModule, "> rb_mod_ge, 1);
rb_define_method(rb_cModule, "initialize_copy", rb_mod_init_copy, 1); /* in class.c */
rb_define_method(rb_cModule, "to_s", rb_mod_to_s, 0);
- rb_define_method(rb_cModule, "included_modules",
- rb_mod_included_modules, 0); /* in class.c */
+ rb_define_method(rb_cModule, "included_modules",
+ rb_mod_included_modules, 0); /* in class.c */
rb_define_method(rb_cModule, "include?", rb_mod_include_p, 1); /* in class.c */
rb_define_method(rb_cModule, "name", rb_mod_name, 0); /* in variable.c */
rb_define_method(rb_cModule, "ancestors", rb_mod_ancestors, 0); /* in class.c */
@@ -2812,28 +2824,28 @@
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_class_public_instance_methods, -1); /* in class.c */
- 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_class_private_instance_methods, -1); /* in class.c */
+ rb_define_method(rb_cModule, "instance_methods",
+ rb_class_instance_methods, -1); /* in class.c */
+ 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_class_protected_instance_methods, -1); /* in class.c */
+ rb_define_method(rb_cModule, "private_instance_methods",
+ rb_class_private_instance_methods, -1); /* in class.c */
rb_define_method(rb_cModule, "class_variable_defined?", rb_mod_cvar_defined, 1);
rb_define_method(rb_cModule, "constants", rb_mod_constants, 0); /* 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_mod_remove_const, 1); /* in variable.c */
- rb_define_method(rb_cModule, "const_missing",
- rb_mod_const_missing, 1); /* in variable.c */
- rb_define_method(rb_cModule, "class_variables",
- rb_mod_class_variables, 0); /* in variable.c */
- rb_define_private_method(rb_cModule, "remove_class_variable",
- rb_mod_remove_cvar, 1); /* in variable.c */
+ rb_define_private_method(rb_cModule, "remove_const",
+ rb_mod_remove_const, 1); /* in variable.c */
+ rb_define_method(rb_cModule, "const_missing",
+ rb_mod_const_missing, 1); /* in variable.c */
+ rb_define_method(rb_cModule, "class_variables",
+ rb_mod_class_variables, 0); /* in variable.c */
+ rb_define_private_method(rb_cModule, "remove_class_variable",
+ rb_mod_remove_cvar, 1); /* in variable.c */
rb_define_private_method(rb_cModule, "class_variable_get", rb_mod_cvar_get, 1);
rb_define_private_method(rb_cModule, "class_variable_set", rb_mod_cvar_set, 2);
--BXVAT5kNtrzKuDFl--