diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-02-22 10:28:47 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-02-22 10:28:47 +0000 |
commit | 088d04d88e8948812038e1297d449ba12224066e (patch) | |
tree | 8fd2474ff94ff56ffd5f630c5d00c2fac1fa9a4f /bignum.c | |
parent | 9ce732561568d940e9ddf2cf6cf798b3dc65ccd7 (diff) |
* bignum.c (get2comp): need to specify to carry or not.
* io.c (rb_io_inspect): embed path info.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bignum.c')
-rw-r--r-- | bignum.c | 42 |
1 files changed, 26 insertions, 16 deletions
@@ -69,9 +69,10 @@ rb_big_clone(x) return z; } -void -rb_big_2comp(x) /* get 2's complement */ +static void +get2comp(x, carry) /* get 2's complement */ VALUE x; + int carry; { long i = RBIGNUM(x)->len; BDIGIT *ds = BDIGITS(x); @@ -84,7 +85,9 @@ rb_big_2comp(x) /* get 2's complement */ ds[i++] = BIGLO(num); num = BIGDN(num); } while (i < RBIGNUM(x)->len); + if (!carry) return; if (ds[0] == 1 || ds[0] == 0) { + if (RBIGNUM(x)->len == 1) return; for (i=1; i<RBIGNUM(x)->len; i++) { if (ds[i] != 0) return; } @@ -94,6 +97,13 @@ rb_big_2comp(x) /* get 2's complement */ } } +void +rb_big_2comp(x) /* get 2's complement */ + VALUE x; +{ + return get2comp(x, Qtrue); +} + static VALUE bignorm(x) VALUE x; @@ -795,9 +805,9 @@ rb_big_neg(x) long i = RBIGNUM(x)->len; BDIGIT *ds = BDIGITS(z); - if (!RBIGNUM(x)->sign) rb_big_2comp(z); + if (!RBIGNUM(x)->sign) get2comp(z, Qtrue); while (i--) ds[i] = ~ds[i]; - if (RBIGNUM(x)->sign) rb_big_2comp(z); + if (RBIGNUM(x)->sign) get2comp(z, Qfalse); RBIGNUM(z)->sign = !RBIGNUM(z)->sign; return bignorm(z); @@ -1284,11 +1294,11 @@ rb_big_and(x, y) if (!RBIGNUM(y)->sign) { y = rb_big_clone(y); - rb_big_2comp(y); + get2comp(y, Qtrue); } if (!RBIGNUM(x)->sign) { x = rb_big_clone(x); - rb_big_2comp(x); + get2comp(x, Qtrue); } if (RBIGNUM(x)->len > RBIGNUM(y)->len) { l1 = RBIGNUM(y)->len; @@ -1313,7 +1323,7 @@ rb_big_and(x, y) for (; i<l2; i++) { zds[i] = sign?0:ds2[i]; } - if (!RBIGNUM(z)->sign) rb_big_2comp(z); + if (!RBIGNUM(z)->sign) get2comp(z, Qfalse); return bignorm(z); } @@ -1335,11 +1345,11 @@ rb_big_or(x, y) if (!RBIGNUM(y)->sign) { y = rb_big_clone(y); - rb_big_2comp(y); + get2comp(y, Qtrue); } if (!RBIGNUM(x)->sign) { x = rb_big_clone(x); - rb_big_2comp(x); + get2comp(x, Qtrue); } if (RBIGNUM(x)->len > RBIGNUM(y)->len) { l1 = RBIGNUM(y)->len; @@ -1364,7 +1374,7 @@ rb_big_or(x, y) for (; i<l2; i++) { zds[i] = sign?ds2[i]:(BIGRAD-1); } - if (!RBIGNUM(z)->sign) rb_big_2comp(z); + if (!RBIGNUM(z)->sign) get2comp(z, Qfalse); return bignorm(z); } @@ -1387,11 +1397,11 @@ rb_big_xor(x, y) if (!RBIGNUM(y)->sign) { y = rb_big_clone(y); - rb_big_2comp(y); + get2comp(y, Qtrue); } if (!RBIGNUM(x)->sign) { x = rb_big_clone(x); - rb_big_2comp(x); + get2comp(x, Qtrue); } if (RBIGNUM(x)->len > RBIGNUM(y)->len) { l1 = RBIGNUM(y)->len; @@ -1418,7 +1428,7 @@ rb_big_xor(x, y) for (; i<l2; i++) { zds[i] = sign?ds2[i]:~ds2[i]; } - if (!RBIGNUM(z)->sign) rb_big_2comp(z); + if (!RBIGNUM(z)->sign) get2comp(z, Qfalse); return bignorm(z); } @@ -1477,7 +1487,7 @@ rb_big_rshift(x, y) } if (!RBIGNUM(x)->sign) { x = rb_big_clone(x); - rb_big_2comp(x); + get2comp(x, Qtrue); } xds = BDIGITS(x); i = RBIGNUM(x)->len; j = i - s1; @@ -1489,7 +1499,7 @@ rb_big_rshift(x, y) num = BIGUP(xds[i]); } if (!RBIGNUM(x)->sign) { - rb_big_2comp(z); + get2comp(z, Qfalse); } return bignorm(z); } @@ -1515,7 +1525,7 @@ rb_big_aref(x, y) if (!RBIGNUM(x)->sign) { if (s1 >= RBIGNUM(x)->len) return INT2FIX(1); x = rb_big_clone(x); - rb_big_2comp(x); + get2comp(x, Qtrue); } else { if (s1 >= RBIGNUM(x)->len) return INT2FIX(0); |