Revert "'true' and 'false' literals in ranking expressions"

1 files changed, 14 insertions, 7 deletions

diff --git a/searchlib/src/main/javacc/RankingExpressionParser.jj b/searchlib/src/main/javacc/RankingExpressionParser.jj
index ebe1e048247..865820320d8 100755
--- a/searchlib/src/main/javacc/RankingExpressionParser.jj
+++ b/searchlib/src/main/javacc/RankingExpressionParser.jj
@@ -153,8 +153,6 @@ TOKEN :
     <MIN: "min"> |
     <PROD: "prod"> |
     <SUM: "sum"> |
-    <TRUE: "true"> |
-    <FALSE: "false"> |
 
     <IDENTIFIER: (["A"-"Z","a"-"z","0"-"9","_","@"](["A"-"Z","a"-"z","0"-"9","_","@","$"])*)>
 }
@@ -799,9 +797,7 @@ String identifier() :
     func = binaryFunctionName() { return func.toString(); } |
     <IF>                        { return token.image; }     |
     <IN>                        { return token.image; }     |
-    <IDENTIFIER>                { return token.image; }     |
-    <TRUE>                      { return token.image; }     |
-    <FALSE>                     { return token.image; }
+    <IDENTIFIER>                { return token.image; }
 }
 
 List<String> identifierList() :
@@ -858,14 +854,25 @@ ExpressionNode constantPrimitive(boolean negate) :
       ( <INTEGER> { value = token.image; } |
         <FLOAT> { value = token.image; }
       ) { node = new ConstantNode(Value.parse(negate ? ("-" + value) : value)); } |
-      ( <STRING> | <TRUE> | <FALSE> ) {
-        node = new ConstantNode(Value.parse(token.image));
+      <STRING> {
+        value = token.image;
+        node = new ConstantNode(Value.parse(value));
         if (negate) node = new NegativeNode(node);
       }
     )
     { return node; }
 }
 
+Value primitiveValue() :
+{
+    String sign = "";
+}
+{
+    ( <SUB> { sign = "-";} ) ?
+    ( <INTEGER> | <FLOAT> | <STRING> )
+    { return Value.parse(sign + token.image); }
+}
+
 TensorFunctionNode tensorValueBody(TensorType type, List dimensionOrder) :
 {
     DynamicTensor dynamicTensor;