* make InputRecorder handle slice with embedded expressions

* special handling for Generate and Slice in BindingExtractor

1 files changed, 9 insertions, 0 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java
index a9a6df6ed4d..87e24306031 100644
--- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java
+++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java
@@ -11,6 +11,7 @@ import com.yahoo.tensor.evaluation.EvaluationContext;
 import com.yahoo.tensor.evaluation.Name;
 import com.yahoo.tensor.evaluation.TypeContext;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
@@ -47,6 +48,14 @@ public class Slice<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMETY
     @Override
     public List<TensorFunction<NAMETYPE>> arguments() { return List.of(argument); }
 
+    public List<TensorFunction<NAMETYPE>> selectorFunctions() {
+        var result = new ArrayList<TensorFunction<NAMETYPE>>();
+        for (var dimVal : subspaceAddress) {
+            dimVal.index().ifPresent(fun -> fun.asTensorFunction().ifPresent(tf -> result.add(tf)));
+        }
+        return result;
+    }
+
     @Override
     public Slice<NAMETYPE> withArguments(List<TensorFunction<NAMETYPE>> arguments) {
         if (arguments.size() != 1)