Implement first part of #17, parsing BigInteger

Author: cowtowncoder

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORConstants.java

@@ -82,11 +82,16 @@ public final class CBORConstants
     public final static byte BYTE_FLOAT16 = (byte) (PREFIX_TYPE_MISC + 25);
     public final static byte BYTE_FLOAT32 = (byte) (PREFIX_TYPE_MISC + 26);
     public final static byte BYTE_FLOAT64 = (byte) (PREFIX_TYPE_MISC + 27);
+
+    public final static int TAG_BIGNUM_POS = 2;
+    public final static int TAG_BIGNUM_NEG = 3;
+    public final static int TAG_DECIMAL_FRACTION = 4;
+    public final static int TAG_BIGFLOAT = 5;
 
-    public final static byte BYTE_TAG_BIGNUM_POS = (byte) (PREFIX_TYPE_TAG + 2);
-    public final static byte BYTE_TAG_BIGNUM_NEG = (byte) (PREFIX_TYPE_TAG + 3);
-    public final static byte BYTE_TAG_DECIMAL_FRACTION = (byte) (PREFIX_TYPE_TAG + 4);
-    public final static byte BYTE_TAG_BIGFLOAT = (byte) (PREFIX_TYPE_TAG + 5);
+    public final static byte BYTE_TAG_BIGNUM_POS = (byte) (PREFIX_TYPE_TAG + TAG_BIGNUM_POS);
+    public final static byte BYTE_TAG_BIGNUM_NEG = (byte) (PREFIX_TYPE_TAG + TAG_BIGNUM_NEG);
+    public final static byte BYTE_TAG_DECIMAL_FRACTION = (byte) (PREFIX_TYPE_TAG + TAG_DECIMAL_FRACTION);
+    public final static byte BYTE_TAG_BIGFLOAT = (byte) (PREFIX_TYPE_TAG + TAG_BIGFLOAT);
 
     public final static byte BYTE_BREAK = (byte) 0xFF;
 

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORGenerator.java

@@ -511,16 +511,18 @@ public final void writeEndObject() throws IOException
         _writeByte(BYTE_BREAK);
     }
 
-    /*
     @Override // since 2.8
     public void writeArray(int[] array, int offset, int length) throws IOException
     {
+        /*
         // short-cut, do not create child array context etc
         _verifyValueWrite("start an object");
 
         // !!! TODO
+         */
+
+        super.writeArray(array, offset, length);
     }
-    */
 
     /*
     /**********************************************************
@@ -529,7 +531,7 @@ public void writeArray(int[] array, int offset, int length) throws IOException
      */
 
     @Override
-    public void writeString(String text) throws IOException,JsonGenerationException
+    public void writeString(String text) throws IOException
     {
         if (text == null) {
             writeNull();

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java

@@ -712,6 +712,9 @@ public JsonToken nextToken() throws IOException
         case 2: // byte[]
             _typeByte = ch;
             _tokenIncomplete = true;
+            if (_tagValue >= 0) {
+                return _nextBinaryWithTag(_tagValue);
+            }
             return (_currToken = JsonToken.VALUE_EMBEDDED_OBJECT);
 
         case 3: // String
@@ -777,16 +780,6 @@ public JsonToken nextToken() throws IOException
         }
         return null;
     }
-
-    protected JsonToken _handleCBOREOF() throws IOException {
-        /* NOTE: here we can and should close input, release buffers,
-         * since this is "hard" EOF, not a boundary imposed by
-         * header token.
-         */
-        _tagValue = -1;
-        close();
-        return (_currToken = null);
-    }
 
     protected String _numberToName(int ch, boolean neg) throws IOException
     {
@@ -823,17 +816,33 @@ protected String _numberToName(int ch, boolean neg) throws IOException
         return String.valueOf(1);
     }
 
-    // base impl is fine:
-    //public String getCurrentName() throws IOException
-
-    protected void _invalidToken(int ch) throws JsonParseException {
-        ch &= 0xFF;
-        if (ch == 0xFF) {
-            throw _constructError("Mismatched BREAK byte (0xFF): encountered where value expected");
+    protected JsonToken _nextBinaryWithTag(int tag) throws IOException
+    {
+        // For now all we should get is BigInteger
+        
+        boolean neg;
+        if (tag == CBORConstants.TAG_BIGNUM_POS) {
+            neg = false;
+        } else  if (tag == CBORConstants.TAG_BIGNUM_NEG) {
+            neg = true;
+        } else {
+            // 12-May-2016, tatu: Since that's all we know, let's otherwise
+            //   just return default Binary data marker
+            return (_currToken = JsonToken.VALUE_EMBEDDED_OBJECT);
         }
-        throw _constructError("Invalid CBOR value token (first byte): 0x"+Integer.toHexString(ch));
+
+        // First: get the data
+        _finishToken();
+
+        _numberBigInt = new BigInteger(_binaryValue);
+        _numTypesValid |= NR_BIGINT;
+        
+        return (_currToken = JsonToken.VALUE_NUMBER_INT);
     }
 
+    // base impl is fine:
+    //public String getCurrentName() throws IOException
+
     /**
      * Method for forcing full read of current token, even if it might otherwise
      * only be read if data is accessed via {@link #getText} and similar methods.
@@ -2939,10 +2948,28 @@ protected void _handleEOF() throws JsonParseException {
 
     /*
     /**********************************************************
-    /* Internal methods, error reporting
+    /* Internal methods, error handling, reporting
     /**********************************************************
      */
 
+    protected JsonToken _handleCBOREOF() throws IOException {
+        /* NOTE: here we can and should close input, release buffers,
+         * since this is "hard" EOF, not a boundary imposed by
+         * header token.
+         */
+        _tagValue = -1;
+        close();
+        return (_currToken = null);
+    }
+
+    protected void _invalidToken(int ch) throws JsonParseException {
+        ch &= 0xFF;
+        if (ch == 0xFF) {
+            throw _constructError("Mismatched BREAK byte (0xFF): encountered where value expected");
+        }
+        throw _constructError("Invalid CBOR value token (first byte): 0x"+Integer.toHexString(ch));
+    }
+
     protected void _reportUnexpectedBreak() throws IOException {
         if (_parsingContext.inRoot()) {
             throw _constructError("Unexpected Break (0xFF) token in Root context");

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/failing/BigNumbersTest.java

@@ -33,7 +33,7 @@ public void testBigInteger() throws Exception
 
         // but verify that the original content can be parsed
         CBORParser parser = cborParser(sourceBytes.toByteArray());
-        assertToken(JsonToken.VALUE_NUMBER_FLOAT, parser.nextToken());
+        assertToken(JsonToken.VALUE_NUMBER_INT, parser.nextToken());
         assertEquals(BigInteger.TEN, parser.getBigIntegerValue());
         parser.close();
     }