Merge pull request #368 from catull/fix-for-issue-367

Accept trimmed decimal numbers; i.e. make ".5" / "-.5" valid numbers

Author: larsga

core/src/main/java/com/schibsted/spt/data/jslt/impl/NodeUtils.java

@@ -150,6 +150,14 @@ private static JsonNode parseNumber(String number) {
     if (number.length() == 0)
       return null;
 
+    if (number.startsWith("-.")) {
+      number = "-0." + number.substring(2);
+    }
+
+    if (number.startsWith(".")) {
+      number = "0" + number;
+    }
+
     int sign = 1;
     int pos = 0;
     if (number.charAt(0) == '-') {

core/src/test/resources/function-error-tests.json

@@ -62,11 +62,6 @@
     "query": "number(\"123.\")",
     "input": "{}"
   },
-  {
-    "error": ".345",
-    "query": "number(\".345\")",
-    "input": "{}"
-  },
   {
     "error": "1.1e",
     "query": "number(\"1.1e\")",

core/src/test/resources/function-tests.json

@@ -837,6 +837,16 @@
       "input" : "{}",
       "output" : "-0.513"
    },
+   {
+      "query" : "number(\"-.513\")",
+      "input" : "{}",
+      "output" : "-0.513"
+   },
+   {
+      "query" : "number(\".513\")",
+      "input" : "{}",
+      "output" : "0.513"
+   },
    {
       "input" : "{}",
       "output" : "2",

functions.md

@@ -161,6 +161,8 @@ number(23)    => 23
 number("23")  => 23
 number("023") => 23
 number(23.0)  => 23.0
+number(.23)   =>  0.23
+number(-.23)  => -0.23
 number(null)  => null
 number("ab")  => error
 ```