Fix scalar exp encoding

agrest-engine/src/main/java/io/agrest/exp/parser/AgExpressionParser.java

@@ -967,32 +967,34 @@ final public void stringLiteral() throws ParseException {
     case SINGLE_QUOTED_STRING:{
       jj_consume_token(SINGLE_QUOTED_STRING);
 ExpScalar jjtn001 = new ExpScalar(JJTSCALAR);
-                             boolean jjtc001 = true;
-                             jjtree.openNodeScope(jjtn001);
+      boolean jjtc001 = true;
+      jjtree.openNodeScope(jjtn001);
       try {
 jjtree.closeNodeScope(jjtn001,  0);
-                             jjtc001 = false;
+      jjtc001 = false;
 jjtn001.jjtSetValue(token_source.literalValue);
+        jjtn001.setScalarImage("'" + token_source.literalValue + "'");
       } finally {
 if (jjtc001) {
-                               jjtree.closeNodeScope(jjtn001,  0);
-                             }
+        jjtree.closeNodeScope(jjtn001,  0);
+      }
       }
       break;
       }
     case DOUBLE_QUOTED_STRING:{
       jj_consume_token(DOUBLE_QUOTED_STRING);
 ExpScalar jjtn002 = new ExpScalar(JJTSCALAR);
-                             boolean jjtc002 = true;
-                             jjtree.openNodeScope(jjtn002);
+      boolean jjtc002 = true;
+      jjtree.openNodeScope(jjtn002);
       try {
 jjtree.closeNodeScope(jjtn002,  0);
-                             jjtc002 = false;
+      jjtc002 = false;
 jjtn002.jjtSetValue(token_source.literalValue);
+        jjtn002.setScalarImage("\"" + token_source.literalValue + "\"");
       } finally {
 if (jjtc002) {
-                               jjtree.closeNodeScope(jjtn002,  0);
-                             }
+        jjtree.closeNodeScope(jjtn002,  0);
+      }
       }
       break;
       }

agrest-engine/src/main/java/io/agrest/exp/parser/ExpScalar.java

@@ -2,9 +2,14 @@
 /* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=true,TRACK_TOKENS=false,NODE_PREFIX=Exp,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 package io.agrest.exp.parser;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.function.Function;
 
 public class ExpScalar extends ExpBaseScalar<Object> {
+
+    protected String scalarImage;
+
     public ExpScalar(int id) {
         super(id);
     }
@@ -20,6 +25,9 @@ public ExpScalar() {
     public ExpScalar(Object value) {
         super(AgExpressionParserTreeConstants.JJTSCALAR);
         setValue(value);
+        if (value instanceof CharSequence) {
+            setScalarImage("'" + value + "'");
+        }
     }
 
     @Override
@@ -31,22 +39,44 @@ protected Object transformExpression(Function<Object, Object> transformer) {
      * Accept the visitor.
      **/
     public <T> T jjtAccept(AgExpressionParserVisitor<T> visitor, T data) {
-
         return visitor.visit(this, data);
     }
 
+    public String getScalarImage() {
+        return scalarImage;
+    }
+
+    public void setScalarImage(String scalarImage) {
+        this.scalarImage = scalarImage;
+    }
+
     @Override
     protected ExpScalar shallowCopy() {
         return new ExpScalar(getValue());
     }
 
     @Override
     public String toString() {
+        if (value == null) {
+            return "null";
+        }
         if (value instanceof CharSequence) {
-            return "'" + value + "'";
-        } else {
-            return String.valueOf(value);
+            String quoteChar = scalarImage.substring(0, 1);
+            String escapedContent = scalarImage
+                    .substring(1, scalarImage.length() - 1)
+                    .replaceAll(quoteChar, "\\\\" + quoteChar);
+            return quoteChar + escapedContent + quoteChar;
+        }
+        if (value.getClass() == Long.class) {
+            return value + "L";
+        }
+        if (value.getClass() == BigInteger.class) {
+            return value + "H";
+        }
+        if (value.getClass() == BigDecimal.class) {
+            return value + "B";
         }
+        return String.valueOf(value);
     }
 }
 /* JavaCC - OriginalChecksum=21004db13a44c6b16cc9797a6f36a4af (do not edit this line) */

agrest-engine/src/main/java/io/agrest/protocol/Exp.java

