kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/bigdecimal/bigdecimal.c (BigDecimal_to_r): moved from

Browse source 
bigdecimal/util, converted into C.  [ruby-dev:36805]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-11-11 10:45:21 +00:00
parent d544a3d6c7
commit e644398bc6
3 changed files with 41 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -22,6 +22,11 @@ Tue Nov 11 14:25:25 2008 Martin Duerst <duerst@it.aoyama.ac.jp>
* test/ruby/test_transcode.rb: added tests for the above * test/ruby/test_transcode.rb: added tests for the above
(from Yoshihiro Kambayashi) (from Yoshihiro Kambayashi)
Tue Nov 11 13:20:23 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* ext/bigdecimal/bigdecimal.c (BigDecimal_to_r): moved from
bigdecimal/util, converted into C. [ruby-dev:36805]
Tue Nov 11 07:55:57 2008 Tadayoshi Funaba <tadf@dotrb.org> Tue Nov 11 07:55:57 2008 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb (inspect): changed the format. * lib/date.rb (inspect): changed the format.

36
ext/bigdecimal/bigdecimal.c
View file

@ -606,6 +606,41 @@ BigDecimal_to_f(VALUE self)
return rb_float_new(d); return rb_float_new(d);
} }
static VALUE BigDecimal_split(VALUE self);
/* Converts a BigDecimal to a Rational.
*/
static VALUE
BigDecimal_to_r(VALUE self)
{
Real *p;
S_LONG sign, power, denomi_power;
VALUE a, digits, numerator;
p = GetVpValue(self,1);
sign = VpGetSign(p);
power = VpExponent10(p);
a = BigDecimal_split(self);
digits = RARRAY_PTR(a)[1];
denomi_power = power - RSTRING_LEN(digits);
numerator = rb_funcall(digits, rb_intern("to_i"), 0);
if (sign < 0) {
numerator = rb_funcall(numerator, '*', 1, INT2FIX(-1));
}
if (denomi_power < 0) {
return rb_Rational(numerator,
rb_funcall(INT2FIX(10), rb_intern("**"), 1,
INT2FIX(-denomi_power)));
}
else {
return rb_Rational1(rb_funcall(numerator, '*', 1,
rb_funcall(INT2FIX(10), rb_intern("**"), 1,
INT2FIX(denomi_power))));
}
}
/* The coerce method provides support for Ruby type coercion. It is not /* The coerce method provides support for Ruby type coercion. It is not
* enabled by default. * enabled by default.
* *
@ -1918,6 +1953,7 @@ Init_bigdecimal(void)
rb_define_method(rb_cBigDecimal, "to_s", BigDecimal_to_s, -1); rb_define_method(rb_cBigDecimal, "to_s", BigDecimal_to_s, -1);
rb_define_method(rb_cBigDecimal, "to_i", BigDecimal_to_i, 0); rb_define_method(rb_cBigDecimal, "to_i", BigDecimal_to_i, 0);
rb_define_method(rb_cBigDecimal, "to_int", BigDecimal_to_i, 0); rb_define_method(rb_cBigDecimal, "to_int", BigDecimal_to_i, 0);
rb_define_method(rb_cBigDecimal, "to_r", BigDecimal_to_r, 0);
rb_define_method(rb_cBigDecimal, "split", BigDecimal_split, 0); rb_define_method(rb_cBigDecimal, "split", BigDecimal_split, 0);
rb_define_method(rb_cBigDecimal, "+", BigDecimal_add, 1); rb_define_method(rb_cBigDecimal, "+", BigDecimal_add, 1);
rb_define_method(rb_cBigDecimal, "-", BigDecimal_sub, 1); rb_define_method(rb_cBigDecimal, "-", BigDecimal_sub, 1);

12
ext/bigdecimal/lib/bigdecimal/util.rb
View file

@ -39,18 +39,6 @@ class BigDecimal < Numeric
i + "." + ("0"*(-z)) + f i + "." + ("0"*(-z)) + f
end end
end end
# Converts a BigDecimal to a Rational.
def to_r
sign,digits,base,power = self.split
numerator = sign*digits.to_i
denomi_power = power - digits.size # base is always 10
if denomi_power < 0
Rational(numerator,base ** (-denomi_power))
else
Rational(numerator * (base ** denomi_power),1)
end
end
end end
class Rational < Numeric class Rational < Numeric