fixed ValueAccept.acceptUnsignedInteger

frsyuki · frsyuki · commit 26141a73eee7 · 2011-07-06T02:54:27.000+09:00
diff --git a/src/main/java/org/msgpack/unpacker/BigIntegerAccept.java b/src/main/java/org/msgpack/unpacker/BigIntegerAccept.java
@@ -56,17 +56,16 @@ void acceptUnsignedInteger(short v) {
     @Override
     void acceptUnsignedInteger(int v) {
         if(v < 0) {
-            // FIXME
-            this.value = BigInteger.valueOf(0xffffffffffffffffL + v + 1L);
+            this.value = BigInteger.valueOf((long)(v & 0x7fffffff) + 0x80000000L);
         } else {
             this.value = BigInteger.valueOf((long)v);
         }
     }
 
     @Override
     void acceptUnsignedInteger(long v) {
-        if(v < 0) {
-            this.value = BigInteger.valueOf(v+Long.MAX_VALUE+1).setBit(63);
+        if(v < 0L) {
+            this.value = BigInteger.valueOf(v+Long.MAX_VALUE+1L).setBit(63);
         } else {
             this.value = BigInteger.valueOf(v);
         }
diff --git a/src/main/java/org/msgpack/unpacker/LongAccept.java b/src/main/java/org/msgpack/unpacker/LongAccept.java
@@ -55,7 +55,6 @@ void acceptUnsignedInteger(short v) {
     @Override
     void acceptUnsignedInteger(int v) {
         if(v < 0) {
-            // FIXME
             this.value = (long)(v & 0x7fffffff) + 0x80000000L;
         } else {
             this.value = (long)v;
diff --git a/src/main/java/org/msgpack/unpacker/ValueAccept.java b/src/main/java/org/msgpack/unpacker/ValueAccept.java
@@ -67,7 +67,6 @@ void acceptUnsignedInteger(short v) {
     @Override
     void acceptUnsignedInteger(int v) {
         if(v < 0) {
-            // FIXME
             long value = (long)(v & 0x7fffffff) + 0x80000000L;
             uc.write(ValueFactory.integerValue(value));
         } else {
@@ -78,7 +77,7 @@ void acceptUnsignedInteger(int v) {
     @Override
     void acceptUnsignedInteger(long v) {
         if(v < 0L) {
-            BigInteger value = BigInteger.valueOf(0xffffffffffffffffL + v + 1L);
+            BigInteger value = BigInteger.valueOf(v+Long.MAX_VALUE+1L).setBit(63);
             uc.write(ValueFactory.integerValue(value));
         } else {
             uc.write(ValueFactory.integerValue(v));
diff --git a/src/test/java/org/msgpack/TestBufferPackConvert.java b/src/test/java/org/msgpack/TestBufferPackConvert.java
@@ -177,10 +177,7 @@ public void testBigInteger(BigInteger v) throws Exception {
 	BufferUnpacker unpacker = new BufferUnpacker();
 	unpacker.wrap(bytes);
 	Value value = unpacker.readValue();
-	// FIXME assertTrue(value.isBigInteger());
-	//System.out.println("## value: " + value.getClass());
-	// following result is strange...
-	//assertTrue(value.is??);
+	assertTrue(value.isInteger());
 	BigInteger ret = new Converter(value).readBigInteger();
 	assertEquals(v, ret);
     }
