Support for LARGE numbers (1.17.10)

Author: e3ndr

pom.xml

@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>co.casterlabs</groupId>
 	<artifactId>rson</artifactId>
-	<version>1.17.8</version>
+	<version>1.17.10</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/co/casterlabs/rakurai/json/deserialization/JsonNumberParser.java

@@ -1,6 +1,13 @@
 package co.casterlabs.rakurai.json.deserialization;
 
-import static co.casterlabs.rakurai.CharStrings.*;
+import static co.casterlabs.rakurai.CharStrings.strcontainsonly;
+import static co.casterlabs.rakurai.CharStrings.strcpy;
+import static co.casterlabs.rakurai.CharStrings.strdropchars;
+import static co.casterlabs.rakurai.CharStrings.strequals;
+import static co.casterlabs.rakurai.CharStrings.strfindex;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
 
 import co.casterlabs.rakurai.json.Rson.RsonConfig;
 import co.casterlabs.rakurai.json.element.JsonNumber;
@@ -49,11 +56,20 @@ public ParsedTokenPair readToken(char[] in, int skip, @NonNull RsonConfig settin
 
                 try {
                     if ((strfindex(read, '.') == -1) && (strfindex(read, 'E') == -1) && (strfindex(read, 'e') == -1)) {
-                        value = Long.parseLong(num);
+                        try {
+                            value = Long.parseLong(num);
+                        } catch (NumberFormatException ignored) {
+                            value = new BigInteger(num); // See if it's a big integer instead...
+                        }
                     } else {
-                        value = Double.parseDouble(num);
+                        try {
+                            value = Long.parseLong(num);
+                        } catch (NumberFormatException ignored) {
+                            value = new BigDecimal(num); // See if it's a big decimal instead...
+                        }
                     }
                 } catch (NumberFormatException e) {
+                    e.printStackTrace();
                     throw new JsonLexException();
                 }
             } else {

src/main/java/co/casterlabs/rakurai/json/element/JsonNumber.java

@@ -1,5 +1,8 @@
 package co.casterlabs.rakurai.json.element;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
 import co.casterlabs.rakurai.json.serialization.JsonSerializationContext;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -39,6 +42,24 @@ public void serializeToObject(@NonNull String key, @NonNull JsonSerializationCon
         ctx.insertObjectNumber(key, this.value);
     }
 
+    /* Big */
+
+    public boolean isDecimal() {
+        return this.value instanceof Double || this.value instanceof BigDecimal;
+    }
+
+    public boolean isBig() {
+        return this.value instanceof BigInteger || this.value instanceof BigDecimal;
+    }
+
+    public BigInteger bigInteger() {
+        return (BigInteger) this.value;
+    }
+
+    public BigDecimal bigDecimal() {
+        return (BigDecimal) this.value;
+    }
+
     /* Proxy */
 
     @Override

src/test/java/LargeLongs.java

@@ -0,0 +1,29 @@
+import co.casterlabs.rakurai.json.Rson;
+import co.casterlabs.rakurai.json.element.JsonObject;
+import co.casterlabs.rakurai.json.serialization.JsonParseException;
+import co.casterlabs.rakurai.json.validation.JsonValidationException;
+
+public class LargeLongs {
+
+    public static void main(String[] args) throws JsonValidationException, JsonParseException {
+        System.out.println(
+            Rson.DEFAULT
+                .fromJson("{\"very_long\": 16849904360176333000}", JsonObject.class)
+        );
+        System.out.println(
+            Rson.DEFAULT
+                .fromJson("{\"very_long\": -16849904360176333000}", JsonObject.class)
+        );
+
+        // Ensure that we didn't break anything.
+        System.out.println(
+            Rson.DEFAULT
+                .fromJson("{\"very_long\": 1684990436000}", JsonObject.class)
+        );
+        System.out.println(
+            Rson.DEFAULT
+                .fromJson("{\"very_long\": -1684990436000}", JsonObject.class)
+        );
+    }
+
+}