commit f3a344e8ac518bdff54f803b5e9a61b73875ad9d
author adonovan <adonovan@google.com> Wed Dec 11 11:10:11 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Dec 11 11:11:06 2019 -0800
tree 0cd60bab67503db4d5a494cdb10bf411fd087701
parent 67ecff7ac3761d3c9309790bb98441acb66ed0e1

bazel syntax: eliminate two subclasses of BuiltinFunction

This change replaces two test-only subclasses of BuiltinFunction with
StarlarkCallables. (The remaining two subclasses, rule and
repository_rule, will be dealt with in a follow-up.)

Also, change type of rule's and repository_rule's "implementation" parameter
to StarlarkFunction, and eliminate casts that already made this assumption.

Also, give StarlarkCallable.getLocation a default value of BUILTIN.

PiperOrigin-RevId: 285022081

src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
index dcb9f0f..9fb50eb 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
@@ -2088,34 +2088,34 @@
         new NativeProvider<SkylarkClassObjectWithSkylarkCallables>(
             SkylarkClassObjectWithSkylarkCallables.class, "struct_with_skylark_callables") {};
 
+    // A function that returns "fromValues".
+    Object returnFromValues =
+        new StarlarkCallable() {
+          @Override
+          public String getName() {
+            return "returnFromValues";
+          }
+
+          @Override
+          public Object call(
+              List<Object> args,
+              Map<String, Object> kwargs,
+              FuncallExpression call,
+              StarlarkThread thread) {
+            return "fromValues";
+          }
+        };
+
     final Map<String, Object> fields =
         ImmutableMap.of(
             "values_only_field",
             "fromValues",
             "values_only_method",
-            new BuiltinFunction(FunctionSignature.of()) {
-              @Override
-              public String getName() {
-                return "values_only_method";
-              }
-
-              public String invoke() {
-                return "fromValues";
-              }
-            },
+            returnFromValues,
             "collision_field",
             "fromValues",
             "collision_method",
-            new BuiltinFunction(FunctionSignature.of()) {
-              @Override
-              public String getName() {
-                return "collision_method";
-              }
-
-              public String invoke() {
-                return "fromValues";
-              }
-            });
+            returnFromValues);
 
     SkylarkClassObjectWithSkylarkCallables() {
       super(CONSTRUCTOR, Location.BUILTIN);