Prefix index variables by %

1 files changed, 13 insertions, 1 deletions

diff --git a/searchlib/src/main/javacc/RankingExpressionParser.jj b/searchlib/src/main/javacc/RankingExpressionParser.jj
index c7870182939..1153053ed09 100755
--- a/searchlib/src/main/javacc/RankingExpressionParser.jj
+++ b/searchlib/src/main/javacc/RankingExpressionParser.jj
@@ -68,7 +68,7 @@ TOKEN :
     <MOD: "%"> |
     <POWOP: "^"> |
 
-    <DOLLAR: "$"> |
+    <DOLLAR:"$"> |
     <COMMA: ","> |
     <COLON: ":"> |
 
@@ -244,6 +244,7 @@ ExpressionNode value() :
                    LOOKAHEAD(4) value = function()                            |
                    value = feature()                                          |
                    value = legacyQueryFeature()                               |
+                   value = indexVariable()                                    |
                    ( <LBRACE> value = expression() <RBRACE> { value = new EmbracedNode(value); } ) )
 
       )
@@ -290,6 +291,17 @@ ReferenceNode legacyQueryFeature() :
     }
 }
 
+ReferenceNode indexVariable() :
+{
+    String name;
+}
+{
+     ( <MOD> name = identifier() )
+     {
+         return new ReferenceNode("%" + name);
+     }
+}
+
 String outs() :
 {
     StringBuilder ret = new StringBuilder();