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

object.c: rb_Integer reformat, nil#to_f added to rb_define_method.

Browse Source 
parse.y: Clean unused vars.
range.c: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2614 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
michal 2002-07-02 09:58:13 +00:00
parent 39e205994c
commit 46934759bc
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
object.c
View File

@ -951,8 +951,6 @@ VALUE
rb_Integer(val) rb_Integer(val)
VALUE val; VALUE val;
{ {
VALUE v;
switch (TYPE(val)) { switch (TYPE(val)) {
case T_FLOAT: case T_FLOAT:
if (RFLOAT(val)->value <= (double)FIXNUM_MAX if (RFLOAT(val)->value <= (double)FIXNUM_MAX
@ -961,25 +959,20 @@ rb_Integer(val)
} }
return rb_dbl2big(RFLOAT(val)->value); return rb_dbl2big(RFLOAT(val)->value);
case T_FIXNUM:
case T_BIGNUM: case T_BIGNUM:
return val; return val;
case T_STRING: case T_STRING:
return rb_str_to_inum(val, 0, Qtrue); return rb_str_to_inum(val, 0, Qtrue);
case T_FIXNUM:
return val;
default: default:
break; break;
} }
if (rb_respond_to(val, rb_intern("to_int"))) { if (rb_respond_to(val, rb_intern("to_int"))) {
return rb_to_integer(val, "to_int"); return rb_to_integer(val, "to_int");
} }
else { return rb_to_integer(val, "to_i");
return rb_to_integer(val, "to_i");
}
} }
static VALUE static VALUE
@ -1310,6 +1303,7 @@ Init_Object()
rb_cNilClass = rb_define_class("NilClass", rb_cObject); rb_cNilClass = rb_define_class("NilClass", rb_cObject);
rb_define_method(rb_cNilClass, "to_i", nil_to_i, 0); rb_define_method(rb_cNilClass, "to_i", nil_to_i, 0);
rb_define_method(rb_cNilClass, "to_f", nil_to_f, 0);
rb_define_method(rb_cNilClass, "to_s", nil_to_s, 0); rb_define_method(rb_cNilClass, "to_s", nil_to_s, 0);
rb_define_method(rb_cNilClass, "to_a", nil_to_a, 0); rb_define_method(rb_cNilClass, "to_a", nil_to_a, 0);
rb_define_method(rb_cNilClass, "inspect", nil_inspect, 0); rb_define_method(rb_cNilClass, "inspect", nil_inspect, 0);

2
parse.y
View File

@ -3036,7 +3036,7 @@ here_document(here)
NODE *here; NODE *here;
{ {
int c, func, indent = 0; int c, func, indent = 0;
char *eos, *p; char *eos;
int len; int len;
VALUE str = 0, line; VALUE str = 0, line;

14
range.c
View File

@ -384,11 +384,8 @@ range_min(range)
VALUE range; VALUE range;
{ {
VALUE b, e, step; VALUE b = rb_ivar_get(range, id_beg);
long unit; VALUE e = rb_ivar_get(range, id_end);
b = rb_ivar_get(range, id_beg);
e = rb_ivar_get(range, id_end);
if (r_le(b, e)) return b; if (r_le(b, e)) return b;
return e; return e;
@ -398,11 +395,8 @@ static VALUE
range_max(range) range_max(range)
VALUE range; VALUE range;
{ {
VALUE b, e, step; VALUE b = rb_ivar_get(range, id_beg);
long unit; VALUE e = rb_ivar_get(range, id_end);
b = rb_ivar_get(range, id_beg);
e = rb_ivar_get(range, id_end);
if (r_gt(b, e)) return b; if (r_gt(b, e)) return b;
return e; return e;