Revert "Lesters/cell cast java"

2 files changed, 2 insertions, 32 deletions

diff --git a/searchlib/src/main/javacc/RankingExpressionParser.jj b/searchlib/src/main/javacc/RankingExpressionParser.jj
index d33e9ccff7f..36b1f9627bb 100755
--- a/searchlib/src/main/javacc/RankingExpressionParser.jj
+++ b/searchlib/src/main/javacc/RankingExpressionParser.jj
@@ -141,7 +141,6 @@ TOKEN :
     <XW_PLUS_B: "xw_plus_b"> |
     <ARGMAX: "argmax"> |
     <ARGMIN: "argmin"> |
-    <CELL_CAST: "cell_cast"> |
 
     <AVG: "avg" > |
     <COUNT: "count"> |
@@ -381,8 +380,7 @@ TensorFunctionNode tensorFunction() :
         tensorExpression = tensorSoftmax() |
         tensorExpression = tensorXwPlusB() |
         tensorExpression = tensorArgmax() |
-        tensorExpression = tensorArgmin() |
-        tensorExpression = tensorCellCast()
+        tensorExpression = tensorArgmin()
     )
     { return tensorExpression; }
 }
@@ -599,16 +597,6 @@ TensorFunctionNode tensorArgmin() :
     { return new TensorFunctionNode(new Argmin(TensorFunctionNode.wrap(tensor), dimensions)); }
 }
 
-TensorFunctionNode tensorCellCast() :
-{
-    ExpressionNode tensor;
-    String valueType;
-}
-{
-    <CELL_CAST> <LBRACE> tensor = expression() <COMMA> valueType = identifier() <RBRACE>
-    { return new TensorFunctionNode(new CellCast(TensorFunctionNode.wrap(tensor), TensorType.Value.fromId(valueType)));}
-}
-
 LambdaFunctionNode lambdaFunction() :
 {
     List<String> variables;
@@ -679,7 +667,7 @@ String tensorFunctionName() :
     ( <MAP>          { return token.image; } ) |
     ( <REDUCE>       { return token.image; } ) |
     ( <JOIN>         { return token.image; } ) |
-    ( <MERGE>        { return token.image; } ) |
+    ( <MERGE>         { return token.image; } ) |
     ( <RENAME>       { return token.image; } ) |
     ( <CONCAT>       { return token.image; } ) |
     ( <TENSOR>       { return token.image; } ) |
@@ -693,7 +681,6 @@ String tensorFunctionName() :
     ( <XW_PLUS_B>    { return token.image; } ) |
     ( <ARGMAX>       { return token.image; } ) |
     ( <ARGMIN>       { return token.image; } ) |
-    ( <CELL_CAST>    { return token.image; } )
     ( aggregator = tensorReduceAggregator() { return aggregator.toString(); } )
 }
 
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
index fae5a7a093c..123fa5ac43b 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
@@ -394,23 +394,6 @@ public class EvaluationTestCase {
     }
 
     @Test
-    public void testCellTypeCasting() {
-        EvaluationTester tester = new EvaluationTester();
-
-        tester.assertEvaluates("tensor<float>(x[3]):[1.0, 2.0, 3.0]",
-                               "cell_cast(tensor0, float)",
-                               "tensor<double>(x[3]):[1, 2, 3]");
-        tester.assertEvaluates("tensor<float>():{1}",
-                               "cell_cast(tensor0{x:1}, float)",
-                               "tensor<double>(x{}):{1:1, 2:2, 3:3}");
-        tester.assertEvaluates("tensor<float>(x[2]):[3,8]",
-                               "cell_cast(tensor0 * tensor1, float)",
-                               "tensor<float>(x[2]):[1,2]",
-                               "tensor<double>(x[2]):[3,4]");
-    }
-
-
-    @Test
     public void testMixedTensorType() throws ParseException {
         String expected = "tensor(x[1],y{},z[2]):{{x:0,y:a,z:0}:4.0,{x:0,y:a,z:1}:5.0,{x:0,y:b,z:0}:7.0,{x:0,y:b,z:1}:8.0}";
         String a = "tensor(x[1],y{}):{ {x:0,y:a}:1, {x:0,y:b}:2 }";