diff options
author | 2015-04-22 06:47:31 +0000 | |
---|---|---|
committer | 2015-04-22 12:42:37 +0000 | |
commit | 537a90b5b90856788412c962de61ece14e83274b (patch) | |
tree | 08b489df7f200b6fa59fee0adc857245f78f88e2 /src/main/java/com/google/devtools/build/lib/packages/RuleClass.java | |
parent | 443aaae842aaf5009c2972277a1089c504873877 (diff) |
Use BuiltinFunction for all builtins
Replace the uses of AbstractFunction, MixedModeFunction,
SkylarkFunction and SimpleSkylarkFunction by BuiltinFunction.
--
MOS_MIGRATED_REVID=91763158
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/packages/RuleClass.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/packages/RuleClass.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java index b4273c5d4e..c604fff3e2 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java +++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java @@ -31,11 +31,11 @@ import com.google.devtools.build.lib.events.Location; import com.google.devtools.build.lib.syntax.Argument; import com.google.devtools.build.lib.syntax.Environment; import com.google.devtools.build.lib.syntax.FuncallExpression; +import com.google.devtools.build.lib.syntax.Function; import com.google.devtools.build.lib.syntax.GlobList; import com.google.devtools.build.lib.syntax.Label; import com.google.devtools.build.lib.syntax.Label.SyntaxException; import com.google.devtools.build.lib.syntax.SkylarkEnvironment; -import com.google.devtools.build.lib.syntax.UserDefinedFunction; import com.google.devtools.build.lib.util.StringUtil; import com.google.devtools.build.lib.vfs.PathFragment; @@ -427,7 +427,7 @@ public final class RuleClass { PredicatesWithMessage.<Rule>alwaysTrue(); private Predicate<String> preferredDependencyPredicate = Predicates.alwaysFalse(); private List<Class<?>> advertisedProviders = new ArrayList<>(); - private UserDefinedFunction configuredTargetFunction = null; + private Function configuredTargetFunction = null; private SkylarkEnvironment ruleDefinitionEnvironment = null; private Set<Class<?>> configurationFragments = new LinkedHashSet<>(); private boolean failIfMissingConfigurationFragment; @@ -681,7 +681,7 @@ public final class RuleClass { /** * Sets the rule implementation function. Meant for Skylark usage. */ - public Builder setConfiguredTargetFunction(UserDefinedFunction func) { + public Builder setConfiguredTargetFunction(Function func) { this.configuredTargetFunction = func; return this; } @@ -834,7 +834,7 @@ public final class RuleClass { /** * The Skylark rule implementation of this RuleClass. Null for non Skylark executable RuleClasses. */ - @Nullable private final UserDefinedFunction configuredTargetFunction; + @Nullable private final Function configuredTargetFunction; /** * The Skylark rule definition environment of this RuleClass. @@ -895,7 +895,7 @@ public final class RuleClass { ConfiguredTargetFactory<?, ?> configuredTargetFactory, PredicateWithMessage<Rule> validityPredicate, Predicate<String> preferredDependencyPredicate, ImmutableSet<Class<?>> advertisedProviders, - @Nullable UserDefinedFunction configuredTargetFunction, + @Nullable Function configuredTargetFunction, @Nullable SkylarkEnvironment ruleDefinitionEnvironment, Set<Class<?>> allowedConfigurationFragments, boolean failIfMissingConfigurationFragment, boolean supportsConstraintChecking, @@ -1503,7 +1503,7 @@ public final class RuleClass { /** * Returns this RuleClass's custom Skylark rule implementation. */ - @Nullable public UserDefinedFunction getConfiguredTargetFunction() { + @Nullable public Function getConfiguredTargetFunction() { return configuredTargetFunction; } |