Add parboiled fallback when parsing parameters

Author: LinneaAndersson

cypher-shell/build.gradle

@@ -37,6 +37,25 @@ distributions {
 
 dependencies {
     compile "net.sourceforge.argparse4j:argparse4j:$argparse4jVersion"
+    compile("org.neo4j:neo4j-cypher-expression-evaluator:$evaluatorVersion") {
+        exclude(group: 'org.apache.lucene')
+        exclude(group: 'org.neo4j', module: 'neo4j-index')
+        exclude(group: 'org.neo4j', module: 'neo4j-lucene-upgrade')
+        exclude(group: 'org.neo4j', module: 'neo4j-ssl')
+        exclude(group: 'org.neo4j', module: 'neo4j-graph-algo')
+        exclude(group: 'org.neo4j', module: 'neo4j-io')
+        exclude(group: 'org.neo4j', module: 'neo4j-csv')
+        exclude(group: 'org.neo4j', module: 'neo4j-configuration')
+        exclude(group: 'org.neo4j', module: 'neo4j-collections')
+        exclude(group: 'org.neo4j', module: 'neo4j-diagnostics')
+        exclude(group: 'org.neo4j', module: 'neo4j-resource')
+        exclude(group: 'org.neo4j', module: 'neo4j-annotation-processors')
+        exclude(group: 'org.neo4j', module: 'neo4j-spatial-index')
+        exclude(group: 'org.neo4j', module: 'neo4j-native')
+        exclude(group: 'org.neo4j', module: 'neo4j-logging')
+        exclude(group: 'org.neo4j', module: 'neo4j-procedure-api')
+        exclude(group: 'org.eclipse.collections')
+    }
     compile("org.neo4j:neo4j-cypher-javacc-parser:$evaluatorVersion")
     compile "org.neo4j.driver:neo4j-java-driver:$neo4jJavaDriverVersion"
     compileOnly "com.google.code.findbugs:annotations:$findbugsVersion"

cypher-shell/src/main/java/org/neo4j/shell/ShellParameterMap.java

@@ -7,6 +7,9 @@
 import javax.annotation.Nonnull;
 
 import org.neo4j.cypher.internal.ast.factory.LiteralInterpreter;
+import org.neo4j.cypher.internal.evaluator.EvaluationException;
+import org.neo4j.cypher.internal.evaluator.Evaluator;
+import org.neo4j.cypher.internal.evaluator.ExpressionEvaluator;
 import org.neo4j.cypher.internal.parser.javacc.Cypher;
 import org.neo4j.cypher.internal.parser.javacc.ParseException;
 import org.neo4j.shell.exception.ParameterException;
@@ -20,6 +23,8 @@ public class ShellParameterMap implements ParameterMap
 {
     private final Map<String, ParamValue> queryParams = new HashMap<>();
     private LiteralInterpreter interpreter = new LiteralInterpreter();
+    private ExpressionEvaluator evaluator = Evaluator.expressionEvaluator();
+
 
     @Override
     public Object setParameter( @Nonnull String name, @Nonnull String valueString ) throws ParameterException
@@ -28,11 +33,17 @@ public Object setParameter( @Nonnull String name, @Nonnull String valueString )
         try {
             Object value = new Cypher<>( interpreter,
                                          ParameterException.FACTORY,
-                                         new StringReader( valueString ) ).Literal();
+                                         new StringReader( valueString ) ).Expression();
             queryParams.put( parameterName, new ParamValue( valueString, value ) );
             return value;
-        } catch (ParseException e) {
-            throw new ParameterException(e.getMessage());
+        } catch (ParseException | UnsupportedOperationException e) {
+            try {
+                Object value = evaluator.evaluate( valueString, Object.class );
+                queryParams.put( parameterName, new ParamValue( valueString, value ) );
+                return value;
+            } catch (EvaluationException e1) {
+                throw new ParameterException( e1.getMessage() );
+            }
         }
     }