fix bug when reading decimals that start with 0.

Nolij · May 16, 2024 · 1a3dd64 · 1a3dd64
1 parent 18db7ff
commit 1a3dd64
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/dev/nolij/zson/ZsonParser.java b/src/main/java/dev/nolij/zson/ZsonParser.java
@@ -290,6 +290,7 @@ private static Number parseNumber(Reader input, char start) throws IOException {
 			}
 
 			case '0' -> {
+				input.mark(1);
 				int c = input.read();
 				if (c == 'x' || c == 'X') {
 					StringBuilder hexValueBuilder = new StringBuilder();
@@ -306,6 +307,7 @@ private static Number parseNumber(Reader input, char start) throws IOException {
 
 					throw unexpectedEOF();
 				} else {
+					input.reset();
 					return parseDecimal('0', input);
 				}
 			}
@@ -315,8 +317,7 @@ private static Number parseNumber(Reader input, char start) throws IOException {
 	}
 
 	private static Number parseDecimal(char c, Reader input) throws IOException {
-		StringBuilder stringValueBuilder = new StringBuilder();
-		stringValueBuilder.append(c);
+		StringBuilder stringValueBuilder = new StringBuilder().append(c);
 
 		int ch;
 		input.mark(1);

diff --git a/src/test/java/ZsonTest.java b/src/test/java/ZsonTest.java
@@ -67,9 +67,7 @@ public void testReadWrite() {
 
 	@Test
 	public void testInvalidRead() {
-		assertThrows(IllegalArgumentException.class, () -> {
-			ZsonParser.parseString("wow look such invalid");
-		});
+		assertThrows(IllegalArgumentException.class, () -> ZsonParser.parseString("wow look such invalid"));
 	}
 
 	@Test
@@ -99,9 +97,11 @@ public void testRead() {
 
 		Map<String, ZsonValue> map = ZsonParser.parseString(json);
 
-		assertEquals(1, ((List<Object>) map.get("arr").value).get(0));
-		assertEquals(2, ((List<Object>) map.get("arr").value).get(1));
-		assertEquals(3, ((List<Object>) map.get("arr").value).get(2));
+		@SuppressWarnings("unchecked")
+		List<Object> arr = (List<Object>) map.get("arr").value;
+		assertEquals(1, arr.get(0));
+		assertEquals(2, arr.get(1));
+		assertEquals(3, arr.get(2));
 
 		Map<String, ZsonValue> obj = Zson.object(
 			Zson.entry("a", 1),
@@ -120,7 +120,7 @@ public void testRead() {
 		assertEquals(Double.POSITIVE_INFINITY, map.get("inf").value);
 		assertEquals(Double.NEGATIVE_INFINITY, map.get("neginf").value);
 		assertTrue(Double.isNaN((Double) map.get("nan").value));
-//		assertEquals("wow look \na multiline string", map.get("multiline-string").value);
+		assertEquals("wow look \na multiline string", map.get("multiline-string").value);
 	}
 
 	@Test