[FIXED] fixed number parsing when '_' is included

Author: thevpc

core/nuts-runtime/src/main/java/net/thevpc/nuts/runtime/standalone/format/tson/parser/custom/TsonCustomLexer.java

@@ -1939,13 +1939,14 @@ private NElementTokenImpl readNormalNumber(StringBuilder image, int line, int co
                         }
                         case AUTO: // auto detect
                         default: {
-                            if (info.baseValue.contains(".") || info.baseValue.contains("e") || info.baseValue.contains("E")) {
+                            String baseValue = info.baseValue.replace("_", "");
+                            if (baseValue.contains(".") || baseValue.contains("e") || baseValue.contains("E")) {
                                 numberElementType = NElementType.DOUBLE;
                                 try {
-                                    numberValue = (Double.parseDouble(info.baseValue));
+                                    numberValue = (Double.parseDouble(baseValue));
                                 } catch (Exception ex) {
                                     try {
-                                        numberValue = new BigDecimal(info.baseValue);
+                                        numberValue = new BigDecimal(baseValue);
                                         numberElementType = NElementType.BIG_DECIMAL;
                                     } catch (Exception ex2) {
                                         errorMessage = NMsg.ofC("%s", NExceptions.getErrorMessage(ex));
@@ -1955,14 +1956,14 @@ private NElementTokenImpl readNormalNumber(StringBuilder image, int line, int co
                             } else {
                                 numberElementType = NElementType.INT;
                                 try {
-                                    numberValue = (Integer.parseInt(info.baseValue));
+                                    numberValue = (Integer.parseInt(baseValue));
                                 } catch (Exception ex) {
                                     try {
-                                        numberValue = (Long.parseLong(info.baseValue));
+                                        numberValue = (Long.parseLong(baseValue));
                                         numberElementType = NElementType.LONG;
                                     } catch (Exception ex2) {
                                         try {
-                                            numberValue = new BigInteger(info.baseValue);
+                                            numberValue = new BigInteger(baseValue);
                                             numberElementType = NElementType.BIG_INT;
                                         } catch (Exception ex3) {
                                             errorMessage = NMsg.ofC("%s", NExceptions.getErrorMessage(ex));

test/nuts-runtime-test/src/test/java/net/thevpc/nuts/core/test/TsonParseTest.java

@@ -232,6 +232,39 @@ public void test07() {
         String tson = "-1E-5hello";
         NElement parsed = NElementReader.ofTson().read(tson);
         TestUtils.println(parsed.toString());
+        Assertions.assertEquals(-1E-5,parsed.asNumberValue().get());
+
+        tson = "2.1GHz";
+        parsed = NElementReader.ofTson().read(tson);
+        TestUtils.println(parsed.toString());
+        Assertions.assertEquals(2.1,parsed.asNumberValue().get());
+
+        tson = "2.3_GHz";
+        parsed = NElementReader.ofTson().read(tson);
+        TestUtils.println(parsed.toString());
+        Assertions.assertEquals(2.3,parsed.asNumberValue().get());
+
+        tson = "2_1.3_5_GHz";
+        parsed = NElementReader.ofTson().read(tson);
+        TestUtils.println(parsed.toString());
+        Assertions.assertEquals(21.35,parsed.asNumberValue().get());
+
+        tson = "2__1.3__5_GHz";
+        parsed = NElementReader.ofTson().read(tson);
+        TestUtils.println(parsed.toString());
+        Assertions.assertEquals(21.35,parsed.asNumberValue().get());
+
+        tson = "2__1_._3__5_GHz";
+        parsed = NElementReader.ofTson().read(tson);
+        TestUtils.println(parsed.toString());
+        Assertions.assertEquals(21.35,parsed.asNumberValue().get());
+
+        tson = "2__1_._3__5___GHz";
+        parsed = NElementReader.ofTson().read(tson);
+        TestUtils.println(parsed.toString());
+        Assertions.assertEquals(21.35,parsed.asNumberValue().get());
+
+
     }
 
     @Test