commit 95b0d0cc209fbff23938910c12f84bdbef73eb68
author Francois-Rene Rideau <tunes@google.com> Wed Apr 22 16:52:13 2015 +0000
committer Laszlo Csomor <laszlocsomor@google.com> Thu Apr 23 09:11:04 2015 +0000
tree 6697e7e1bf0fdcd25bd931b69804aa315e551b2d
parent c857853cb0c0e4f13fd7890dec0d4d734c947932

Remove old Skylark Function hierarchy

Last step in refactoring of Skylark builtin functions.

--
MOS_MIGRATED_REVID=91796746

src/main/java/com/google/devtools/build/lib/packages/MethodLibrary.java

diff --git a/src/main/java/com/google/devtools/build/lib/packages/MethodLibrary.java b/src/main/java/com/google/devtools/build/lib/packages/MethodLibrary.java
index 9d7faa8..55d5bb5 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/MethodLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/MethodLibrary.java
@@ -14,6 +14,7 @@
 
 package com.google.devtools.build.lib.packages;
 
+import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
@@ -22,6 +23,7 @@
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.packages.Type.ConversionException;
+import com.google.devtools.build.lib.syntax.BaseFunction;
 import com.google.devtools.build.lib.syntax.BuiltinFunction;
 import com.google.devtools.build.lib.syntax.ClassObject;
 import com.google.devtools.build.lib.syntax.ClassObject.SkylarkClassObject;
@@ -30,7 +32,6 @@
 import com.google.devtools.build.lib.syntax.EvalException;
 import com.google.devtools.build.lib.syntax.EvalUtils;
 import com.google.devtools.build.lib.syntax.FuncallExpression;
-import com.google.devtools.build.lib.syntax.Function;
 import com.google.devtools.build.lib.syntax.SelectorList;
 import com.google.devtools.build.lib.syntax.SelectorValue;
 import com.google.devtools.build.lib.syntax.SkylarkEnvironment;
@@ -1024,24 +1025,24 @@
       + "</pre>")
   public static final class DictModule {}
 
-  public static final List<Function> stringFunctions = ImmutableList.<Function>of(
+  public static final List<BaseFunction> stringFunctions = ImmutableList.<BaseFunction>of(
       count, endswith, find, index, join, lower, replace, rfind,
       rindex, slice, split, startswith, strip, upper);
 
-  public static final List<Function> listPureFunctions = ImmutableList.<Function>of(
+  public static final List<BaseFunction> listPureFunctions = ImmutableList.<BaseFunction>of(
       slice);
 
-  public static final List<Function> listFunctions = ImmutableList.<Function>of(
+  public static final List<BaseFunction> listFunctions = ImmutableList.<BaseFunction>of(
       append, extend);
 
-  public static final List<Function> dictFunctions = ImmutableList.<Function>of(
+  public static final List<BaseFunction> dictFunctions = ImmutableList.<BaseFunction>of(
       items, get, keys, values);
 
-  private static final List<Function> pureGlobalFunctions = ImmutableList.<Function>of(
+  private static final List<BaseFunction> pureGlobalFunctions = ImmutableList.<BaseFunction>of(
       bool, int_, len, minus, select, sorted, str);
 
-  private static final List<Function> skylarkGlobalFunctions = ImmutableList
-      .<Function>builder()
+  private static final List<BaseFunction> skylarkGlobalFunctions =
+      ImmutableList.<BaseFunction>builder()
       .addAll(pureGlobalFunctions)
       .add(list, struct, hasattr, getattr, set, dir, enumerate, range, type, fail, print, zip)
       .build();
@@ -1071,14 +1072,14 @@
   }
 
   private static void setupMethodEnvironment(
-      Environment env, Class<?> nameSpace, Iterable<Function> functions) {
-    for (Function function : functions) {
+      Environment env, Class<?> nameSpace, Iterable<BaseFunction> functions) {
+    for (BaseFunction function : functions) {
       env.registerFunction(nameSpace, function.getName(), function);
     }
   }
 
-  private static void setupMethodEnvironment(Environment env, Iterable<Function> functions) {
-    for (Function function : functions) {
+  private static void setupMethodEnvironment(Environment env, Iterable<BaseFunction> functions) {
+    for (BaseFunction function : functions) {
       env.update(function.getName(), function);
     }
   }
@@ -1087,7 +1088,7 @@
    * Collect global functions for the validation environment.
    */
   public static void setupValidationEnvironment(Set<String> builtIn) {
-    for (Function function : skylarkGlobalFunctions) {
+    for (BaseFunction function : skylarkGlobalFunctions) {
       builtIn.add(function.getName());
     }
   }