Merge pull request #18 from tonysparks/string-constant-bug

fixed string index bug; added min/max per spec
tonysparks · Nov 12, 2019 · ed7d601 · ed7d601
2 parents b9d5734 + f851c67
commit ed7d601
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.github.tonysparks.jslt2</groupId>
 	<artifactId>jslt2</artifactId>
-	<version>0.2.4</version>
+	<version>0.2.5</version>
 
 	<description>
         A Virtual Machine based implementation of the JSLT json transformation language
@@ -54,7 +54,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.9.8</version>
+			<version>2.9.10.1</version>
 		</dependency>
 
 		<!-- TESTS -->
@@ -68,7 +68,7 @@
 		<dependency>
 			<groupId>com.schibsted.spt.data</groupId>
 			<artifactId>jslt</artifactId>
-			<version>0.1.5</version>
+			<version>0.1.8</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/src/main/java/jslt2/Jslt2StdLibrary.java b/src/main/java/jslt2/Jslt2StdLibrary.java
@@ -117,6 +117,27 @@ else if (arguments[0].isNull()) {
             throw new Jslt2Exception("error: " + msg);
         });
 
+        runtime.addFunction("min", 2, (input, arguments) -> {
+            // this works because null is the smallest of all values
+            if (Jslt2Util.compare(arguments[0], arguments[1]) < 0) {
+                return arguments[0];
+            }
+            else {
+              return arguments[1];
+            }
+        });
+
+        runtime.addFunction("max", 2, (input, arguments) -> {
+            if (arguments[0].isNull() || arguments[1].isNull()) {
+                return NullNode.instance;
+            }
+            else if (Jslt2Util.compare(arguments[0], arguments[1]) > 0) {
+                return arguments[0];
+            }
+            else {
+                return arguments[1];
+            }
+        });
 
 
 

diff --git a/src/main/java/jslt2/parser/Parser.java b/src/main/java/jslt2/parser/Parser.java
@@ -352,15 +352,15 @@ else if(match(DOT)) {
                      throw error(previous(), ErrorCode.UNEXPECTED_TOKEN);
                 }
 
-                Token name = null;
+                String identifier = null;
                 if(check(STRING)) {
-                    name = consume(STRING, ErrorCode.MISSING_IDENTIFIER);
+                    identifier = consume(STRING, ErrorCode.MISSING_IDENTIFIER).getValue().toString();
                 }
                 else {
-                    name = consume(IDENTIFIER, ErrorCode.MISSING_IDENTIFIER);
+                    identifier = consume(IDENTIFIER, ErrorCode.MISSING_IDENTIFIER).getText();
                 }
 
-                expr = node(new GetExpr(expr, name.getText()));
+                expr = node(new GetExpr(expr, identifier));
             }
             else {
                 break;

diff --git a/src/test/resources/query-tests.json b/src/test/resources/query-tests.json
@@ -701,6 +701,56 @@
       "input" : "{ \"data\": { \"x\" : \"hello\" } }",
       "query" : "{ \"y\": \"hello\"[1:3] }",
       "output" : "{\"y\":\"el\"}"
+   },
+   {
+      "query": "min(1, 2)",
+      "input" : "null",
+      "output": "1"
+   },
+   {
+      "query": "min(2, 1)",
+      "input" : "null",
+      "output": "1"
+   },
+   {
+      "query": "min(\"a\", \"b\")",
+      "input" : "null",
+      "output": "\"a\""
+   },
+   {
+      "query": "min(null, 0)",
+      "input" : "null",
+      "output": "null"
+   },
+   {
+      "query": "max(1, 2)",
+      "input" : "null",
+      "output": "2"
+   },
+   {
+      "query": "max(2, 1)",
+      "input" : "null",
+      "output": "2"
+   },
+   {
+      "query": "max(\"a\", \"b\")",
+      "input" : "null",
+      "output": "\"b\""
+   },
+   {
+      "query": "max(null, 0)",
+      "input" : "null",
+      "output": "null"
+   },       
+   {
+      "input" : "{ \"data\": { \"x\" : \"hello\" } }",
+      "query" : "{ \"y\": .data.\"x\" }",
+      "output" : "{\"y\":\"hello\"}"
+   },       
+   {
+      "input" : "{ \"data\": { \"x\" : \"hello\" } }",
+      "query" : "{ \"y\": .data.x }",
+      "output" : "{\"y\":\"hello\"}"
    }
-    ]
+   ]
 }
diff --git a/src/test/resources/simple-test.json b/src/test/resources/simple-test.json
@@ -1,10 +1,10 @@
 {
     "description" : "Simple one off test",
     "tests" : [
-    {
-      "input" : "{ \"data\": { \"x\" : \"hello\" } }",
-      "query" : "{ \"y\": \"hello\"[1:3] }",
-      "output" : "{\"y\":\"el\"}"
-   }
+       {
+          "input" : "{ \"data\": { \"x\" : \"hello\" } }",
+          "query" : "{ \"y\": .data.\"x\" }",
+          "output" : "{\"y\":\"hello\"}"
+       }
     ]
 }