added Unpacker.getNextType()

frsyuki · frsyuki · commit 8ca01e4fdb6c · 2012-02-25T13:59:19.000-08:00
diff --git a/src/main/java/org/msgpack/type/Value.java b/src/main/java/org/msgpack/type/Value.java
@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import org.msgpack.packer.Packer;
+import org.msgpack.type.ValueType;
 
 public interface Value {
     public ValueType getType();
diff --git a/src/main/java/org/msgpack/unpacker/Converter.java b/src/main/java/org/msgpack/unpacker/Converter.java
@@ -25,6 +25,7 @@
 import org.msgpack.MessageTypeException;
 import org.msgpack.packer.Unconverter;
 import org.msgpack.type.Value;
+import org.msgpack.type.ValueType;
 import org.msgpack.type.ArrayValue;
 import org.msgpack.type.MapValue;
 
@@ -402,6 +403,10 @@ public void skip() throws IOException {
         }
     }
 
+    public ValueType getNextType() throws IOException {
+        return getTop().getType();
+    }
+
     public void reset() {
         stack.clear();
         value = null;
diff --git a/src/main/java/org/msgpack/unpacker/MessagePackUnpacker.java b/src/main/java/org/msgpack/unpacker/MessagePackUnpacker.java
@@ -27,6 +27,7 @@
 import org.msgpack.MessagePack;
 import org.msgpack.MessageTypeException;
 import org.msgpack.packer.Unconverter;
+import org.msgpack.type.ValueType;
 
 public class MessagePackUnpacker extends AbstractUnpacker {
     private static final byte REQUIRE_TO_READ_HEAD = (byte) 0xc6;
@@ -581,6 +582,55 @@ public void skip() throws IOException {
         }
     }
 
+    public ValueType getNextType() throws IOException {
+        final int b = (int) getHeadByte();
+        if ((b & 0x80) == 0) { // Positive Fixnum
+            return ValueType.INTEGER;
+        }
+        if ((b & 0xe0) == 0xe0) { // Negative Fixnum
+            return ValueType.INTEGER;
+        }
+        if ((b & 0xe0) == 0xa0) { // FixRaw
+            return ValueType.RAW;
+        }
+        if ((b & 0xf0) == 0x90) { // FixArray
+            return ValueType.ARRAY;
+        }
+        if ((b & 0xf0) == 0x80) { // FixMap
+            return ValueType.MAP;
+        }
+        switch (b & 0xff) {
+        case 0xc0: // nil
+            return ValueType.NIL;
+        case 0xc2: // false
+        case 0xc3: // true
+            return ValueType.BOOLEAN;
+        case 0xca: // float
+        case 0xcb: // double
+            return ValueType.FLOAT;
+        case 0xcc: // unsigned int 8
+        case 0xcd: // unsigned int 16
+        case 0xce: // unsigned int 32
+        case 0xcf: // unsigned int 64
+        case 0xd0: // signed int 8
+        case 0xd1: // signed int 16
+        case 0xd2: // signed int 32
+        case 0xd3: // signed int 64
+            return ValueType.INTEGER;
+        case 0xda: // raw 16
+        case 0xdb: // raw 32
+            return ValueType.RAW;
+        case 0xdc: // array 16
+        case 0xdd: // array 32
+            return ValueType.ARRAY;
+        case 0xde: // map 16
+        case 0xdf: // map 32
+            return ValueType.MAP;
+        default:
+            throw new IOException("Invalid byte: " + b); // TODO error FormatException
+        }
+    }
+
     public void reset() {
         raw = null;
         stack.clear();
diff --git a/src/main/java/org/msgpack/unpacker/Unpacker.java b/src/main/java/org/msgpack/unpacker/Unpacker.java
@@ -25,6 +25,7 @@
 
 import org.msgpack.template.Template;
 import org.msgpack.type.Value;
+import org.msgpack.type.ValueType;
 
 /**
  * Standard deserializer.
@@ -82,6 +83,8 @@ public interface Unpacker extends Iterable<Value>, Closeable {
 
     public Value readValue() throws IOException;
 
+    public ValueType getNextType() throws IOException;
+
     public UnpackerIterator iterator();
 
     public int getReadByteCount();
