diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-19 05:03:03 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-19 05:03:03 +0000 |
commit | df96f994f1a224070ffaa61eb2bcb969d0109246 (patch) | |
tree | 2e4bd7b58a1bc0a2b8d0e136f79a2997323e54d6 /numeric.c | |
parent | d550569264a16e96121d05423f7516ce726d96c9 (diff) |
* parse.y (parse_regx): should raise error on untermitated
expression interpolation.
* pack.c (pack_unpack): should give length to utf8_to_uv().
* pack.c (utf8_to_uv): add length check.
* massages: replace "wrong #" by "wrong number".
* marshal.c (w_float): output Infinity and NaN explicitly.
* marshal.c (r_object): support new explicit float format.
* eval.c (rb_thread_wait_for): select may cause ERESTART on
Solaris.
* eval.c (rb_thread_select): ditto.
* array.c (rb_ary_join): dumped core if sep is not T_STRING nor T_NIL.
* array.c (rb_ary_join): buffer size calculattion was wrong.
* array.c (rb_ary_to_s): if rb_output_fs is nil, insert newlines
between array elements (use rb_default_rs as newline litral)
[experimental].
* gc.c (init_mark_stack): no need to clear mark_stack.
* gc.c (gc_mark_all): need to handle finalizer mark.
* gc.c (gc_mark_rest): use MEMCPY instead of memcpy.
* gc.c (rb_gc_mark): earlier const check to avoid pusing special
constants into mark stack.
* numeric.c (fix_to_s): 'to_s' now takes optional argument to
specify radix. [new]
* bignum.c (rb_big_to_s): ditto. [new]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'numeric.c')
-rw-r--r-- | numeric.c | 31 |
1 files changed, 18 insertions, 13 deletions
@@ -960,17 +960,30 @@ rb_fix2str(x, base) if (base == 10) fmt[2] = 'd'; else if (base == 16) fmt[2] = 'x'; else if (base == 8) fmt[2] = 'o'; - else rb_fatal("fixnum cannot treat base %d", base); + else rb_raise(rb_eArgError, "illegal radix %d", base); sprintf(buf, fmt, FIX2LONG(x)); return rb_str_new2(buf); } static VALUE -fix_to_s(in) - VALUE in; +fix_to_s(argc, argv, x) + int argc; + VALUE *argv; + VALUE x; { - return rb_fix2str(in, 10); + VALUE b; + int base; + + rb_scan_args(argc, argv, "01", &b); + if (argc == 0) base = 10; + else base = NUM2INT(b); + + if (base == 2) { + /* rb_fix2str() does not handle binary */ + return rb_big2str(rb_int2big(FIX2INT(x)), 2); + } + return rb_fix2str(x, base); } static VALUE @@ -1343,13 +1356,6 @@ fix_to_f(num) } static VALUE -fix_type(fix) - VALUE fix; -{ - return rb_cFixnum; -} - -static VALUE fix_abs(fix) VALUE fix; { @@ -1606,8 +1612,7 @@ Init_Numeric() rb_define_singleton_method(rb_cFixnum, "induced_from", rb_fix_induced_from, 1); rb_define_singleton_method(rb_cInteger, "induced_from", rb_int_induced_from, 1); - rb_define_method(rb_cFixnum, "to_s", fix_to_s, 0); - rb_define_method(rb_cFixnum, "type", fix_type, 0); + rb_define_method(rb_cFixnum, "to_s", fix_to_s, -1); rb_define_method(rb_cFixnum, "id2name", fix_id2name, 0); |