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

* complex.c: added some shortcuts.

Browse source 
* rational.c: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24055 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2009-07-12 14:57:42 +00:00
parent b1f618e9e5
commit 8d9896c3b9
3 changed files with 72 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Jul 12 23:56:40 2009 Tadayoshi Funaba <tadf@dotrb.org>
* complex.c: added some shortcuts.
* rational.c: ditto.
Sun Jul 12 23:30:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* object.c (rb_to_integer, rb_check_to_integer): return Bignum

48
complex.c
View file

@ -195,8 +195,18 @@ f_negative_p(VALUE x)
inline static VALUE
f_zero_p(VALUE x)
{
if (FIXNUM_P(x))
switch (TYPE(x)) {
case T_FIXNUM:
return f_boolcast(FIX2LONG(x) == 0);
case T_BIGNUM:
return Qfalse;
case T_RATIONAL:
{
VALUE num = RRATIONAL(x)->num;
return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 0);
}
}
return rb_funcall(x, id_eqeq_p, 1, ZERO);
}
@ -205,8 +215,20 @@ f_zero_p(VALUE x)
inline static VALUE
f_one_p(VALUE x)
{
if (FIXNUM_P(x))
switch (TYPE(x)) {
case T_FIXNUM:
return f_boolcast(FIX2LONG(x) == 1);
case T_BIGNUM:
return Qfalse;
case T_RATIONAL:
{
VALUE num = RRATIONAL(x)->num;
VALUE den = RRATIONAL(x)->den;
return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 1 &&
FIXNUM_P(den) && FIX2LONG(den) == 1);
}
}
return rb_funcall(x, id_eqeq_p, 1, ONE);
}
@ -860,27 +882,33 @@ nucomp_expt(VALUE self, VALUE other)
}
if (k_fixnum_p(other)) {
if (f_gt_p(other, ZERO)) {
VALUE x, z, n;
VALUE x, z;
long n;
x = self;
z = x;
n = f_sub(other, ONE);
n = FIX2LONG(other) - 1;
while (f_nonzero_p(n)) {
VALUE a;
while (n) {
long q, r;
while (a = f_divmod(n, TWO),
f_zero_p(RARRAY_PTR(a)[1])) {
while (1) {
get_dat1(x);
q = n / 2;
r = n % 2;
if (r)
break;
x = f_complex_new2(CLASS_OF(self),
f_sub(f_mul(dat->real, dat->real),
f_mul(dat->imag, dat->imag)),
f_mul(f_mul(TWO, dat->real), dat->imag));
n = RARRAY_PTR(a)[0];
n = q;
}
z = f_mul(z, x);
n = f_sub(n, ONE);
n--;
}
return z;
}

30
rational.c
View file

@ -166,8 +166,18 @@ f_negative_p(VALUE x)
inline static VALUE
f_zero_p(VALUE x)
{
if (FIXNUM_P(x))
switch (TYPE(x)) {
case T_FIXNUM:
return f_boolcast(FIX2LONG(x) == 0);
case T_BIGNUM:
return Qfalse;
case T_RATIONAL:
{
VALUE num = RRATIONAL(x)->num;
return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 0);
}
}
return rb_funcall(x, id_eqeq_p, 1, ZERO);
}
@ -176,8 +186,20 @@ f_zero_p(VALUE x)
inline static VALUE
f_one_p(VALUE x)
{
if (FIXNUM_P(x))
switch (TYPE(x)) {
case T_FIXNUM:
return f_boolcast(FIX2LONG(x) == 1);
case T_BIGNUM:
return Qfalse;
case T_RATIONAL:
{
VALUE num = RRATIONAL(x)->num;
VALUE den = RRATIONAL(x)->den;
return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 1 &&
FIXNUM_P(den) && FIX2LONG(den) == 1);
}
}
return rb_funcall(x, id_eqeq_p, 1, ONE);
}
@ -846,6 +868,10 @@ nurat_div(VALUE self, VALUE other)
{
get_dat2(self, other);
if (f_one_p(self))
return f_rational_new_no_reduce2(CLASS_OF(self),
bdat->den, bdat->num);
return f_muldiv(self,
adat->num, adat->den,
bdat->num, bdat->den, '/');