#268

Author: wnm3

.classpath

@@ -36,27 +36,23 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" path="target/generated-sources/annotations">
 		<attributes>
+			<attribute name="ignore_optional_problems" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
 			<attribute name="m2e-apt" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
 		<attributes>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
 			<attribute name="m2e-apt" value="true"/>
-			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.settings/org.eclipse.jdt.core.prefs

@@ -125,7 +125,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled

README.md

@@ -23,12 +23,18 @@ You can also opt to clone this repository using the command line below and build
 git clone https://github.com/IBM/JSONata4Java.git
 ```
 
-### Java 1.8 Version needed for new Antlr 4.11.1 (Also updated project file to Eclipse 2022-12)
+### Differences with JavaScript jsonata.org ###
 
-The code was created using IBM Semeru Runtime Open Edition 11.0.17.0 (build 11.0.17+8). You can import the project into Eclipse 2023-03 or newer. 
-You can download the Java JDK 11 from https://developer.ibm.com/languages/java/semeru-runtimes/downloads/?license=IBM 
+The Java version uses ANTLR to build the parser for the language, and Java Objects are more tightly controlled that JavaScript Objects. Therefore, some things differ between the Java implementation and JavaScript implementation. For example:
+ - we require functions to be called with their arguments, even if no arguments are being passed. This is because we differentiate a variable reference with no parentheses from a function that has parentheses. 
+ - we require variables to begin with a letter or an underscore (but not a number) whereas jsonata.org allows variables to begin with numbers ([Issue 267](https://github.com/IBM/JSONata4Java/issues/267)).
+ - Arrays hold JsonNode types so can not hold references to functions, whereas jsonata.org can manage function references within an array ([Issue 268](https://github.com/IBM/JSONata4Java/issues/268)).  
 
-However, the build dependencies are set to allow use with Java 1.8
+### Java 11 and 1.8 Versions needed for new Antlr 4.11.1 (Also updated project file to Eclipse 2023-03)
+
+The code was created using IBM Semeru Runtime Open Edition 11.0.17.0 (build 11.0.17+8). You can import the project into Eclipse 2023-03 or newer. This is to allow the newer version of ANTLR to generate necessary code from the g4 file defining the language.  You can download the Java JDK 11 from https://developer.ibm.com/languages/java/semeru-runtimes/downloads/?license=IBM 
+
+** *However, the build dependencies are set to allow use with Java 1.8* **
 
 
 ### Building the jar files
@@ -40,9 +46,11 @@ you can right click on the pom.xml file and select **Run as... / Maven build...*
 
 ![Launcher Image](./images/Launcher.png)
 
-Alternatively, you can run from the command line in the JSONata4Java directory: **mvn clean install -Dgpg.skip**
+Alternatively, you can run from the command line in the JSONata4Java directory:  
+`mvn clean install -Dgpg.skip`
 
-Note: to build and deploy the jars to Maven Central you need to use a command like: **mvn clean install deploy -Prelease**
+Note: to build and deploy the jars to Maven Central you need to use a command like:  
+`mvn clean install deploy -Prelease`
 
 Once you have run the launcher, you can find the jar files in the /target directory. There are two:
 * **JSONata4Java-2.4.1-jar-with-dependencies.jar** (thinks includes dependent jar files)

pom.xml

@@ -106,18 +106,22 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
+<<<<<<< Upstream, based on branch 'master' of https://github.com/IBM/JSONata4Java.git
 			<version>2.15.0</version>
+=======
+			<version>2.15.1</version>
+>>>>>>> 170cea8 IBM/JSONata4Java#268
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/com.fasterxml.woodstox/woodstox-core -->
 		<dependency>
 			<groupId>com.fasterxml.woodstox</groupId>
 			<artifactId>woodstox-core</artifactId>
-			<version>6.5.0</version>
+			<version>6.5.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
-			<version>2.14.2</version>
+			<version>2.15.1</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
 		<dependency>

src/main/java/com/api/jsonata4java/expressions/ExpressionsVisitor.java

@@ -3029,6 +3029,14 @@ public JsonNode visitVar_recall(MappingExpressionParser.Var_recallContext ctx) {
         }
         final String varName = ctx.getText();
         JsonNode result = getVariable(varName);
+//        if (result == null) {
+//          // see if this is calling a declared function with no parameters
+//          DeclaredFunction declFct = getDeclaredFunction(varName);
+//          if (declFct != null) {
+//            ExprListContext exprListCtx = declFct.getExpressionList();
+//            result = visit(exprListCtx);
+//          }
+//        }
         lastVisited = METHOD;
         if (LOG.isLoggable(Level.FINEST)) {
             LOG.exiting(CLASS, METHOD, (result == null ? "null" : result.toString()));

src/main/java/com/api/jsonata4java/expressions/functions/ExistsFunction.java

@@ -46,7 +46,7 @@ public JsonNode invoke(ExpressionsVisitor expressionVisitor, Function_callContex
 
         // Retrieve the number of arguments
         JsonNode arg = JsonNodeFactory.instance.nullNode();
-        boolean useContext = FunctionUtils.useContextVariable(this, ctx, getSignature());
+        boolean useContext = false; // FunctionUtils.useContextVariable(this, ctx, getSignature());
         int argCount = getArgumentCount(ctx);
         if (useContext) {
             arg = FunctionUtils.getContextVariable(expressionVisitor);

testfiles/dataarray_9.json

@@ -0,0 +1 @@
+[["A","B","C"],["AA","BB","CC"]]