summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-11-01 05:11:24 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-11-01 05:11:24 +0000
commit26018bbfa7f25b4941ec40caa96e596e3d1f64c1 (patch)
tree8de433e24f1266a795b161473907f8071ccd78ef
parentae02ee6c7a5958876ccbae7bead3990dea6f807c (diff)
* bignum.c (rb_big_aref): idx may be a Bignum.
* numeric.c (fix_aref): negative index must return zero. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--bignum.c8
-rw-r--r--numeric.c3
-rw-r--r--version.h4
4 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f081fc52f..2d0b51ce2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 1 14:08:42 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * bignum.c (rb_big_aref): idx may be a Bignum.
+
+ * numeric.c (fix_aref): negative index must return zero.
+
Wed Oct 31 16:59:25 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (exec_under): should initialize ruby_frame->self;
diff --git a/bignum.c b/bignum.c
index 7127314731..51be3682d6 100644
--- a/bignum.c
+++ b/bignum.c
@@ -1316,9 +1316,15 @@ rb_big_aref(x, y)
VALUE x, y;
{
BDIGIT *xds;
- int shift = NUM2INT(y);
+ int shift;
int s1, s2;
+ if (TYPE(y) == T_BIGNUM) {
+ if (!RBIGNUM(y)->sign || RBIGNUM(x)->sign)
+ return INT2FIX(0);
+ return INT2FIX(1);
+ }
+ shift = NUM2INT(y);
if (shift < 0) return INT2FIX(0);
s1 = shift/BITSPERDIG;
s2 = shift%BITSPERDIG;
diff --git a/numeric.c b/numeric.c
index 33ec3605e6..d5896fe2d3 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1305,7 +1305,8 @@ fix_aref(fix, idx)
long val = FIX2LONG(fix);
if (TYPE(idx) == T_BIGNUM) {
- if (val >= 0) return INT2FIX(0);
+ if (!RBIGNUM(idx)->sign || val >= 0)
+ return INT2FIX(0);
return INT2FIX(1);
}
else {
diff --git a/version.h b/version.h
index 7501e0b68f..dd408f4e7b 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
#define RUBY_VERSION "1.6.5"
-#define RUBY_RELEASE_DATE "2001-10-31"
+#define RUBY_RELEASE_DATE "2001-11-01"
#define RUBY_VERSION_CODE 165
-#define RUBY_RELEASE_CODE 20011031
+#define RUBY_RELEASE_CODE 20011101