Commit c1db5fb

committed

fix #176 parse infinity

1 parent 9768493 commit c1db5fbCopy full SHA for c1db5fb

File tree

+40

-1

lines changed

+40

-1

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -540,6 +540,16 @@ static int readIntSlowPath(final JsonIterator iter, int value) throws IOExceptio`
`540`	`540`	`public static final double readDoubleSlowPath(final JsonIterator iter) throws IOException {`
`541`	`541`	`try {`
`542`	`542`	`numberChars numberChars = readNumber(iter);`
	`543`	`+ if (numberChars.charsLength == 0 && iter.whatIsNext() == ValueType.STRING) {`
	`544`	`+ String possibleInf = iter.readString();`
	`545`	`+ if ("infinity".equals(possibleInf)) {`
	`546`	`+ return Double.POSITIVE_INFINITY;`
	`547`	`+ }`
	`548`	`+ if ("-infinity".equals(possibleInf)) {`
	`549`	`+ return Double.NEGATIVE_INFINITY;`
	`550`	`+ }`
	`551`	`+ throw iter.reportError("readDoubleSlowPath", "expect number but found string: " + possibleInf);`
	`552`	`+ }`
`543`	`553`	`return Double.valueOf(new String(numberChars.chars, 0, numberChars.charsLength));`
`544`	`554`	`} catch (NumberFormatException e) {`
`545`	`555`	`throw iter.reportError("readDoubleSlowPath", e.toString());`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -212,10 +212,18 @@ public static final void writeLong(final JsonStream stream, long value) throws I`
`212`	`212`
`213`	`213`	`public static final void writeFloat(JsonStream stream, float val) throws IOException {`
`214`	`214`	`if (val < 0) {`
	`215`	`+ if (val == Float.NEGATIVE_INFINITY) {`
	`216`	`+ stream.writeVal("-Infinity");`
	`217`	`+ return;`
	`218`	`+ }`
`215`	`219`	`stream.write('-');`
`216`	`220`	`val = -val;`
`217`	`221`	`}`
`218`	`222`	`if (val > 0x4ffffff) {`
	`223`	`+ if (val == Float.POSITIVE_INFINITY) {`
	`224`	`+ stream.writeVal("Infinity");`
	`225`	`+ return;`
	`226`	`+ }`
`219`	`227`	`stream.writeRaw(Float.toString(val));`
`220`	`228`	`return;`
`221`	`229`	`}`
`@@ -240,10 +248,18 @@ public static final void writeFloat(JsonStream stream, float val) throws IOExcep`
`240`	`248`
`241`	`249`	`public static final void writeDouble(JsonStream stream, double val) throws IOException {`
`242`	`250`	`if (val < 0) {`
	`251`	`+ if (val == Double.NEGATIVE_INFINITY) {`
	`252`	`+ stream.writeVal("-Infinity");`
	`253`	`+ return;`
	`254`	`+ }`
`243`	`255`	`val = -val;`
`244`	`256`	`stream.write('-');`
`245`	`257`	`}`
`246`	`258`	`if (val > 0x4ffffff) {`
	`259`	`+ if (val == Double.POSITIVE_INFINITY) {`
	`260`	`+ stream.writeVal("Infinity");`
	`261`	`+ return;`
	`262`	`+ }`
`247`	`263`	`stream.writeRaw(Double.toString(val));`
`248`	`264`	`return;`
`249`	`265`	`}`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package com.jsoniter;`
`2`	`2`
`3`		`-import com.fasterxml.jackson.databind.ObjectMapper;`
`4`	`3`	`import junit.framework.TestCase;`
`5`	`4`	`import org.junit.experimental.categories.Category;`
`6`	`5`
`@@ -90,4 +89,12 @@ public void testChooseDouble() {`
`90`	`89`	`number = JsonIterator.deserialize("1.0", Object.class);`
`91`	`90`	`assertEquals(1.0, number);`
`92`	`91`	`}`
	`92`	`+`
	`93`	`+ public void testInfinity() {`
	`94`	`+ assertTrue(JsonIterator.deserialize("\"-infinity\"", Double.class) == Double.NEGATIVE_INFINITY);`
	`95`	`+ assertTrue(JsonIterator.deserialize("\"-infinity\"", Float.class) == Float.NEGATIVE_INFINITY);`
	`96`	`+ assertTrue(JsonIterator.deserialize("\"infinity\"", Double.class) == Double.POSITIVE_INFINITY);`
	`97`	`+ assertTrue(JsonIterator.deserialize("\"infinity\"", Float.class) == Float.POSITIVE_INFINITY);`
	`98`	`+ }`
	`99`	`+`
`93`	`100`	`}`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,10 @@ public class TestFloat extends TestCase {`
`8`	`8`	`public void testBigDecimal() {`
`9`	`9`	`assertEquals("100.1", JsonStream.serialize(new BigDecimal("100.1")));`
`10`	`10`	`}`
	`11`	`+ public void test_infinity() {`
	`12`	`+ assertEquals("\"Infinity\"", JsonStream.serialize(Double.POSITIVE_INFINITY));`
	`13`	`+ assertEquals("\"Infinity\"", JsonStream.serialize(Float.POSITIVE_INFINITY));`
	`14`	`+ assertEquals("\"-Infinity\"", JsonStream.serialize(Double.NEGATIVE_INFINITY));`
	`15`	`+ assertEquals("\"-Infinity\"", JsonStream.serialize(Float.NEGATIVE_INFINITY));`
	`16`	`+ }`
`11`	`17`	`}`

Comments

(0)