* bignum.c (rb_big_rshift): should properly convert the nagative

  value to 2's compliment.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 26 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a9f0de983a..91fa21caff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 15 13:36:58 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_rshift): should properly convert the nagative
+	  value to 2's compliment.
+
 Thu Feb 14 17:38:35 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* parse.y: avoid SEGV at OP_ASIGN to pseudo variable.
diff --git a/bignum.c b/bignum.c
index d59969cdd9..90a4c77012 100644
--- a/bignum.c
+++ b/bignum.c
@@ -1468,12 +1468,17 @@ rb_big_rshift(x, y)
     long j;
 
     if (shift < 0) return rb_big_lshift(x, INT2FIX(-shift));
+
     if (s1 > RBIGNUM(x)->len) {
 	if (RBIGNUM(x)->sign)
 	    return INT2FIX(0);
 	else
 	    return INT2FIX(-1);
     }
+    if (!RBIGNUM(x)->sign) {
+	x = rb_big_clone(x);
+	rb_big_2comp(x);
+    }
     xds = BDIGITS(x);
     i = RBIGNUM(x)->len; j = i - s1;
     z = bignew(j, RBIGNUM(x)->sign);
@@ -1483,6 +1488,9 @@ rb_big_rshift(x, y)
 	zds[j] = BIGLO(num);
 	num = BIGUP(xds[i]);
     }
+    if (!RBIGNUM(x)->sign) {
+	rb_big_2comp(z);
+    }
     return bignorm(z);
 }
 
diff --git a/gc.c b/gc.c
index 90e9e5d814..b6115abb93 100644
--- a/gc.c
+++ b/gc.c
@@ -258,7 +258,6 @@ typedef struct RVALUE {
 	struct RVarmap varmap; 
 	struct SCOPE   scope;
     } as;
-    int type;
 } RVALUE;
 
 static RVALUE *freelist = 0;
diff --git a/sample/test.rb b/sample/test.rb
index d3773fe688..9778b6e4ca 100644
--- a/sample/test.rb
+++ b/sample/test.rb
@@ -809,6 +809,19 @@ b = 14269972710765292560
 test_ok(a % b == 0)
 test_ok(-a % b == 0)
 
+def shift_test(a)
+  b = a / (2 ** 32)
+  c = a >> 32
+  test_ok(b == c)
+
+  b = a * (2 ** 32)
+  c = a << 32
+  test_ok(b == c)
+end
+
+shift_test(-4518325415524767873)
+shift_test(-0xfffffffffffffffff)
+
 test_check "string & char"
 
 test_ok("abcd" == "abcd")