Resolve types of all argument-less functions

2 files changed, 14 insertions, 3 deletions

diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java
index 722520fea08..86d1c2f5066 100755
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java
@@ -273,6 +273,16 @@ public class RankingExpression implements Serializable {
     }
 
     /**
+     * Returns the expression type rank property name for a given expression name.
+     *
+     * @param expressionName the expression name to return as an expression type property
+     * @return the property name
+     */
+    public static String propertyTypeName(String expressionName) {
+        return "rankingExpression(" + expressionName + ").type";
+    }
+
+    /**
      * Validates the type correctness of the given expression with the given context and
      * returns the type this expression will produce from the given type context
      *
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java
index 796c13a8669..87944b39ded 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/SerializationContext.java
@@ -80,9 +80,10 @@ public class SerializationContext extends FunctionReferenceContext {
         serializedFunctions.put(name, expressionString);
     }
 
-    /** Returns the existing serialization of a function, or null if none */
-    public String getFunctionSerialization(String name) {
-        return serializedFunctions.get(name);
+    /** Adds the serialization of the type of a function */
+    public void addFunctionTypeSerialization(String name, String expressionString) {
+        // TODO: Enable
+        // serializedFunctions.put(name, expressionString);
     }
 
     @Override