Cleanup and update ABI spec

2 files changed, 18 insertions, 11 deletions

diff --git a/searchlib/abi-spec.json b/searchlib/abi-spec.json
index db9c2d46534..98b975546e7 100644
--- a/searchlib/abi-spec.json
+++ b/searchlib/abi-spec.json
@@ -1399,13 +1399,11 @@
       "public void <init>(java.util.Map)",
       "public void <init>(java.util.Map, java.util.Map)",
       "public com.yahoo.searchlib.rankingexpression.ExpressionFunction getFunction(java.lang.String)",
-      "protected final com.google.common.collect.ImmutableMap functions()",
+      "protected com.google.common.collect.ImmutableMap functions()",
       "public java.lang.String getBinding(java.lang.String)",
       "public com.yahoo.searchlib.rankingexpression.rule.FunctionReferenceContext withBindings(java.util.Map)"
     ],
-    "fields": [
-      "public final java.util.Map bindings"
-    ]
+    "fields": []
   },
   "com.yahoo.searchlib.rankingexpression.rule.GeneratorLambdaFunctionNode": {
     "superClass": "com.yahoo.searchlib.rankingexpression.rule.CompositeNode",
@@ -1553,7 +1551,7 @@
       "public void <init>()",
       "public void <init>(java.util.Collection)",
       "public void <init>(java.util.Map)",
-      "public void <init>(java.util.List, java.util.Map)",
+      "public void <init>(java.util.Collection, java.util.Map)",
       "public void <init>(java.util.Collection, java.util.Map, java.util.Map)",
       "public void <init>(com.google.common.collect.ImmutableMap, java.util.Map, java.util.Map)",
       "public void addFunctionSerialization(java.lang.String, java.lang.String)",
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TensorFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TensorFunctionNode.java
index f510f38d7a7..0a67ab5534e 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TensorFunctionNode.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TensorFunctionNode.java
@@ -120,8 +120,8 @@ public class TensorFunctionNode extends CompositeNode {
         @Override
         public String toString(ToStringContext c) {
             ToStringContext outermost = c;
-            while (outermost.wrapped() != null)
-                outermost = outermost.wrapped();
+            while (outermost.parent() != null)
+                outermost = outermost.parent();
 
             if (outermost instanceof ExpressionToStringContext) {
                 ExpressionToStringContext context = (ExpressionToStringContext)outermost;
@@ -190,8 +190,8 @@ public class TensorFunctionNode extends CompositeNode {
         @Override
         public String toString(ToStringContext c) {
             ToStringContext outermost = c;
-            while (outermost.wrapped() != null)
-                outermost = outermost.wrapped();
+            while (outermost.parent() != null)
+                outermost = outermost.parent();
 
             if (outermost instanceof ExpressionToStringContext) {
                 ExpressionToStringContext context = (ExpressionToStringContext)outermost;
@@ -208,7 +208,16 @@ public class TensorFunctionNode extends CompositeNode {
 
     }
 
-    /** Allows passing serialization context arguments through TensorFunctions */
+    /**
+     * This is used to pass a full expression serialization context through tensor functions.
+     * Tensor functions cannot see the full serialization context because it exposes expressions
+     * (which depends on the tensor module), but they need to be able to recursively add their own
+     * contexts (binding scopes) due to Generate binding dimension names.
+     *
+     * To be able to achieve both passing the serialization context through functions *and* allow them
+     * to add more context, we need to keep track of both these contexts here separately and map between
+     * contexts as seen in the toString methods of the function classes above.
+     */
     private static class ExpressionToStringContext extends SerializationContext implements ToStringContext {
 
         private final ToStringContext wrappedToStringContext;
@@ -258,7 +267,7 @@ public class TensorFunctionNode extends CompositeNode {
 
         protected ImmutableMap<String, ExpressionFunction> functions() { return wrappedSerializationContext.functions(); }
 
-        public ToStringContext wrapped() { return wrappedToStringContext; }
+        public ToStringContext parent() { return wrappedToStringContext; }
 
         /** Returns the resolution of an identifier, or null if it isn't defined in this context */
         @Override