nocache keyword deprecation

Author: cesarParra

docs/src/app/docs/declaring-functions/page.md

@@ -92,9 +92,6 @@ The Expression language will cache the result of a function call, so if a functi
 same
 arguments and is within the same context, the result will be cached and the function will not be re-evaluated.
 
-This can be usedful when you have an evaluation that is expensive to compute, such as a `Query` call, and you want to
-reuse the result multiple times within the same expression.
-
 ```
 fun foo(n) => Query(Account(where: Name = n)[Name]);
 
@@ -104,17 +101,6 @@ fun foo(n) => Query(Account(where: Name = n)[Name]);
 In this example, the `foo` function will only be evaluated once for the `ACME` account, and the result will be reused
 for the second call. This means that a single query will be consumed from the Salesforce limits.
 
-### Disabling Caching
-
-Function caching can be disabled by using the `nocache` keyword after the `fun` keyword. This will force the function to
-be re-evaluated every time it is called, even if the arguments are the same.
-
-```
-fun nocache foo(n) => Query(Account(where: Name = n)[Name]);
-
-[...foo("ACME"), ...foo("ACME")]
-```
-
 ## Considerations
 
 - Names given to functions will superse any of the language's built-in functions. So if you declare a `sum` function,

expression-src/main/src/interpreter/Expr.cls

@@ -1,8 +1,3 @@
-
-// TODO: One issue with caching
-// is that some can be globally cached (like a raw query)
-// while others depend on the environment
-
 public abstract class Expr {
     public abstract Object accept(Visitor v);
 
@@ -100,14 +95,12 @@ public abstract class Expr {
         public final Token name;
         public final List<Token> parameters;
         public final Expr body;
-        public final Boolean skipCache;
         private final Map<Environment, Object> cachedValueForEnvironment = new Map<Environment, Object>();
 
-        public FunctionDeclaration(Token name, List<Token> parameters, Expr body, Boolean skipCache) {
+        public FunctionDeclaration(Token name, List<Token> parameters, Expr body) {
             this.name = name;
             this.parameters = parameters;
             this.body = body;
-            this.skipCache = skipCache;
         }
 
         public String functionName {
@@ -131,23 +124,14 @@ public abstract class Expr {
         }
 
         public void cache(Environment env, Object cachedValue) {
-            if (skipCache) {
-                return;
-            }
             cachedValueForEnvironment.put(env, cachedValue);
         }
 
         public Boolean isCachedForEnvironment(Environment env) {
-            if (skipCache) {
-                return false;
-            }
             return cachedValueForEnvironment.containsKey(env);
         }
 
         public Object getCachedValueForEnvironment(Environment env) {
-            if (skipCache) {
-                return null;
-            }
             return cachedValueForEnvironment.get(env);
         }
     }

expression-src/main/src/interpreter/Interpreter.cls

@@ -477,8 +477,7 @@ public virtual with sharing class Interpreter implements Visitor {
             return functionDeclaration;
         }
 
-        // Declarations should not be called
-        // by the EvaluatorResolver.
+        // Declarations should not be called by the EvaluatorResolver.
         // Reaching this point means a declaration exists within another expression and not at the top level,
         // which is not valid.
         throw new Exceptions.RuntimeException(

expression-src/main/src/interpreter/Parser.cls

@@ -45,13 +45,6 @@ public with sharing class Parser {
 
     private Expr functionDeclarationCheck() {
         if (match(TokenType.FUNCTION_KEYWORD)) {
-            Boolean skipCache = false;
-
-            // The fun keyword might be followed (optionally) by the nocache keyword
-            if (match(TokenType.NOCACHE_KEYWORD)) {
-                skipCache = true;
-            }
-
             Token name = consume(TokenType.IDENTIFIER, 'Expect function name.');
             consume(TokenType.LEFT_PAREN, 'Expect \'(\' after function name.');
             List<Token> parameters = new List<Token>();
@@ -68,7 +61,7 @@ public with sharing class Parser {
             consume(TokenType.FAT_ARROW, 'Expect \'=>\' before function body.');
             Expr body = expression();
             consume(TokenType.SEMICOLON, 'Expect \';\' after function body.');
-            return new Expr.FunctionDeclaration(name, parameters, body, skipCache);
+            return new Expr.FunctionDeclaration(name, parameters, body);
         }
         return orCheck();
     }
@@ -334,7 +327,7 @@ public with sharing class Parser {
                 if (match(TokenType.FAT_ARROW)) {
                     Expr body = expression();
                     // Pass null as the name since it's anonymous
-                    return new Expr.FunctionDeclaration(null, parameters, body, true);
+                    return new Expr.FunctionDeclaration(null, parameters, body);
                 }
             }
 

expression-src/main/src/interpreter/PipeResolver.cls

@@ -3,7 +3,7 @@
  */
 public with sharing class PipeResolver implements Visitor {
     public Expr resolve(Expr expr) {
-        return (Expr) expr.accept(this);
+        return (Expr)expr.accept(this);
     }
 
     public Object visit(Expr.Logical logical) {
@@ -27,7 +27,7 @@ public with sharing class PipeResolver implements Visitor {
             }
 
             // Add the left side as the first argument to the function call
-            Expr.FunctionCall function = (Expr.FunctionCall) binary.right;
+            Expr.FunctionCall function = (Expr.FunctionCall)binary.right;
             if (function.arguments.isEmpty()) {
                 function.arguments.add(binary.left);
             } else {
@@ -119,16 +119,16 @@ public with sharing class PipeResolver implements Visitor {
         List<Object> newElements = new List<Object>();
         for (Object element : mapLiteral.elements) {
             if (element instanceof Expr.Spread) {
-                newElements.add(resolve((Expr) element));
+                newElements.add(resolve((Expr)element));
                 continue;
             }
 
             if (element instanceof Expr.AddIfExpr) {
-                newElements.add(resolve((Expr) element));
+                newElements.add(resolve((Expr)element));
                 continue;
             }
 
-            Expr.KeyValue keyValue = (Expr.KeyValue) element;
+            Expr.KeyValue keyValue = (Expr.KeyValue)element;
             Expr.KeyValue newKeyValue = new Expr.KeyValue(
                 resolve(keyValue.key),
                 resolve(keyValue.value)
@@ -186,8 +186,7 @@ public with sharing class PipeResolver implements Visitor {
         return new Expr.FunctionDeclaration(
             functionDeclaration.name,
             functionDeclaration.parameters,
-            resolvedBody,
-            functionDeclaration.skipCache
+            resolvedBody
         );
     }
 

expression-src/main/src/interpreter/PipeResolver.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>60.0</apiVersion>
+    <apiVersion>65.0</apiVersion>
     <status>Active</status>
 </ApexClass>

expression-src/main/src/interpreter/Scanner.cls

@@ -18,15 +18,14 @@ public with sharing class Scanner {
         keywords.put('asc', TokenType.ASC_KEYWORD);
         keywords.put('desc', TokenType.DESC_KEYWORD);
         keywords.put('fun', TokenType.FUNCTION_KEYWORD);
-        keywords.put('nocache', TokenType.NOCACHE_KEYWORD);
         keywords.put('addif', TokenType.ADD_IF_KEYWORD);
     }
 
     public Scanner(String source) {
         this.source = normalizeCurvedQuotes(source);
     }
 
-    private String normalizeCurvedQuotes(String input) {
+    private static String normalizeCurvedQuotes(String input) {
         if (input == null) return null;
         return input.replace('“', '"').replace('”', '"');
     }

expression-src/main/src/interpreter/Scanner.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>60.0</apiVersion>
+    <apiVersion>65.0</apiVersion>
     <status>Active</status>
 </ApexClass>

expression-src/main/src/interpreter/StandardFunction.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>60.0</apiVersion>
+    <apiVersion>65.0</apiVersion>
     <status>Active</status>
 </ApexClass>

expression-src/main/src/interpreter/TokenType.cls

@@ -34,7 +34,7 @@ public enum TokenType {
     ASC_KEYWORD, DESC_KEYWORD, ADD_IF_KEYWORD,
 
     // ----------------- Functions ----------------------
-    FUNCTION_KEYWORD, FAT_ARROW, SEMICOLON, NOCACHE_KEYWORD,
+    FUNCTION_KEYWORD, FAT_ARROW, SEMICOLON,
 
     // ----------------- EOF ----------------------
     EOF