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

* rational.c: floor, ceil, truncate and round accept an extra

Browse Source 
argument like Float#round. [experimental]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2008-12-29 11:50:10 +00:00
parent 25c96543cc
commit d7b873a108
2 changed files with 76 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Dec 29 20:45:25 2008 Tadayoshi Funaba <tadf@dotrb.org>
* rational.c: floor, ceil, truncate and round accept an extra
argument like Float#round. [experimental]
Mon Dec 29 18:24:49 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp> Mon Dec 29 18:24:49 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* Makefile.in (distclean-local): removes Doxyfile and * Makefile.in (distclean-local): removes Doxyfile and

87
rational.c
View File

@ -995,21 +995,76 @@ nurat_truncate(VALUE self)
static VALUE static VALUE
nurat_round(VALUE self) nurat_round(VALUE self)
{ {
VALUE num, den, neg;
get_dat1(self); get_dat1(self);
if (f_negative_p(dat->num)) { num = dat->num;
VALUE num, den; den = dat->den;
neg = f_negative_p(num);
num = f_negate(dat->num); if (neg)
num = f_add(f_mul(num, TWO), dat->den); num = f_negate(num);
den = f_mul(dat->den, TWO);
return f_negate(f_idiv(num, den)); num = f_add(f_mul(num, TWO), den);
} den = f_mul(den, TWO);
else { num = f_idiv(num, den);
VALUE num = f_add(f_mul(dat->num, TWO), dat->den);
VALUE den = f_mul(dat->den, TWO); if (neg)
return f_idiv(num, den); num = f_negate(num);
}
return num;
}
static VALUE
nurat_round_common(int argc, VALUE *argv, VALUE self,
VALUE (*func)(VALUE))
{
VALUE n, b, s;
if (argc == 0)
return (*func)(self);
rb_scan_args(argc, argv, "01", &n);
if (!k_integer_p(n))
rb_raise(rb_eTypeError, "not an integer");
b = f_expt(INT2FIX(10), n);
s = f_mul(self, b);
s = (*func)(s);
s = f_div(f_rational_new_bang1(CLASS_OF(self), s), b);
if (f_lt_p(n, ONE))
s = f_to_i(s);
return s;
}
static VALUE
nurat_floor_n(int argc, VALUE *argv, VALUE self)
{
return nurat_round_common(argc, argv, self, nurat_floor);
}
static VALUE
nurat_ceil_n(int argc, VALUE *argv, VALUE self)
{
return nurat_round_common(argc, argv, self, nurat_ceil);
}
static VALUE
nurat_truncate_n(int argc, VALUE *argv, VALUE self)
{
return nurat_round_common(argc, argv, self, nurat_truncate);
}
static VALUE
nurat_round_n(int argc, VALUE *argv, VALUE self)
{
return nurat_round_common(argc, argv, self, nurat_round);
} }
#define f_size(x) rb_funcall(x, rb_intern("size"), 0) #define f_size(x) rb_funcall(x, rb_intern("size"), 0)
@ -1565,10 +1620,10 @@ Init_Rational(void)
rb_define_method(rb_cRational, "exact?", nurat_true, 0); rb_define_method(rb_cRational, "exact?", nurat_true, 0);
#endif #endif
rb_define_method(rb_cRational, "floor", nurat_floor, 0); rb_define_method(rb_cRational, "floor", nurat_floor_n, -1);
rb_define_method(rb_cRational, "ceil", nurat_ceil, 0); rb_define_method(rb_cRational, "ceil", nurat_ceil_n, -1);
rb_define_method(rb_cRational, "truncate", nurat_truncate, 0); rb_define_method(rb_cRational, "truncate", nurat_truncate_n, -1);
rb_define_method(rb_cRational, "round", nurat_round, 0); rb_define_method(rb_cRational, "round", nurat_round_n, -1);
rb_define_method(rb_cRational, "to_i", nurat_truncate, 0); rb_define_method(rb_cRational, "to_i", nurat_truncate, 0);
rb_define_method(rb_cRational, "to_f", nurat_to_f, 0); rb_define_method(rb_cRational, "to_f", nurat_to_f, 0);