1 files changed, 13 insertions, 1 deletions
diff --git a/searchlib/src/main/javacc/RankingExpressionParser.jj b/searchlib/src/main/javacc/RankingExpressionParser.jj
index 2f173ad0266..c83de4ced0a 100755
--- a/searchlib/src/main/javacc/RankingExpressionParser.jj
+++ b/searchlib/src/main/javacc/RankingExpressionParser.jj
@@ -598,9 +598,12 @@ Reduce.Aggregator tensorReduceAggregator() :
 
 TensorType tensorTypeArgument() :
 {
-    TensorType.Builder builder = new TensorType.Builder();
+    TensorType.Builder builder;
+    TensorType.Value valueType;
 }
 {
+    valueType = optionalTensorValueTypeParameter()
+    { builder = new TensorType.Builder(valueType); }
     <LBRACE>
     ( tensorTypeDimension(builder) ) ?
     ( <COMMA> tensorTypeDimension(builder) ) *
@@ -608,6 +611,15 @@ TensorType tensorTypeArgument() :
     { return builder.build(); }
 }
 
+TensorType.Value optionalTensorValueTypeParameter() :
+{
+    String valueType = "double";
+}
+{
+    ( <LT> valueType = identifier() <GT> )?
+    { return TensorTypeParser.toValueType(valueType); }
+}
+
 // NOTE: Only indexed bound dimensions are parsed currently, as that is what we need
 void tensorTypeDimension(TensorType.Builder builder) :
 {