@@ -64,26 +64,27 @@ static Exp path(String path) {
      */
     static Exp scalar(Object value) {
         if (value == null) {
-            return new ExpScalar(AgExpressionParserTreeConstants.JJTSCALAR);
+            return new ExpScalar();
         }
 
         ExpBaseScalar<?> scalar;
         if (value instanceof Collection) {
-            scalar = new ExpScalarList(AgExpressionParserTreeConstants.JJTSCALARLIST);
-        } else if (value.getClass().isArray()) {
+            scalar = new ExpScalarList((Collection<?>) value);
+            return scalar;
+        }
+        if (value.getClass().isArray()) {
             Class<?> componentType = value.getClass().getComponentType();
             if (componentType.isPrimitive()) {
                 value = ExpUtils.wrapPrimitiveArray(value);
             } else {
                 value = Arrays.asList((Object[]) value);
             }
-            scalar = new ExpScalarList(AgExpressionParserTreeConstants.JJTSCALARLIST);
-        } else {
-            scalar = new ExpScalar(AgExpressionParserTreeConstants.JJTSCALAR);
+            scalar = new ExpScalarList();
+            scalar.jjtSetValue(value);
+            return scalar;
         }
 
-        scalar.jjtSetValue(value);
-        return scalar;
+        return new ExpScalar(value);
     }
 
     /**

agrest-engine/src/main/jjtree/io/agrest/exp/parser/AgExpressionParser.jjt

@@ -174,9 +174,17 @@ void stringParameter() : {}
 
 void stringLiteral() :  {}
 {
-    <SINGLE_QUOTED_STRING> { jjtThis.jjtSetValue(token_source.literalValue); } #Scalar(0)
+    <SINGLE_QUOTED_STRING>
+    {
+        jjtThis.jjtSetValue(token_source.literalValue);
+        jjtThis.setScalarImage("'" + token_source.literalValue + "'");
+    } #Scalar(0)
     |
-    <DOUBLE_QUOTED_STRING> { jjtThis.jjtSetValue(token_source.literalValue); } #Scalar(0)
+    <DOUBLE_QUOTED_STRING>
+    {
+        jjtThis.jjtSetValue(token_source.literalValue);
+        jjtThis.setScalarImage("\"" + token_source.literalValue + "\"");
+    } #Scalar(0)
 }
 
 void stringExpression() : {}

agrest-engine/src/test/java/io/agrest/exp/parser/ExpScalarFloatTest.java

@@ -49,15 +49,13 @@ void parse(String expString) {
             "1e1|10.0",
             "1E1|10.0",
             "1.1e1|11.0",
-            "3.4028235e+38f|3.4028235E38",
-            "1.7976931348623157e+308|1.7976931348623157E308",
-            "1.7976931348623157e+308d|1.7976931348623157E308",
             "1_2.1|12.1",
             "2.2__34|2.234",
             ".3e7_6|3.0E75",
-
-            // TODO: this is wrong, B suffix expected
-            "1.7976931348623157e+309b|1.7976931348623157E+309"
+            "3.4028235e+38f|3.4028235E38",
+            "1.7976931348623157e+308|1.7976931348623157E308",
+            "1.7976931348623157e+308d|1.7976931348623157E308",
+            "1.7976931348623157e+309b|1.7976931348623157E+309B"
     })
     public void parsedToString(String expString, String expected) {
         assertEquals(expected, Exp.parse(expString).toString());

agrest-engine/src/test/java/io/agrest/exp/parser/ExpScalarIntTest.java

@@ -50,10 +50,8 @@ void parse(String expString) {
             "01_2|10",
             "0x1_A|26",
             "123___456|123456",
-
-            // TODO: this is wrong, L suffix expected in the output
-            "2147483648L|2147483648",
-            "9223372036854775808H|9223372036854775808",
+            "2147483648L|2147483648L",
+            "9223372036854775808H|9223372036854775808H",
             "01234567|342391",
             "0x12345678|305419896",
             "0x09abcdef|162254319"

agrest-engine/src/test/java/io/agrest/exp/parser/ExpScalarStringTest.java

@@ -28,13 +28,12 @@ void parse(String expString) {
     @CsvSource(delimiter = '|', quoteCharacter = 'X', value = {
             "'example'|'example'",
             "  'example' |'example'",
-            "\"example\"|'example'",
+            "\"example\"|\"example\"",
             "''|''",
             "'  '|'  '",
-            "\"\\\"example\\\"\"|'\"example\"'",
-            // TODO: this is wrong, single quote must be escaped or double quotes used in output
-            "\"a'b\"|'a'b'",
-            "'a\"b'|'a\"b'"
+            "\"\\\"example\\\"\"|\"\\\"example\\\"\"",
+            "\"a\\\"'b\"|\"a\\\"'b\"",
+            "'a\"\\'b'|'a\"\\'b'"
     })
     public void parsedToString(String expString, String expected) {
         assertEquals(expected, Exp.parse(expString).toString());