The great Skylark -> Starlark class migration: SkylarkModules SkylarkRuleClassFunctions SkylarkRuleContext SkylarkAspect SkylarkDefinedAspect SkylarkExportable SkylarkNativeAspect SkylarkNativeModule SkylarkAspectApi SkylarkNativeModuleApi SkylarkRuleContextApi SkylarkRuleFunctionsApi SkylarkAspectStub FakeSkylarkAspect FakeSkylarkNativeModuleApi FakeSkylarkRuleFunctionsApi SkylarkDefinedAspectsTest SkylarkRuleClassFunctionsTest SkylarkRuleContextTest SkylarkRuleImplementationFunctionsTest SkylarkStringRepresentationsTest SkylarkTestCase PiperOrigin-RevId: 310967362
diff --git a/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java b/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java index 9831c46..487d49a 100644 --- a/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java +++ b/src/main/java/com/google/devtools/build/docgen/SymbolFamilies.java
@@ -29,7 +29,7 @@ import com.google.devtools.build.lib.skylarkbuildapi.python.PyBootstrap; import com.google.devtools.build.lib.skylarkbuildapi.repository.RepositoryBootstrap; import com.google.devtools.build.lib.skylarkbuildapi.stubs.ProviderStub; -import com.google.devtools.build.lib.skylarkbuildapi.stubs.SkylarkAspectStub; +import com.google.devtools.build.lib.skylarkbuildapi.stubs.StarlarkAspectStub; import com.google.devtools.build.lib.skylarkbuildapi.test.TestingBootstrap; import com.google.devtools.build.lib.syntax.Starlark; import com.google.devtools.build.lib.util.Classpath; @@ -39,10 +39,10 @@ import com.google.devtools.build.skydoc.fakebuildapi.FakeConfigApi; import com.google.devtools.build.skydoc.fakebuildapi.FakeDefaultInfoProvider; import com.google.devtools.build.skydoc.fakebuildapi.FakeOutputGroupInfo.FakeOutputGroupInfoProvider; -import com.google.devtools.build.skydoc.fakebuildapi.FakeSkylarkNativeModuleApi; -import com.google.devtools.build.skydoc.fakebuildapi.FakeSkylarkRuleFunctionsApi; import com.google.devtools.build.skydoc.fakebuildapi.FakeStarlarkAttrModuleApi; import com.google.devtools.build.skydoc.fakebuildapi.FakeStarlarkCommandLineApi; +import com.google.devtools.build.skydoc.fakebuildapi.FakeStarlarkNativeModuleApi; +import com.google.devtools.build.skydoc.fakebuildapi.FakeStarlarkRuleFunctionsApi; import com.google.devtools.build.skydoc.fakebuildapi.FakeStructApi.FakeStructProviderApi; import com.google.devtools.build.skydoc.fakebuildapi.android.FakeAndroidApplicationResourceInfo.FakeAndroidApplicationResourceInfoProvider; import com.google.devtools.build.skydoc.fakebuildapi.android.FakeAndroidDeviceBrokerInfo.FakeAndroidDeviceBrokerInfoProvider; @@ -170,8 +170,8 @@ new FakeBuildApiGlobals(), new FakeStarlarkAttrModuleApi(), new FakeStarlarkCommandLineApi(), - new FakeSkylarkNativeModuleApi(), - new FakeSkylarkRuleFunctionsApi( + new FakeStarlarkNativeModuleApi(), + new FakeStarlarkRuleFunctionsApi( Lists.newArrayList(), Lists.newArrayList(), Lists.newArrayList()), new FakeStructProviderApi(), new FakeOutputGroupInfoProvider(), @@ -210,7 +210,7 @@ new ProtoBootstrap( new FakeProtoInfoProvider(), new FakeProtoCommon(), - new SkylarkAspectStub(), + new StarlarkAspectStub(), new ProviderStub()); PyBootstrap pyBootstrap = new PyBootstrap(
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD index 3cde967..0bf2ebd 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BUILD +++ b/src/main/java/com/google/devtools/build/lib/analysis/BUILD
@@ -247,14 +247,14 @@ "extra/ExtraAction.java", "extra/ExtraActionMapProvider.java", "extra/ExtraActionSpec.java", - "skylark/SkylarkModules.java", - "skylark/SkylarkRuleClassFunctions.java", "skylark/SkylarkRuleConfiguredTargetUtil.java", - "skylark/SkylarkRuleContext.java", "skylark/StarlarkActionFactory.java", "skylark/StarlarkAttrModule.java", "skylark/StarlarkAttributeTransitionProvider.java", "skylark/StarlarkAttributesCollection.java", + "skylark/StarlarkModules.java", + "skylark/StarlarkRuleClassFunctions.java", + "skylark/StarlarkRuleContext.java", "skylark/StarlarkRuleTransitionProvider.java", "skylark/StarlarkTransition.java", "test/AnalysisTestActionBuilder.java",
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java index e125898..14becb7 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
@@ -265,7 +265,7 @@ public static final String TAGGED_TRIMMING_ATTR = "transitive_configs"; /** Share common attributes across both base and Starlark base rules. */ - public static RuleClass.Builder commonCoreAndSkylarkAttributes(RuleClass.Builder builder) { + public static RuleClass.Builder commonCoreAndStarlarkAttributes(RuleClass.Builder builder) { return builder // The visibility attribute is special: it is a nodep label, and loading the // necessary package groups is handled by {@link LabelVisitor#visitTargetVisibility}. @@ -376,7 +376,7 @@ public static final class BaseRule implements RuleDefinition { @Override public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) { - return commonCoreAndSkylarkAttributes(builder) + return commonCoreAndStarlarkAttributes(builder) .add( attr("licenses", LICENSE) .nonconfigurable("Used in core loading phase logic with no access to configs"))
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java index 56b6d34..f450780 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredRuleClassProvider.java
@@ -40,7 +40,7 @@ import com.google.devtools.build.lib.analysis.config.transitions.TransitionFactory; import com.google.devtools.build.lib.analysis.constraints.ConstraintSemantics; import com.google.devtools.build.lib.analysis.constraints.RuleContextConstraintSemantics; -import com.google.devtools.build.lib.analysis.skylark.SkylarkModules; +import com.google.devtools.build.lib.analysis.skylark.StarlarkModules; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.cmdline.RepositoryName; @@ -731,7 +731,7 @@ ImmutableMap.Builder<String, Object> envBuilder = ImmutableMap.builder(); // Among other symbols, this step adds the Starlark universe (e.g. None/True/len), for now. - SkylarkModules.addSkylarkGlobalsToBuilder(envBuilder); + StarlarkModules.addStarlarkGlobalsToBuilder(envBuilder); envBuilder.putAll(skylarkAccessibleTopLevels.entrySet()); for (Bootstrap bootstrap : bootstraps) {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java index f4275cf..2dc9a76 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java
@@ -94,9 +94,9 @@ String toolsRepository) throws InterruptedException, RuleErrorException, ActionConflictException { String expectFailure = ruleContext.attributes().get("expect_failure", Type.STRING); - SkylarkRuleContext skylarkRuleContext = null; + StarlarkRuleContext starlarkRuleContext = null; try (Mutability mutability = Mutability.create("configured target")) { - skylarkRuleContext = new SkylarkRuleContext(ruleContext, null, starlarkSemantics); + starlarkRuleContext = new StarlarkRuleContext(ruleContext, null, starlarkSemantics); StarlarkThread thread = StarlarkThread.builder(mutability) .setSemantics(starlarkSemantics) @@ -135,7 +135,7 @@ Starlark.call( thread, ruleImplementation, - /*args=*/ ImmutableList.of(skylarkRuleContext), + /*args=*/ ImmutableList.of(starlarkRuleContext), /*kwargs=*/ ImmutableMap.of()); if (ruleContext.hasErrors()) { @@ -151,7 +151,7 @@ ruleContext.ruleError("Expected failure not found: " + expectFailure); return null; } - ConfiguredTarget configuredTarget = createTarget(skylarkRuleContext, target); + ConfiguredTarget configuredTarget = createTarget(starlarkRuleContext, target); if (configuredTarget != null) { // If there was error creating the ConfiguredTarget, no further validation is needed. // Null will be returned and the errors thus reported. @@ -170,8 +170,8 @@ ruleContext.ruleError("\n" + e.print()); return null; } finally { - if (skylarkRuleContext != null) { - skylarkRuleContext.nullify(); + if (starlarkRuleContext != null) { + starlarkRuleContext.nullify(); } } } @@ -212,7 +212,7 @@ } @Nullable - private static ConfiguredTarget createTarget(SkylarkRuleContext context, Object target) + private static ConfiguredTarget createTarget(StarlarkRuleContext context, Object target) throws EvalException, RuleErrorException, ActionConflictException { RuleConfiguredTargetBuilder builder = new RuleConfiguredTargetBuilder( context.getRuleContext()); @@ -305,7 +305,7 @@ } private static void addProviders( - SkylarkRuleContext context, RuleConfiguredTargetBuilder builder, Object target, Location loc) + StarlarkRuleContext context, RuleConfiguredTargetBuilder builder, Object target, Location loc) throws EvalException { StructImpl oldStyleProviders = @@ -319,7 +319,7 @@ loc = info.getCreationLoc(); if (getProviderKey(loc, info).equals(StructProvider.STRUCT.getKey())) { - if (context.getSkylarkSemantics().incompatibleDisallowStructProviderSyntax()) { + if (context.getStarlarkSemantics().incompatibleDisallowStructProviderSyntax()) { throw Starlark.errorf( "Returning a struct from a rule implementation function is deprecated and will " + "be removed soon. It may be temporarily re-enabled by setting " @@ -486,7 +486,7 @@ * throws an {@link EvalException} if there are unknown fields. */ private static void parseDefaultProviderFields( - StructImpl provider, SkylarkRuleContext context, RuleConfiguredTargetBuilder builder) + StructImpl provider, StarlarkRuleContext context, RuleConfiguredTargetBuilder builder) throws EvalException { Depset files = null; Runfiles statelessRunfiles = null;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkActionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkActionFactory.java index c1335f9..ae1bd8c 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkActionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkActionFactory.java
@@ -70,14 +70,14 @@ /** Provides a Starlark interface for all action creation needs. */ public class StarlarkActionFactory implements StarlarkActionFactoryApi { - private final SkylarkRuleContext context; + private final StarlarkRuleContext context; private final StarlarkSemantics starlarkSemantics; private RuleContext ruleContext; /** Counter for actions.run_shell helper scripts. Every script must have a unique name. */ private int runShellOutputCounter = 0; public StarlarkActionFactory( - SkylarkRuleContext context, StarlarkSemantics starlarkSemantics, RuleContext ruleContext) { + StarlarkRuleContext context, StarlarkSemantics starlarkSemantics, RuleContext ruleContext) { this.context = context; this.starlarkSemantics = starlarkSemantics; this.ruleContext = ruleContext;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttrModule.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttrModule.java index d233a54..223c73a 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttrModule.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttrModule.java
@@ -34,7 +34,7 @@ import com.google.devtools.build.lib.packages.BazelStarlarkContext; import com.google.devtools.build.lib.packages.BuildType; import com.google.devtools.build.lib.packages.Provider; -import com.google.devtools.build.lib.packages.SkylarkAspect; +import com.google.devtools.build.lib.packages.StarlarkAspect; import com.google.devtools.build.lib.packages.StarlarkCallbackHelper; import com.google.devtools.build.lib.packages.StarlarkProviderIdentifier; import com.google.devtools.build.lib.packages.Type; @@ -287,7 +287,7 @@ if (containsNonNoneKey(arguments, ASPECTS_ARG)) { Object obj = arguments.get(ASPECTS_ARG); - for (SkylarkAspect aspect : Sequence.cast(obj, SkylarkAspect.class, "aspects")) { + for (StarlarkAspect aspect : Sequence.cast(obj, StarlarkAspect.class, "aspects")) { aspect.attachToAttribute(builder); } }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributesCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributesCollection.java index 6040420..d487978 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributesCollection.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkAttributesCollection.java
@@ -38,7 +38,7 @@ /** Information about attributes of a rule an aspect is applied to. */ class StarlarkAttributesCollection implements StarlarkAttributesCollectionApi { - private final SkylarkRuleContext starlarkRuleContext; + private final StarlarkRuleContext starlarkRuleContext; private final StructImpl attrObject; private final StructImpl executableObject; private final StructImpl fileObject; @@ -50,7 +50,7 @@ "No attribute '%s' in attr. Make sure you declared a rule attribute with this name."; private StarlarkAttributesCollection( - SkylarkRuleContext starlarkRuleContext, + StarlarkRuleContext starlarkRuleContext, String ruleClassName, Map<String, Object> attrs, Map<String, Object> executables, @@ -126,12 +126,12 @@ printer.append("<rule collection for " + starlarkRuleContext.getRuleLabelCanonicalName() + ">"); } - public static Builder builder(SkylarkRuleContext ruleContext) { + public static Builder builder(StarlarkRuleContext ruleContext) { return new Builder(ruleContext); } public static class Builder { - private final SkylarkRuleContext context; + private final StarlarkRuleContext context; private final LinkedHashMap<String, Object> attrBuilder = new LinkedHashMap<>(); private final LinkedHashMap<String, Object> executableBuilder = new LinkedHashMap<>(); private final ImmutableMap.Builder<Artifact, FilesToRunProvider> executableRunfilesbuilder = @@ -140,7 +140,7 @@ private final LinkedHashMap<String, Object> filesBuilder = new LinkedHashMap<>(); private final HashSet<Artifact> seenExecutables = new HashSet<>(); - private Builder(SkylarkRuleContext ruleContext) { + private Builder(StarlarkRuleContext ruleContext) { this.context = ruleContext; }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkModules.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkModules.java similarity index 86% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkModules.java rename to src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkModules.java index 36ff63f..cb7ccbd 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkModules.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkModules.java
@@ -18,16 +18,16 @@ import com.google.devtools.build.lib.analysis.ActionsProvider; import com.google.devtools.build.lib.analysis.DefaultInfo; import com.google.devtools.build.lib.analysis.OutputGroupInfo; -import com.google.devtools.build.lib.packages.SkylarkNativeModule; import com.google.devtools.build.lib.packages.StarlarkLibrary; +import com.google.devtools.build.lib.packages.StarlarkNativeModule; import com.google.devtools.build.lib.packages.StructProvider; import com.google.devtools.build.lib.skylarkbuildapi.TopLevelBootstrap; import com.google.devtools.build.lib.syntax.Starlark; /** The basis for a Starlark Environment with all build-related modules registered. */ -public final class SkylarkModules { +public final class StarlarkModules { - private SkylarkModules() { } + private StarlarkModules() { } /** A bootstrap for non-rules-specific globals of the build API. */ private static TopLevelBootstrap topLevelBootstrap = @@ -35,8 +35,8 @@ new BazelBuildApiGlobals(), new StarlarkAttrModule(), new StarlarkCommandLine(), - new SkylarkNativeModule(), - new SkylarkRuleClassFunctions(), + new StarlarkNativeModule(), + new StarlarkRuleClassFunctions(), StructProvider.STRUCT, OutputGroupInfo.SKYLARK_CONSTRUCTOR, ActionsProvider.INSTANCE, @@ -46,7 +46,7 @@ * Adds bindings for Starlark built-ins and non-rules-specific globals of the build API to the * given environment map builder. */ - public static void addSkylarkGlobalsToBuilder(ImmutableMap.Builder<String, Object> env) { + public static void addStarlarkGlobalsToBuilder(ImmutableMap.Builder<String, Object> env) { env.putAll(Starlark.UNIVERSE); env.putAll(StarlarkLibrary.COMMON); // e.g. select, depset topLevelBootstrap.addBindingsToBuilder(env);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleClassFunctions.java similarity index 95% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java rename to src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleClassFunctions.java index 3e0e6f1..4ed35c3 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleClassFunctions.java
@@ -67,10 +67,10 @@ import com.google.devtools.build.lib.packages.RuleFactory.BuildLangTypedAttributeValuesMap; import com.google.devtools.build.lib.packages.RuleFactory.InvalidRuleException; import com.google.devtools.build.lib.packages.RuleFunction; -import com.google.devtools.build.lib.packages.SkylarkAspect; -import com.google.devtools.build.lib.packages.SkylarkDefinedAspect; -import com.google.devtools.build.lib.packages.SkylarkExportable; +import com.google.devtools.build.lib.packages.StarlarkAspect; import com.google.devtools.build.lib.packages.StarlarkCallbackHelper; +import com.google.devtools.build.lib.packages.StarlarkDefinedAspect; +import com.google.devtools.build.lib.packages.StarlarkExportable; import com.google.devtools.build.lib.packages.StarlarkProvider; import com.google.devtools.build.lib.packages.StarlarkProviderIdentifier; import com.google.devtools.build.lib.packages.TargetUtils; @@ -78,7 +78,7 @@ import com.google.devtools.build.lib.packages.Type; import com.google.devtools.build.lib.packages.Type.ConversionException; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleFunctionsApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleFunctionsApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Identifier; @@ -98,7 +98,7 @@ import java.util.concurrent.ExecutionException; /** A helper class to provide an easier API for Starlark rule definitions. */ -public class SkylarkRuleClassFunctions implements SkylarkRuleFunctionsApi<Artifact> { +public class StarlarkRuleClassFunctions implements StarlarkRuleFunctionsApi<Artifact> { // TODO(bazel-team): Copied from ConfiguredRuleClassProvider for the transition from built-in // rules to Starlark extensions. Using the same instance would require a large refactoring. @@ -124,7 +124,7 @@ // TODO(bazel-team): Remove the code duplication (BaseRuleClasses and this class). /** Parent rule class for non-executable non-test Starlark rules. */ public static final RuleClass baseRule = - BaseRuleClasses.commonCoreAndSkylarkAttributes( + BaseRuleClasses.commonCoreAndStarlarkAttributes( BaseRuleClasses.nameAttribute( new RuleClass.Builder("$base_rule", RuleClassType.ABSTRACT, true)) .add(attr("expect_failure", STRING))) @@ -269,7 +269,7 @@ Boolean outputToGenfiles, Sequence<?> fragments, Sequence<?> hostFragments, - Boolean skylarkTestable, + Boolean starlarkTestable, Sequence<?> toolchains, String doc, Sequence<?> providesArg, @@ -298,7 +298,7 @@ ImmutableList<Pair<String, StarlarkAttrModule.Descriptor>> attributes = attrObjectToAttributesList(attrs); - if (skylarkTestable) { + if (starlarkTestable) { builder.setStarlarkTestable(); } if (Boolean.TRUE.equals(analysisTest)) { @@ -388,16 +388,16 @@ Starlark.type(o)); } } - for (StarlarkProviderIdentifier skylarkProvider : + for (StarlarkProviderIdentifier starlarkProvider : StarlarkAttrModule.getStarlarkProviderIdentifiers(providesArg)) { - builder.advertiseStarlarkProvider(skylarkProvider); + builder.advertiseStarlarkProvider(starlarkProvider); } if (!execCompatibleWith.isEmpty()) { builder.addExecutionPlatformConstraints(parseExecCompatibleWith(execCompatibleWith, thread)); } - return new SkylarkRuleFunction(builder, type, attributes, thread.getCallerLocation()); + return new StarlarkRuleFunction(builder, type, attributes, thread.getCallerLocation()); } private static void checkAttributeName(String name) throws EvalException { @@ -476,7 +476,7 @@ } @Override - public SkylarkAspect aspect( + public StarlarkAspect aspect( StarlarkFunction implementation, Sequence<?> attributeAspects, Object attrs, @@ -542,9 +542,9 @@ } } } else if (!hasDefault) { // Implicit or late bound attribute - String skylarkName = "_" + nativeName.substring(1); + String starlarkName = "_" + nativeName.substring(1); throw new EvalException( - null, String.format("Aspect attribute '%s' has no default value.", skylarkName)); + null, String.format("Aspect attribute '%s' has no default value.", starlarkName)); } attributes.add(attribute); } @@ -559,7 +559,7 @@ Starlark.type(o))); } } - return new SkylarkDefinedAspect( + return new StarlarkDefinedAspect( implementation, attrAspects.build(), attributes.build(), @@ -579,17 +579,17 @@ * * <p>Exactly one of {@link #builder} or {@link #ruleClass} is null except inside {@link #export}. */ - public static final class SkylarkRuleFunction - implements StarlarkCallable, SkylarkExportable, RuleFunction { + public static final class StarlarkRuleFunction + implements StarlarkCallable, StarlarkExportable, RuleFunction { private RuleClass.Builder builder; private RuleClass ruleClass; private final RuleClassType type; private ImmutableList<Pair<String, StarlarkAttrModule.Descriptor>> attributes; private final Location definitionLocation; - private Label skylarkLabel; + private Label starlarkLabel; - public SkylarkRuleFunction( + public StarlarkRuleFunction( RuleClass.Builder builder, RuleClassType type, ImmutableList<Pair<String, StarlarkAttrModule.Descriptor>> attributes, @@ -601,18 +601,18 @@ } /** This is for post-export reconstruction for serialization. */ - private SkylarkRuleFunction( - RuleClass ruleClass, RuleClassType type, Location definitionLocation, Label skylarkLabel) { + private StarlarkRuleFunction( + RuleClass ruleClass, RuleClassType type, Location definitionLocation, Label starlarkLabel) { Preconditions.checkNotNull( ruleClass, - "RuleClass must be non-null as this SkylarkRuleFunction should have been exported."); + "RuleClass must be non-null as this StarlarkRuleFunction should have been exported."); Preconditions.checkNotNull( - skylarkLabel, - "Label must be non-null as this SkylarkRuleFunction should have been exported."); + starlarkLabel, + "Label must be non-null as this StarlarkRuleFunction should have been exported."); this.ruleClass = ruleClass; this.type = type; this.definitionLocation = definitionLocation; - this.skylarkLabel = skylarkLabel; + this.starlarkLabel = starlarkLabel; } @Override @@ -670,9 +670,9 @@ } /** Export a RuleFunction from a Starlark file with a given name. */ - public void export(Label skylarkLabel, String ruleClassName) throws EvalException { + public void export(Label starlarkLabel, String ruleClassName) throws EvalException { Preconditions.checkState(ruleClass == null && builder != null); - this.skylarkLabel = skylarkLabel; + this.starlarkLabel = starlarkLabel; if (type == RuleClassType.TEST != TargetUtils.isTestRuleName(ruleClassName)) { throw new EvalException( definitionLocation, @@ -755,7 +755,7 @@ } try { - this.ruleClass = builder.build(ruleClassName, skylarkLabel + "%" + ruleClassName); + this.ruleClass = builder.build(ruleClassName, starlarkLabel + "%" + ruleClassName); } catch (IllegalArgumentException | IllegalStateException ex) { throw new EvalException(getLocation(), ex); } @@ -771,7 +771,7 @@ @Override public boolean isExported() { - return skylarkLabel != null; + return starlarkLabel != null; } @Override
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleContext.java similarity index 98% rename from src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java rename to src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleContext.java index 008bdfd..b1f312c 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleContext.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkRuleContext.java
@@ -77,7 +77,7 @@ import com.google.devtools.build.lib.shell.ShellUtils; import com.google.devtools.build.lib.shell.ShellUtils.TokenizationException; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.syntax.ClassObject; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; @@ -112,7 +112,7 @@ * object and makes it impossible to accidentally use this object where it's not supposed to be used * (such attempts will result in {@link EvalException}s). */ -public final class SkylarkRuleContext implements SkylarkRuleContextApi<ConstraintValueInfo> { +public final class StarlarkRuleContext implements StarlarkRuleContextApi<ConstraintValueInfo> { public static final Function<Attribute, Object> ATTRIBUTE_VALUE_EXTRACTOR_FOR_ASPECT = new Function<Attribute, Object>() { @@ -150,13 +150,13 @@ private Outputs outputsObject; /** - * Creates a new SkylarkRuleContext using ruleContext. + * Creates a new StarlarkRuleContext using ruleContext. * * @param aspectDescriptor aspect for which the context is created, or <code>null</code> if it is * for a rule. * @throws InterruptedException */ - public SkylarkRuleContext( + public StarlarkRuleContext( RuleContext ruleContext, @Nullable AspectDescriptor aspectDescriptor, StarlarkSemantics starlarkSemantics) @@ -284,10 +284,10 @@ */ private static class Outputs implements ClassObject, StarlarkValue { private final Map<String, Object> outputs; - private final SkylarkRuleContext context; + private final StarlarkRuleContext context; private boolean executableCreated = false; - public Outputs(SkylarkRuleContext context) { + public Outputs(StarlarkRuleContext context) { this.outputs = new LinkedHashMap<>(); this.context = context; } @@ -474,7 +474,7 @@ return StructProvider.STRUCT.create( splitAttrInfos.build(), "No attribute '%s' in split_attr." - + " This attribute is not defined with a split configuration."); + + "This attribute is not defined with a split configuration."); } @Override @@ -602,13 +602,13 @@ "attempting to access 'build_setting_value' of non-build setting %s", ruleLabelCanonicalName)); } - ImmutableMap<Label, Object> skylarkFlagSettings = + ImmutableMap<Label, Object> starlarkFlagSettings = ruleContext.getConfiguration().getOptions().getStarlarkOptions(); Type<?> buildSettingType = ruleContext.getRule().getRuleClassObject().getBuildSetting().getType(); - if (skylarkFlagSettings.containsKey(ruleContext.getLabel())) { - return skylarkFlagSettings.get(ruleContext.getLabel()); + if (starlarkFlagSettings.containsKey(ruleContext.getLabel())) { + return starlarkFlagSettings.get(ruleContext.getLabel()); } else { return ruleContext .attributes() @@ -1113,7 +1113,7 @@ Depset.of(Artifact.TYPE, helper.getResolvedTools()), helper.getToolsRunfilesSuppliers()); } - public StarlarkSemantics getSkylarkSemantics() { + public StarlarkSemantics getStarlarkSemantics() { return starlarkSemantics; }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/CoverageCommon.java b/src/main/java/com/google/devtools/build/lib/analysis/test/CoverageCommon.java index d42cfab..7dc9c84 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/test/CoverageCommon.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/test/CoverageCommon.java
@@ -16,7 +16,7 @@ import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; import com.google.devtools.build.lib.analysis.test.InstrumentedFilesCollector.InstrumentationSpec; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; @@ -33,11 +33,11 @@ import javax.annotation.Nullable; /** Helper functions for Starlark to access coverage-related infrastructure. */ -public class CoverageCommon implements CoverageCommonApi<ConstraintValueInfo, SkylarkRuleContext> { +public class CoverageCommon implements CoverageCommonApi<ConstraintValueInfo, StarlarkRuleContext> { @Override public InstrumentedFilesInfoApi instrumentedFilesInfo( - SkylarkRuleContext skylarkRuleContext, + StarlarkRuleContext starlarkRuleContext, Sequence<?> sourceAttributes, // <String> Sequence<?> dependencyAttributes, // <String> Object extensions) @@ -46,7 +46,7 @@ extensions == Starlark.NONE ? null : Sequence.cast(extensions, String.class, "extensions"); return createInstrumentedFilesInfo( - skylarkRuleContext.getRuleContext(), + starlarkRuleContext.getRuleContext(), Sequence.cast(sourceAttributes, String.class, "source_attributes"), Sequence.cast(dependencyAttributes, String.class, "dependency_attributes"), extensionsList);
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryModule.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryModule.java index 629c068..6953144 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/skylark/SkylarkRepositoryModule.java
@@ -34,7 +34,7 @@ import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType; import com.google.devtools.build.lib.packages.RuleFactory.InvalidRuleException; -import com.google.devtools.build.lib.packages.SkylarkExportable; +import com.google.devtools.build.lib.packages.StarlarkExportable; import com.google.devtools.build.lib.packages.WorkspaceFactoryHelper; import com.google.devtools.build.lib.skylarkbuildapi.repository.RepositoryModuleApi; import com.google.devtools.build.lib.syntax.Dict; @@ -82,7 +82,7 @@ } builder.addAttribute(attr("$environ", STRING_LIST).defaultValue(environ).build()); BaseRuleClasses.nameAttribute(builder); - BaseRuleClasses.commonCoreAndSkylarkAttributes(builder); + BaseRuleClasses.commonCoreAndStarlarkAttributes(builder); builder.add(attr("expect_failure", STRING)); if (attrs != Starlark.NONE) { for (Map.Entry<String, Descriptor> attr : @@ -107,7 +107,8 @@ // RepositoryRuleFunction is the result of repository_rule(...). // It is a callable value; calling it yields a Rule instance. - private static final class RepositoryRuleFunction implements StarlarkCallable, SkylarkExportable { + private static final class RepositoryRuleFunction + implements StarlarkCallable, StarlarkExportable { private final RuleClass.Builder builder; private final StarlarkCallable implementation; private Label extensionLabel;
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java index 16252df..e5af00b 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
@@ -102,7 +102,7 @@ import com.google.devtools.build.lib.skylarkbuildapi.proto.ProtoBootstrap; import com.google.devtools.build.lib.skylarkbuildapi.python.PyBootstrap; import com.google.devtools.build.lib.skylarkbuildapi.stubs.ProviderStub; -import com.google.devtools.build.lib.skylarkbuildapi.stubs.SkylarkAspectStub; +import com.google.devtools.build.lib.skylarkbuildapi.stubs.StarlarkAspectStub; import com.google.devtools.build.lib.util.OS; import com.google.devtools.build.lib.util.ResourceFileLoader; import com.google.devtools.build.lib.vfs.PathFragment; @@ -259,7 +259,7 @@ new ProtoBootstrap( ProtoInfo.PROVIDER, BazelProtoCommon.INSTANCE, - new SkylarkAspectStub(), + new StarlarkAspectStub(), new ProviderStub()); builder.addSkylarkBootstrap(bootstrap); }
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java index 62002ec..e98aa88 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcModule.java
@@ -17,8 +17,8 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; import com.google.devtools.build.lib.analysis.skylark.StarlarkActionFactory; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; import com.google.devtools.build.lib.rules.cpp.CcCompilationContext; import com.google.devtools.build.lib.rules.cpp.CcCompilationOutputs; import com.google.devtools.build.lib.rules.cpp.CcLinkingContext; @@ -49,7 +49,7 @@ StarlarkActionFactory, Artifact, ConstraintValueInfo, - SkylarkRuleContext, + StarlarkRuleContext, CcToolchainProvider, FeatureConfigurationForStarlark, CcCompilationContext,
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java index 719dd09..f78c98e 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
@@ -117,10 +117,10 @@ @VisibleForSerialization @AutoCodec static class SkylarkRuleAspect extends RuleAspect<SkylarkAspectClass> { - private final SkylarkDefinedAspect aspect; + private final StarlarkDefinedAspect aspect; @VisibleForSerialization - SkylarkRuleAspect(SkylarkDefinedAspect aspect) { + SkylarkRuleAspect(StarlarkDefinedAspect aspect) { super(aspect.getAspectClass(), aspect.getDefaultParametersExtractor()); this.aspect = aspect; } @@ -1034,7 +1034,7 @@ @AutoCodec @AutoCodec.VisibleForSerialization static final Function<Rule, AspectParameters> EMPTY_FUNCTION = input -> AspectParameters.EMPTY; - public Builder<TYPE> aspect(SkylarkDefinedAspect skylarkAspect) throws EvalException { + public Builder<TYPE> aspect(StarlarkDefinedAspect skylarkAspect) throws EvalException { SkylarkRuleAspect skylarkRuleAspect = new SkylarkRuleAspect(skylarkAspect); RuleAspect<?> oldAspect = this.aspects.put(skylarkAspect.getName(), skylarkRuleAspect); if (oldAspect != null) {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java index 69011f4..4e2d9e3 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java +++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -628,7 +628,7 @@ */ private ClassObject newNativeModule() { ImmutableMap.Builder<String, Object> builder = new ImmutableMap.Builder<>(); - builder.putAll(SkylarkNativeModule.BINDINGS_FOR_BUILD_FILES); + builder.putAll(StarlarkNativeModule.BINDINGS_FOR_BUILD_FILES); builder.putAll(ruleFunctions); builder.put("package", newPackageFunction(packageArguments)); for (EnvironmentExtension ext : environmentExtensions) { @@ -640,7 +640,7 @@ private void populateEnvironment(ImmutableMap.Builder<String, Object> env) { env.putAll(Starlark.UNIVERSE); env.putAll(StarlarkLibrary.BUILD); // e.g. rule, select, depset - env.putAll(SkylarkNativeModule.BINDINGS_FOR_BUILD_FILES); + env.putAll(StarlarkNativeModule.BINDINGS_FOR_BUILD_FILES); env.put("package", newPackageFunction(packageArguments)); env.putAll(ruleFunctions);
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java b/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java index 0a3e140..37299e1 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java +++ b/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java
@@ -27,10 +27,10 @@ // only ComputedDefault attributes we expect to see for Starlark-defined rule classes are // those declared in those rule classes' natively defined base rule classes, which are: // - // 1. The "timeout" attribute in SkylarkRuleClassFunctions.testBaseRule - // 2. The "deprecation" attribute in BaseRuleClasses.commonCoreAndSkylarkAttributes - // 3. The "testonly" attribute in BaseRuleClasses.commonCoreAndSkylarkAttributes - private static final ImmutableSet<String> SKYLARK_RULE_CLASS_COMPUTED_DEFAULT_ATTRIBUTES = + // 1. The "timeout" attribute in StarlarkRuleClassFunctions.testBaseRule + // 2. The "deprecation" attribute in BaseRuleClasses.commonCoreAndStarlarkAttributes + // 3. The "testonly" attribute in BaseRuleClasses.commonCoreAndStarlarkAttributes + private static final ImmutableSet<String> STARLARK_RULE_CLASS_COMPUTED_DEFAULT_ATTRIBUTES = ImmutableSet.of("timeout", "deprecation", "testonly"); public static Build.Rule.Builder serializeRule(Rule rule) { @@ -40,9 +40,9 @@ builder.setPublicByDefault(rule.getRuleClassObject().isPublicByDefault()); RawAttributeMapper rawAttributeMapper = RawAttributeMapper.of(rule); - boolean isSkylark = rule.getRuleClassObject().isStarlark(); + boolean isStarlark = rule.getRuleClassObject().isStarlark(); - if (isSkylark) { + if (isStarlark) { builder.setSkylarkEnvironmentHashCode( // hexify BaseEncoding.base16() @@ -55,7 +55,7 @@ Object rawAttributeValue = rawAttributeMapper.getRawAttributeValue(rule, attr); boolean isExplicit = rule.isAttributeValueExplicitlySpecified(attr); - if (!isSkylark && !isExplicit) { + if (!isStarlark && !isExplicit) { // If the rule class is native (i.e. not Starlark-defined), then we can skip serialization // of implicit attribute values. The native rule class can provide the same default value // for the attribute after deserialization. @@ -66,11 +66,11 @@ if (isExplicit) { valueToSerialize = rawAttributeValue; } else if (rawAttributeValue instanceof ComputedDefault) { - // If the rule class is Starlark-defined (i.e. rule.getRuleClassObject().isSkylark() is + // If the rule class is Starlark-defined (i.e. rule.getRuleClassObject().isStarlark() is // true), and the attribute has a ComputedDefault value, then we must serialize what it // evaluates to. The Starlark-defined ComputedDefault function won't be available after // deserialization due to Starlark's non-serializability. - valueToSerialize = evaluateSkylarkComputedDefault(rawAttributeMapper, attr); + valueToSerialize = evaluateStarlarkComputedDefault(rawAttributeMapper, attr); if (valueToSerialize == null) { continue; } @@ -98,7 +98,7 @@ * <p>We can't serialize ComputedDefault attributes defined in Starlark, because those can depend * on other attributes which are configurable. * - * <p>For a few attributes ({@link #SKYLARK_RULE_CLASS_COMPUTED_DEFAULT_ATTRIBUTES}), we know for + * <p>For a few attributes ({@link #STARLARK_RULE_CLASS_COMPUTED_DEFAULT_ATTRIBUTES}), we know for * certain that they don't have dependencies on other attributes which are configurable, so they * can be evaluated here without loss of fidelity. * @@ -110,9 +110,9 @@ * otherwise. */ @Nullable - private static Object evaluateSkylarkComputedDefault( + private static Object evaluateStarlarkComputedDefault( RawAttributeMapper rawAttributeMapper, Attribute attr) { - if (SKYLARK_RULE_CLASS_COMPUTED_DEFAULT_ATTRIBUTES.contains(attr.getName())) { + if (STARLARK_RULE_CLASS_COMPUTED_DEFAULT_ATTRIBUTES.contains(attr.getName())) { return rawAttributeMapper.get(attr.getName(), attr.getType()); } return null;
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkAspect.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkAspect.java similarity index 91% rename from src/main/java/com/google/devtools/build/lib/packages/SkylarkAspect.java rename to src/main/java/com/google/devtools/build/lib/packages/StarlarkAspect.java index 5d1056e..5fb7bdd 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkAspect.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkAspect.java
@@ -15,11 +15,11 @@ package com.google.devtools.build.lib.packages; import com.google.common.collect.ImmutableSet; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkAspectApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkAspectApi; import com.google.devtools.build.lib.syntax.EvalException; /** Represents an aspect which can be attached to a Starlark-defined rule attribute. */ -public interface SkylarkAspect extends SkylarkAspectApi { +public interface StarlarkAspect extends StarlarkAspectApi { /** * Attaches this aspect to an attribute.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkDefinedAspect.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkDefinedAspect.java similarity index 98% rename from src/main/java/com/google/devtools/build/lib/packages/SkylarkDefinedAspect.java rename to src/main/java/com/google/devtools/build/lib/packages/StarlarkDefinedAspect.java index 9d6b5f0..7503394 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkDefinedAspect.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkDefinedAspect.java
@@ -32,7 +32,7 @@ /** A Starlark value that is a result of an 'aspect(..)' function call. */ @AutoCodec -public class SkylarkDefinedAspect implements SkylarkExportable, SkylarkAspect { +public class StarlarkDefinedAspect implements StarlarkExportable, StarlarkAspect { private final StarlarkCallable implementation; private final ImmutableList<String> attributeAspects; private final ImmutableList<Attribute> attributes; @@ -47,7 +47,7 @@ private SkylarkAspectClass aspectClass; - public SkylarkDefinedAspect( + public StarlarkDefinedAspect( StarlarkCallable implementation, ImmutableList<String> attributeAspects, ImmutableList<Attribute> attributes, @@ -76,7 +76,7 @@ /** Constructor for post export reconstruction for serialization. */ @VisibleForSerialization @AutoCodec.Instantiator - SkylarkDefinedAspect( + StarlarkDefinedAspect( StarlarkCallable implementation, ImmutableList<String> attributeAspects, ImmutableList<Attribute> attributes, @@ -251,7 +251,7 @@ if (o == null || getClass() != o.getClass()) { return false; } - SkylarkDefinedAspect that = (SkylarkDefinedAspect) o; + StarlarkDefinedAspect that = (StarlarkDefinedAspect) o; return Objects.equals(implementation, that.implementation) && Objects.equals(attributeAspects, that.attributeAspects) && Objects.equals(attributes, that.attributes)
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkExportable.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkExportable.java similarity index 95% rename from src/main/java/com/google/devtools/build/lib/packages/SkylarkExportable.java rename to src/main/java/com/google/devtools/build/lib/packages/StarlarkExportable.java index 41d8c39..58805bc 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkExportable.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkExportable.java
@@ -22,7 +22,7 @@ * {@link StarlarkValue}s that need special handling when they are exported from an extension file. * For example, rule definitions receive their name at the end of the execution of the .bzl file. */ -public interface SkylarkExportable extends StarlarkValue { +public interface StarlarkExportable extends StarlarkValue { /** * Is this value already exported?
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeAspect.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeAspect.java similarity index 92% rename from src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeAspect.java rename to src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeAspect.java index d64e1ca..114382c 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeAspect.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeAspect.java
@@ -18,7 +18,7 @@ import com.google.devtools.build.lib.syntax.Printer; /** A natively-defined aspect that is may be referenced by Starlark attribute definitions. */ -public abstract class SkylarkNativeAspect extends NativeAspectClass implements SkylarkAspect { +public abstract class StarlarkNativeAspect extends NativeAspectClass implements StarlarkAspect { @Override public void repr(Printer printer) { printer.append("<native aspect>");
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeModule.java similarity index 96% rename from src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java rename to src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeModule.java index 2d8d8ba..73e0375 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkNativeModule.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeModule.java
@@ -29,7 +29,7 @@ import com.google.devtools.build.lib.packages.PackageFactory.PackageContext; import com.google.devtools.build.lib.packages.RuleClass.Builder.ThirdPartyLicenseExistencePolicy; import com.google.devtools.build.lib.packages.Type.ConversionException; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkNativeModuleApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkNativeModuleApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.EvalUtils; @@ -53,7 +53,7 @@ /** The Starlark native module. */ // TODO(cparsons): Move the definition of native.package() to this class. -public class SkylarkNativeModule implements SkylarkNativeModuleApi { +public class StarlarkNativeModule implements StarlarkNativeModuleApi { /** * This map contains all the (non-rule) functions of the native module (keyed by their symbol @@ -68,7 +68,7 @@ private static ImmutableMap<String, Object> initializeBindings() { ImmutableMap.Builder<String, Object> bindings = ImmutableMap.builder(); - Starlark.addMethods(bindings, new SkylarkNativeModule()); + Starlark.addMethods(bindings, new StarlarkNativeModule()); return bindings.build(); } @@ -294,7 +294,7 @@ } try { - Object val = skylarkifyValue(mu, cont.getAttr(attr.getName()), target.getPackage()); + Object val = starlarkifyValue(mu, cont.getAttr(attr.getName()), target.getPackage()); if (val == null) { continue; } @@ -321,7 +321,7 @@ * @throws NotRepresentableException if an unknown type is encountered. */ @Nullable - private static Object skylarkifyValue(Mutability mu, Object val, Package pkg) + private static Object starlarkifyValue(Mutability mu, Object val, Package pkg) throws NotRepresentableException { if (val == null) { return null; @@ -358,7 +358,7 @@ if (val instanceof List) { List<Object> l = new ArrayList<>(); for (Object o : (List) val) { - Object elt = skylarkifyValue(mu, o, pkg); + Object elt = starlarkifyValue(mu, o, pkg); if (elt == null) { continue; } @@ -371,8 +371,8 @@ if (val instanceof Map) { Map<Object, Object> m = new TreeMap<>(); for (Map.Entry<?, ?> e : ((Map<?, ?>) val).entrySet()) { - Object key = skylarkifyValue(mu, e.getKey(), pkg); - Object mapVal = skylarkifyValue(mu, e.getValue(), pkg); + Object key = starlarkifyValue(mu, e.getKey(), pkg); + Object mapVal = starlarkifyValue(mu, e.getValue(), pkg); if (key == null || mapVal == null) { continue;
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkProvider.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkProvider.java index 8afc571..ebf530d 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkProvider.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkProvider.java
@@ -43,7 +43,7 @@ * pre-exported provider directly. Exported providers use only their key for {@link #equals} and * {@link #hashCode}. */ -public final class StarlarkProvider implements StarlarkCallable, SkylarkExportable, Provider { +public final class StarlarkProvider implements StarlarkCallable, StarlarkExportable, Provider { /** Default value for {@link #errorMessageFormatForUnknownField}. */ private static final String DEFAULT_ERROR_MESSAGE_FORMAT = "Object has no '%s' attribute.";
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java index 7771bf1..b4fad81 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java +++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
@@ -383,7 +383,7 @@ private static ClassObject newNativeModule( ImmutableMap<String, Object> workspaceFunctions, String version) { ImmutableMap.Builder<String, Object> env = new ImmutableMap.Builder<>(); - Starlark.addMethods(env, new SkylarkNativeModule()); + Starlark.addMethods(env, new StarlarkNativeModule()); for (Map.Entry<String, Object> entry : workspaceFunctions.entrySet()) { String name = entry.getKey(); if (name.startsWith("$")) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java index b967a20..003708f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -34,7 +34,7 @@ import com.google.devtools.build.lib.analysis.actions.FileWriteAction; import com.google.devtools.build.lib.analysis.config.CompilationMode; import com.google.devtools.build.lib.analysis.platform.ToolchainInfo; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; import com.google.devtools.build.lib.analysis.stringtemplate.ExpansionException; import com.google.devtools.build.lib.analysis.test.InstrumentedFilesCollector; import com.google.devtools.build.lib.analysis.test.InstrumentedFilesCollector.LocalMetadataCollector; @@ -200,9 +200,9 @@ return mergedOutputGroups; } - public static void checkRuleWhitelisted(SkylarkRuleContext skylarkRuleContext) + public static void checkRuleWhitelisted(StarlarkRuleContext starlarkRuleContext) throws EvalException, InterruptedException { - RuleContext context = skylarkRuleContext.getRuleContext(); + RuleContext context = starlarkRuleContext.getRuleContext(); Rule rule = context.getRule(); RuleClass ruleClass = rule.getRuleClassObject();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java index faa0a88..a56448c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcModule.java
@@ -28,8 +28,8 @@ import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo; import com.google.devtools.build.lib.analysis.platform.ToolchainInfo; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; import com.google.devtools.build.lib.analysis.skylark.StarlarkActionFactory; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.collect.nestedset.Depset; @@ -96,7 +96,7 @@ LibraryToLink, CcToolchainVariables, ConstraintValueInfo, - SkylarkRuleContext, + StarlarkRuleContext, CcToolchainConfigInfo, CcCompilationOutputs> { @@ -134,7 +134,7 @@ Sequence<?> requestedFeatures, // <String> expected Sequence<?> unsupportedFeatures) throws EvalException { - SkylarkRuleContext ruleContext = nullIfNone(ruleContextOrNone, SkylarkRuleContext.class); + StarlarkRuleContext ruleContext = nullIfNone(ruleContextOrNone, StarlarkRuleContext.class); ImmutableSet<String> unsupportedFeaturesSet = ImmutableSet.copyOf( Sequence.cast(unsupportedFeatures, String.class, "unsupported_features")); @@ -767,7 +767,7 @@ @Override public CcToolchainConfigInfo ccToolchainConfigInfoFromSkylark( - SkylarkRuleContext skylarkRuleContext, + StarlarkRuleContext starlarkRuleContext, Sequence<?> features, // <SkylarkInfo> expected Sequence<?> actionConfigs, // <SkylarkInfo> expected Sequence<?> artifactNamePatterns, // <SkylarkInfo> expected @@ -842,13 +842,13 @@ if (tool.first.equals(CppConfiguration.Tool.GCC.getNamePart())) { gccToolPath = tool.second; linkerToolPath = - skylarkRuleContext + starlarkRuleContext .getRuleContext() .getLabel() .getPackageIdentifier() .getExecPath( - skylarkRuleContext - .getSkylarkSemantics() + starlarkRuleContext + .getStarlarkSemantics() .experimentalSiblingRepositoryLayout()) .getRelative(PathFragment.create(tool.second)) .getPathString(); @@ -899,7 +899,7 @@ linkerToolPath, /* supportsEmbeddedRuntimes= */ false, /* supportsInterfaceSharedLibraries= */ false, - skylarkRuleContext.getSkylarkSemantics().incompatibleDoNotSplitLinkingCmdline())) { + starlarkRuleContext.getStarlarkSemantics().incompatibleDoNotSplitLinkingCmdline())) { legacyFeaturesBuilder.add(new Feature(feature)); } legacyFeaturesBuilder.addAll( @@ -910,7 +910,7 @@ for (CToolchain.Feature feature : CppActionConfigs.getFeaturesToAppearLastInFeaturesList( featureNames, - skylarkRuleContext.getSkylarkSemantics().incompatibleDoNotSplitLinkingCmdline())) { + starlarkRuleContext.getStarlarkSemantics().incompatibleDoNotSplitLinkingCmdline())) { legacyFeaturesBuilder.add(new Feature(feature)); } @@ -1508,8 +1508,8 @@ } @Override - public boolean isCcToolchainResolutionEnabled(SkylarkRuleContext skylarkRuleContext) { - return CppHelper.useToolchainResolution(skylarkRuleContext.getRuleContext()); + public boolean isCcToolchainResolutionEnabled(StarlarkRuleContext starlarkRuleContext) { + return CppHelper.useToolchainResolution(starlarkRuleContext.getRuleContext()); } @Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/GoogleLegacyStubs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/GoogleLegacyStubs.java index 041dd85..5a06dc9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/GoogleLegacyStubs.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/GoogleLegacyStubs.java
@@ -17,7 +17,7 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.RunfilesApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcCompilationContextApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcInfoApi; @@ -54,7 +54,7 @@ implements WrapCcHelperApi< FeatureConfigurationApi, ConstraintValueInfoApi, - SkylarkRuleContextApi<ConstraintValueInfoApi>, + StarlarkRuleContextApi<ConstraintValueInfoApi>, CcToolchainProviderApi<FeatureConfigurationApi>, CompilationInfoApi<FileApi>, FileApi, @@ -63,7 +63,7 @@ @Override public FeatureConfigurationApi skylarkGetFeatureConfiguration( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, CcToolchainProviderApi<FeatureConfigurationApi> ccToolchain) throws EvalException, InterruptedException { return null; @@ -71,13 +71,13 @@ @Override public Depset skylarkCollectTransitiveSwigIncludes( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) { + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) { return null; } @Override public CompilationInfoApi<FileApi> skylarkCreateCompileActions( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, FeatureConfigurationApi featureConfiguration, CcToolchainProviderApi<FeatureConfigurationApi> ccToolchain, FileApi ccFile, @@ -90,21 +90,21 @@ @Override public String skylarkGetMangledTargetName( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) throws EvalException, InterruptedException { return null; } @Override public WrapCcIncludeProviderApi getWrapCcIncludeProvider( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, Depset swigIncludes) + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, Depset swigIncludes) throws EvalException, InterruptedException { return null; } @Override public void registerSwigAction( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, CcToolchainProviderApi<FeatureConfigurationApi> ccToolchain, FeatureConfigurationApi featureConfiguration, CcCompilationContextApi<FileApi> wrapperCcCompilationContext, @@ -130,7 +130,7 @@ implements PyWrapCcHelperApi< FileApi, ConstraintValueInfoApi, - SkylarkRuleContextApi<ConstraintValueInfoApi>, + StarlarkRuleContextApi<ConstraintValueInfoApi>, CcInfoApi<FileApi>, FeatureConfigurationApi, CcToolchainProviderApi<FeatureConfigurationApi>, @@ -140,25 +140,25 @@ @Override public Sequence<String> getPyExtensionLinkopts( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) { + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) { return null; } @Override public Depset getTransitivePythonSources( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, FileApi pyFile) { + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, FileApi pyFile) { return null; } @Override public RunfilesApi getPythonRunfiles( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, Depset filesToBuild) { + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, Depset filesToBuild) { return null; } @Override public PyWrapCcInfoApi<FileApi> getPyWrapCcInfo( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, CcInfoApi<FileApi> ccInfo) { return null; } @@ -172,7 +172,7 @@ implements GoWrapCcHelperApi< FileApi, ConstraintValueInfoApi, - SkylarkRuleContextApi<ConstraintValueInfoApi>, + StarlarkRuleContextApi<ConstraintValueInfoApi>, CcInfoApi<FileApi>, FeatureConfigurationApi, CcToolchainProviderApi<FeatureConfigurationApi>, @@ -186,7 +186,7 @@ @Override public RunfilesApi skylarkGetGoRunfiles( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) { + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) { return null; } @@ -197,7 +197,7 @@ @Override public GoContextInfoApi skylarkCollectTransitiveGoContextGopkg( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, FileApi export, FileApi pkg, FileApi gopkg, @@ -208,21 +208,21 @@ @Override public GoWrapCcInfoApi<FileApi> getGoWrapCcInfo( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, CcInfoApi<FileApi> ccInfo) { return null; } @Override public GoCcLinkParamsInfoApi getGoCcLinkParamsProvider( - SkylarkRuleContextApi<ConstraintValueInfoApi> ruleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> ruleContext, CcLinkingContextApi<FileApi> ccLinkingContext) { return null; } @Override public Tuple<FileApi> createGoCompileActions( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, CcToolchainProviderApi<FeatureConfigurationApi> ccToolchainProvider, Sequence<?> srcs, // <FileApi> Sequence<?> deps /* <TransitiveInfoCollectionApi> */) { @@ -231,7 +231,7 @@ @Override public Tuple<FileApi> createGoCompileActionsGopkg( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, CcToolchainProviderApi<FeatureConfigurationApi> ccToolchainProvider, Sequence<?> srcs, // <FileApi> Sequence<?> deps /* <TransitiveInfoCollectionApi> */) { @@ -240,7 +240,7 @@ @Override public GoPackageInfoApi createTransitiveGopackageInfo( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, FileApi skylarkGopkg, FileApi export, FileApi swigOutGo) { @@ -249,7 +249,7 @@ @Override public Depset /*<FileApi>*/ getGopackageFilesForStarlark( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, FileApi skylarkGopkg) { + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, FileApi skylarkGopkg) { return null; } }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java index fbc4e7a..8b5d8dd 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfoBuildHelper.java
@@ -31,8 +31,8 @@ import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.analysis.config.CoreOptionConverters.StrictDepsMode; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; import com.google.devtools.build.lib.analysis.skylark.StarlarkActionFactory; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; @@ -216,7 +216,7 @@ } public JavaInfo createJavaCompileAction( - SkylarkRuleContext skylarkRuleContext, + StarlarkRuleContext starlarkRuleContext, List<Artifact> sourceJars, List<Artifact> sourceFiles, Artifact outputJar, @@ -250,7 +250,7 @@ JavaToolchainProvider toolchainProvider = javaToolchain; JavaLibraryHelper helper = - new JavaLibraryHelper(skylarkRuleContext.getRuleContext()) + new JavaLibraryHelper(starlarkRuleContext.getRuleContext()) .setOutput(outputJar) .addSourceJars(sourceJars) .addSourceFiles(sourceFiles) @@ -259,13 +259,13 @@ .addAdditionalOutputs(annotationProcessorAdditionalOutputs) .setJavacOpts( ImmutableList.<String>builder() - .addAll(toolchainProvider.getJavacOptions(skylarkRuleContext.getRuleContext())) + .addAll(toolchainProvider.getJavacOptions(starlarkRuleContext.getRuleContext())) .addAll( javaSemantics.getCompatibleJavacOptions( - skylarkRuleContext.getRuleContext(), toolchainProvider)) + starlarkRuleContext.getRuleContext(), toolchainProvider)) .addAll( JavaCommon.computePerPackageJavacOpts( - skylarkRuleContext.getRuleContext(), toolchainProvider)) + starlarkRuleContext.getRuleContext(), toolchainProvider)) .addAll(tokenize(javacOpts)) .build()); @@ -284,7 +284,7 @@ JavaRuleOutputJarsProvider.Builder outputJarsBuilder = JavaRuleOutputJarsProvider.builder(); if (outputSourceJar == null) { - outputSourceJar = getDerivedSourceJar(skylarkRuleContext.getRuleContext(), outputJar); + outputSourceJar = getDerivedSourceJar(starlarkRuleContext.getRuleContext(), outputJar); } JavaInfo.Builder javaInfoBuilder = JavaInfo.Builder.create(); @@ -306,7 +306,7 @@ JavaCompilationArgsProvider javaCompilationArgsProvider = helper.buildCompilationArgsProvider(artifacts, true, neverlink); Runfiles runfiles = - new Runfiles.Builder(skylarkRuleContext.getWorkspaceName()) + new Runfiles.Builder(starlarkRuleContext.getWorkspaceName()) .addTransitiveArtifactsWrappedInStableOrder( javaCompilationArgsProvider.getRuntimeJars()) .build();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java index 5078669..a82e8f4 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java
@@ -18,8 +18,8 @@ import com.google.devtools.build.lib.analysis.PlatformOptions; import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo; import com.google.devtools.build.lib.analysis.platform.ToolchainInfo; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; import com.google.devtools.build.lib.analysis.skylark.StarlarkActionFactory; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.packages.Provider; @@ -39,7 +39,7 @@ JavaToolchainProvider, JavaRuntimeInfo, ConstraintValueInfo, - SkylarkRuleContext, + StarlarkRuleContext, StarlarkActionFactory> { private final JavaSemantics javaSemantics; @@ -54,7 +54,7 @@ @Override public JavaInfo createJavaCompileAction( - SkylarkRuleContext skylarkRuleContext, + StarlarkRuleContext starlarkRuleContext, Sequence<?> sourceJars, // <Artifact> expected Sequence<?> sourceFiles, // <Artifact> expected Artifact outputJar, @@ -78,7 +78,7 @@ return JavaInfoBuildHelper.getInstance() .createJavaCompileAction( - skylarkRuleContext, + starlarkRuleContext, Sequence.cast(sourceJars, Artifact.class, "source_jars"), Sequence.cast(sourceFiles, Artifact.class, "source_files"), outputJar, @@ -190,7 +190,7 @@ } @Override - public boolean isJavaToolchainResolutionEnabled(SkylarkRuleContext ruleContext) + public boolean isJavaToolchainResolutionEnabled(StarlarkRuleContext ruleContext) throws EvalException { return ruleContext .getConfiguration()
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java index db1c4c8..324b5f9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java
@@ -21,7 +21,7 @@ import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider; import com.google.devtools.build.lib.rules.java.JavaInfo; import com.google.devtools.build.lib.rules.proto.ProtoCompileActionBuilder; @@ -35,10 +35,10 @@ /** A class that exposes Java common methods for proto compilation. */ public class JavaProtoSkylarkCommon implements JavaProtoCommonApi< - Artifact, ConstraintValueInfo, SkylarkRuleContext, ConfiguredTarget> { + Artifact, ConstraintValueInfo, StarlarkRuleContext, ConfiguredTarget> { @Override public void createProtoCompileAction( - SkylarkRuleContext skylarkRuleContext, + StarlarkRuleContext starlarkRuleContext, ConfiguredTarget target, Artifact sourceJar, String protoToolchainAttr, @@ -46,14 +46,14 @@ throws EvalException, InterruptedException { ProtoInfo protoInfo = target.get(ProtoInfo.PROVIDER); ProtoCompileActionBuilder.registerActions( - skylarkRuleContext.getRuleContext(), + starlarkRuleContext.getRuleContext(), ImmutableList.of( new ProtoCompileActionBuilder.ToolchainInvocation( flavour, - getProtoToolchainProvider(skylarkRuleContext, protoToolchainAttr), + getProtoToolchainProvider(starlarkRuleContext, protoToolchainAttr), sourceJar.getExecPathString())), protoInfo, - skylarkRuleContext.getLabel(), + starlarkRuleContext.getLabel(), ImmutableList.of(sourceJar), "JavaLite", Exports.DO_NOT_USE, @@ -67,9 +67,9 @@ @Override public JavaInfo getRuntimeToolchainProvider( - SkylarkRuleContext skylarkRuleContext, String protoToolchainAttr) throws EvalException { + StarlarkRuleContext starlarkRuleContext, String protoToolchainAttr) throws EvalException { TransitiveInfoCollection runtime = - getProtoToolchainProvider(skylarkRuleContext, protoToolchainAttr).runtime(); + getProtoToolchainProvider(starlarkRuleContext, protoToolchainAttr).runtime(); return JavaInfo.Builder.create() .addProvider( JavaCompilationArgsProvider.class, @@ -78,9 +78,9 @@ } private static ProtoLangToolchainProvider getProtoToolchainProvider( - SkylarkRuleContext skylarkRuleContext, String protoToolchainAttr) throws EvalException { + StarlarkRuleContext starlarkRuleContext, String protoToolchainAttr) throws EvalException { ConfiguredTarget javaliteToolchain = - (ConfiguredTarget) checkNotNull(skylarkRuleContext.getAttr().getValue(protoToolchainAttr)); + (ConfiguredTarget) checkNotNull(starlarkRuleContext.getAttr().getValue(protoToolchainAttr)); return checkNotNull(javaliteToolchain.getProvider(ProtoLangToolchainProvider.class)); } }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleSkylarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleSkylarkCommon.java index 624ebd2..3eabadb 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleSkylarkCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleSkylarkCommon.java
@@ -22,14 +22,14 @@ import com.google.devtools.build.lib.actions.MutableActionGraph.ActionConflictException; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.platform.ConstraintValueInfo; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.packages.NativeProvider; import com.google.devtools.build.lib.packages.Provider; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; -import com.google.devtools.build.lib.packages.SkylarkAspect; import com.google.devtools.build.lib.packages.SkylarkInfo; +import com.google.devtools.build.lib.packages.StarlarkAspect; import com.google.devtools.build.lib.packages.StructImpl; import com.google.devtools.build.lib.rules.apple.AppleConfiguration; import com.google.devtools.build.lib.rules.apple.ApplePlatform; @@ -57,7 +57,7 @@ implements AppleCommonApi< Artifact, ConstraintValueInfo, - SkylarkRuleContext, + StarlarkRuleContext, ObjcProvider, XcodeConfigInfo, ApplePlatform> { @@ -229,13 +229,13 @@ @Override public StructImpl linkMultiArchBinary( - SkylarkRuleContext skylarkRuleContext, + StarlarkRuleContext starlarkRuleContext, Sequence<?> extraLinkopts, Sequence<?> extraLinkInputs, StarlarkThread thread) throws EvalException, InterruptedException { try { - RuleContext ruleContext = skylarkRuleContext.getRuleContext(); + RuleContext ruleContext = starlarkRuleContext.getRuleContext(); AppleBinaryOutput appleBinaryOutput = AppleBinary.linkMultiArchBinary( ruleContext, @@ -257,7 +257,7 @@ } @Override - public SkylarkAspect getObjcProtoAspect() { + public StarlarkAspect getObjcProtoAspect() { return objcProtoAspect; }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspect.java index fceff47..c6969e3 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoAspect.java
@@ -27,7 +27,7 @@ import com.google.devtools.build.lib.packages.AspectDefinition; import com.google.devtools.build.lib.packages.AspectParameters; import com.google.devtools.build.lib.packages.BuildType; -import com.google.devtools.build.lib.packages.SkylarkNativeAspect; +import com.google.devtools.build.lib.packages.StarlarkNativeAspect; import com.google.devtools.build.lib.rules.cpp.CcCompilationContext; import com.google.devtools.build.lib.rules.cpp.CcInfo; import com.google.devtools.build.lib.rules.proto.ProtoInfo; @@ -39,7 +39,7 @@ * Aspect that gathers the proto dependencies of the attached rule target, and propagates the proto * values of its dependencies through the ObjcProtoProvider. */ -public class ObjcProtoAspect extends SkylarkNativeAspect implements ConfiguredAspectFactory { +public class ObjcProtoAspect extends StarlarkNativeAspect implements ConfiguredAspectFactory { public static final String NAME = "ObjcProtoAspect"; @Override
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java index 53e52d0..8c5d7ec 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
@@ -55,9 +55,9 @@ import com.google.devtools.build.lib.packages.OutputFile; import com.google.devtools.build.lib.packages.Package; import com.google.devtools.build.lib.packages.RuleClassProvider; -import com.google.devtools.build.lib.packages.SkylarkAspect; import com.google.devtools.build.lib.packages.SkylarkAspectClass; -import com.google.devtools.build.lib.packages.SkylarkDefinedAspect; +import com.google.devtools.build.lib.packages.StarlarkAspect; +import com.google.devtools.build.lib.packages.StarlarkDefinedAspect; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.packages.Type.ConversionException; import com.google.devtools.build.lib.profiler.memory.CurrentRuleTracker; @@ -121,26 +121,26 @@ * Load Starlark-defined aspect from an extension file. Is to be called from a SkyFunction. * * @return {@code null} if dependencies cannot be satisfied. - * @throws AspectCreationException if the value loaded is not a {@link SkylarkDefinedAspect}. + * @throws AspectCreationException if the value loaded is not a {@link StarlarkDefinedAspect}. */ @Nullable - static SkylarkDefinedAspect loadSkylarkDefinedAspect( - Environment env, SkylarkAspectClass skylarkAspectClass) + static StarlarkDefinedAspect loadStarlarkDefinedAspect( + Environment env, SkylarkAspectClass starlarkAspectClass) throws AspectCreationException, InterruptedException { - Label extensionLabel = skylarkAspectClass.getExtensionLabel(); - String skylarkValueName = skylarkAspectClass.getExportedName(); + Label extensionLabel = starlarkAspectClass.getExtensionLabel(); + String starlarkValueName = starlarkAspectClass.getExportedName(); - SkylarkAspect skylarkAspect = loadSkylarkAspect(env, extensionLabel, skylarkValueName); - if (skylarkAspect == null) { + StarlarkAspect starlarkAspect = loadStarlarkAspect(env, extensionLabel, starlarkValueName); + if (starlarkAspect == null) { return null; } - if (!(skylarkAspect instanceof SkylarkDefinedAspect)) { + if (!(starlarkAspect instanceof StarlarkDefinedAspect)) { throw new AspectCreationException( String.format( - "%s from %s is not a Starlark-defined aspect", skylarkValueName, extensionLabel), + "%s from %s is not a Starlark-defined aspect", starlarkValueName, extensionLabel), extensionLabel); } else { - return (SkylarkDefinedAspect) skylarkAspect; + return (StarlarkDefinedAspect) starlarkAspect; } } @@ -150,8 +150,8 @@ * @return {@code null} if dependencies cannot be satisfied. */ @Nullable - static SkylarkAspect loadSkylarkAspect( - Environment env, Label extensionLabel, String skylarkValueName) + static StarlarkAspect loadStarlarkAspect( + Environment env, Label extensionLabel, String starlarkValueName) throws AspectCreationException, InterruptedException { SkyKey importFileKey = StarlarkImportLookupValue.key(extensionLabel); try { @@ -164,19 +164,19 @@ return null; } - Object skylarkValue = - starlarkImportLookupValue.getModule().getBindings().get(skylarkValueName); - if (skylarkValue == null) { + Object starlarkValue = + starlarkImportLookupValue.getModule().getBindings().get(starlarkValueName); + if (starlarkValue == null) { throw new ConversionException( String.format( - "%s is not exported from %s", skylarkValueName, extensionLabel.toString())); + "%s is not exported from %s", starlarkValueName, extensionLabel.toString())); } - if (!(skylarkValue instanceof SkylarkAspect)) { + if (!(starlarkValue instanceof StarlarkAspect)) { throw new ConversionException( String.format( - "%s from %s is not an aspect", skylarkValueName, extensionLabel.toString())); + "%s from %s is not an aspect", starlarkValueName, extensionLabel.toString())); } - return (SkylarkAspect) skylarkValue; + return (StarlarkAspect) starlarkValue; } catch (StarlarkImportFailedException | ConversionException e) { env.getListener().handle(Event.error(e.getMessage())); throw new AspectCreationException(e.getMessage(), extensionLabel); @@ -197,22 +197,23 @@ aspectFactory = (ConfiguredAspectFactory) nativeAspectClass; aspect = Aspect.forNative(nativeAspectClass, key.getParameters()); } else if (key.getAspectClass() instanceof SkylarkAspectClass) { - SkylarkAspectClass skylarkAspectClass = (SkylarkAspectClass) key.getAspectClass(); - SkylarkDefinedAspect skylarkAspect; + SkylarkAspectClass starlarkAspectClass = (SkylarkAspectClass) key.getAspectClass(); + StarlarkDefinedAspect starlarkAspect; try { - skylarkAspect = loadSkylarkDefinedAspect(env, skylarkAspectClass); + starlarkAspect = loadStarlarkDefinedAspect(env, starlarkAspectClass); } catch (AspectCreationException e) { throw new AspectFunctionException(e); } - if (skylarkAspect == null) { + if (starlarkAspect == null) { return null; } - aspectFactory = new SkylarkAspectFactory(skylarkAspect); - aspect = Aspect.forSkylark( - skylarkAspect.getAspectClass(), - skylarkAspect.getDefinition(key.getParameters()), - key.getParameters()); + aspectFactory = new SkylarkAspectFactory(starlarkAspect); + aspect = + Aspect.forSkylark( + starlarkAspect.getAspectClass(), + starlarkAspect.getDefinition(key.getParameters()), + key.getParameters()); } else { throw new IllegalStateException(); }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java index 1ef5f9d..6c642c5 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java
@@ -22,14 +22,14 @@ import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.StarlarkProviderValidationUtil; import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleConfiguredTargetUtil; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.packages.AspectDescriptor; import com.google.devtools.build.lib.packages.AspectParameters; import com.google.devtools.build.lib.packages.BazelStarlarkContext; import com.google.devtools.build.lib.packages.Info; import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; -import com.google.devtools.build.lib.packages.SkylarkDefinedAspect; +import com.google.devtools.build.lib.packages.StarlarkDefinedAspect; import com.google.devtools.build.lib.packages.StructImpl; import com.google.devtools.build.lib.packages.StructProvider; import com.google.devtools.build.lib.packages.Target; @@ -44,9 +44,9 @@ /** A factory for aspects that are defined in Starlark. */ public class SkylarkAspectFactory implements ConfiguredAspectFactory { - private final SkylarkDefinedAspect skylarkAspect; + private final StarlarkDefinedAspect skylarkAspect; - SkylarkAspectFactory(SkylarkDefinedAspect skylarkAspect) { + SkylarkAspectFactory(StarlarkDefinedAspect skylarkAspect) { this.skylarkAspect = skylarkAspect; } @@ -57,14 +57,14 @@ AspectParameters parameters, String toolsRepository) throws InterruptedException, ActionConflictException { - SkylarkRuleContext skylarkRuleContext = null; + StarlarkRuleContext starlarkRuleContext = null; try (Mutability mutability = Mutability.create("aspect")) { AspectDescriptor aspectDescriptor = new AspectDescriptor(skylarkAspect.getAspectClass(), parameters); AnalysisEnvironment analysisEnv = ruleContext.getAnalysisEnvironment(); try { - skylarkRuleContext = - new SkylarkRuleContext( + starlarkRuleContext = + new StarlarkRuleContext( ruleContext, aspectDescriptor, analysisEnv.getSkylarkSemantics()); } catch (EvalException | RuleErrorException e) { ruleContext.ruleError(e.getMessage()); @@ -91,7 +91,7 @@ Starlark.call( thread, skylarkAspect.getImplementation(), - /*args=*/ ImmutableList.of(ctadBase.getConfiguredTarget(), skylarkRuleContext), + /*args=*/ ImmutableList.of(ctadBase.getConfiguredTarget(), starlarkRuleContext), /*kwargs=*/ ImmutableMap.of()); // If allowing analysis failures, targets should be created somewhat normally, and errors @@ -117,8 +117,8 @@ return null; } } finally { - if (skylarkRuleContext != null) { - skylarkRuleContext.nullify(); + if (starlarkRuleContext != null) { + starlarkRuleContext.nullify(); } } }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkImportLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkImportLookupFunction.java index 9ff308f..a3fd8f7 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkImportLookupFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkImportLookupFunction.java
@@ -39,7 +39,7 @@ import com.google.devtools.build.lib.packages.BuildFileNotFoundException; import com.google.devtools.build.lib.packages.PackageFactory; import com.google.devtools.build.lib.packages.RuleClassProvider; -import com.google.devtools.build.lib.packages.SkylarkExportable; +import com.google.devtools.build.lib.packages.StarlarkExportable; import com.google.devtools.build.lib.packages.WorkspaceFileValue; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.EvalUtils; @@ -717,8 +717,8 @@ // TODO(adonovan): change the semantics; see b/65374671. thread.setPostAssignHook( (name, value) -> { - if (value instanceof SkylarkExportable) { - SkylarkExportable exp = (SkylarkExportable) value; + if (value instanceof StarlarkExportable) { + StarlarkExportable exp = (StarlarkExportable) value; if (!exp.isExported()) { try { exp.export(extensionLabel, name);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelSkylarkAspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelSkylarkAspectFunction.java index d41147e..bfe5c2e 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelSkylarkAspectFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelSkylarkAspectFunction.java
@@ -16,7 +16,7 @@ import com.google.devtools.build.lib.causes.LabelCause; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.packages.SkylarkAspect; +import com.google.devtools.build.lib.packages.StarlarkAspect; import com.google.devtools.build.lib.skyframe.AspectValueKey.SkylarkAspectLoadingKey; import com.google.devtools.build.skyframe.SkyFunction; import com.google.devtools.build.skyframe.SkyFunctionException; @@ -42,9 +42,9 @@ String skylarkValueName = aspectLoadingKey.getSkylarkValueName(); Label skylarkFileLabel = aspectLoadingKey.getSkylarkFileLabel(); - SkylarkAspect skylarkAspect; + StarlarkAspect skylarkAspect; try { - skylarkAspect = AspectFunction.loadSkylarkAspect(env, skylarkFileLabel, skylarkValueName); + skylarkAspect = AspectFunction.loadStarlarkAspect(env, skylarkFileLabel, skylarkValueName); if (skylarkAspect == null) { return null; }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkAspectApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAspectApi.java similarity index 95% rename from src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkAspectApi.java rename to src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAspectApi.java index 1601706..969a78d 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkAspectApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAspectApi.java
@@ -26,4 +26,4 @@ "For more information about Aspects, please consult the <a href=\"globals.html#aspect\">" + "documentation of the aspect function</a> or the " + "<a href=\"../aspects.md\">introduction to Aspects</a>.") -public interface SkylarkAspectApi extends StarlarkValue {} +public interface StarlarkAspectApi extends StarlarkValue {}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttrModuleApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttrModuleApi.java index c86bd32..b626eaa 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttrModuleApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttrModuleApi.java
@@ -348,7 +348,7 @@ @Param( name = ASPECTS_ARG, type = Sequence.class, - generic1 = SkylarkAspectApi.class, + generic1 = StarlarkAspectApi.class, defaultValue = "[]", named = true, positional = false, @@ -556,7 +556,7 @@ @Param( name = ASPECTS_ARG, type = Sequence.class, - generic1 = SkylarkAspectApi.class, + generic1 = StarlarkAspectApi.class, defaultValue = "[]", named = true, positional = false, @@ -670,7 +670,7 @@ @Param( name = ASPECTS_ARG, type = Sequence.class, - generic1 = SkylarkAspectApi.class, + generic1 = StarlarkAspectApi.class, defaultValue = "[]", named = true, positional = false,
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttributesCollectionApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttributesCollectionApi.java index 624c7df..040adb8 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttributesCollectionApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkAttributesCollectionApi.java
@@ -28,19 +28,19 @@ doc = "Information about attributes of a rule an aspect is applied to.") public interface StarlarkAttributesCollectionApi extends StarlarkValue { - @SkylarkCallable(name = "attr", structField = true, doc = SkylarkRuleContextApi.ATTR_DOC) + @SkylarkCallable(name = "attr", structField = true, doc = StarlarkRuleContextApi.ATTR_DOC) StructApi getAttr() throws EvalException; @SkylarkCallable( name = "executable", structField = true, - doc = SkylarkRuleContextApi.EXECUTABLE_DOC) + doc = StarlarkRuleContextApi.EXECUTABLE_DOC) StructApi getExecutable() throws EvalException; - @SkylarkCallable(name = "file", structField = true, doc = SkylarkRuleContextApi.FILE_DOC) + @SkylarkCallable(name = "file", structField = true, doc = StarlarkRuleContextApi.FILE_DOC) StructApi getFile() throws EvalException; - @SkylarkCallable(name = "files", structField = true, doc = SkylarkRuleContextApi.FILES_DOC) + @SkylarkCallable(name = "files", structField = true, doc = StarlarkRuleContextApi.FILES_DOC) StructApi getFiles() throws EvalException; @SkylarkCallable(
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkNativeModuleApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkNativeModuleApi.java similarity index 99% rename from src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkNativeModuleApi.java rename to src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkNativeModuleApi.java index 643f1da..ad4e134 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkNativeModuleApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkNativeModuleApi.java
@@ -37,7 +37,7 @@ + "(i.e. for macros, not for rule implementations). Attributes will ignore " + "<code>None</code> values, and treat them as if the attribute was unset.<br>" + "The following functions are also available:") -public interface SkylarkNativeModuleApi extends StarlarkValue { +public interface StarlarkNativeModuleApi extends StarlarkValue { @SkylarkCallable( name = "glob",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkRuleContextApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkRuleContextApi.java similarity index 99% rename from src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkRuleContextApi.java rename to src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkRuleContextApi.java index 2178ad0..2170317 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkRuleContextApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkRuleContextApi.java
@@ -54,7 +54,7 @@ + " associated function. See the <a" + " href='../rules.$DOC_EXT#implementation-function'>Rules page</a> for more " + "information.") -public interface SkylarkRuleContextApi<ConstraintValueT extends ConstraintValueInfoApi> +public interface StarlarkRuleContextApi<ConstraintValueT extends ConstraintValueInfoApi> extends StarlarkValue { String DOC_NEW_FILE_TAIL =
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkRuleFunctionsApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkRuleFunctionsApi.java similarity index 99% rename from src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkRuleFunctionsApi.java rename to src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkRuleFunctionsApi.java index 477e754..d90607c 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkRuleFunctionsApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkRuleFunctionsApi.java
@@ -36,7 +36,7 @@ * functions. */ @SkylarkGlobalLibrary -public interface SkylarkRuleFunctionsApi<FileApiT extends FileApi> { +public interface StarlarkRuleFunctionsApi<FileApiT extends FileApi> { String EXEC_COMPATIBLE_WITH_PARAM = "exec_compatible_with"; String TOOLCHAINS_PARAM = "toolchains"; @@ -470,8 +470,8 @@ generic1 = String.class, defaultValue = "[]", doc = - "If set, the set of toolchains this aspect requires. Toolchains will be " - + "found by checking the current platform, and provided to the aspect " + "If set, the set of toolchains this rule requires. Toolchains will be " + + "found by checking the current platform, and provided to the rule " + "implementation via <code>ctx.toolchain</code>."), @Param( name = "doc", @@ -499,7 +499,7 @@ + "aspect will propagate only to `alpha`. </p><p>False by default.</p>") }, useStarlarkThread = true) - SkylarkAspectApi aspect( + StarlarkAspectApi aspect( StarlarkFunction implementation, Sequence<?> attributeAspects, Object attrs,
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TopLevelBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TopLevelBootstrap.java index ddcfbef..1e05a51 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TopLevelBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/TopLevelBootstrap.java
@@ -28,8 +28,8 @@ private final SkylarkBuildApiGlobals skylarkBuildApiGlobals; private final StarlarkAttrModuleApi starlarkAttrModuleApi; private final StarlarkCommandLineApi starlarkCommandLineApi; - private final SkylarkNativeModuleApi skylarkNativeModuleApi; - private final SkylarkRuleFunctionsApi<?> skylarkRuleFunctionsApi; + private final StarlarkNativeModuleApi starlarkNativeModuleApi; + private final StarlarkRuleFunctionsApi<?> starlarkRuleFunctionsApi; private final StructApi.StructProviderApi structProvider; private final OutputGroupInfoApiProvider outputGroupInfoProvider; private final ActionsInfoProviderApi actionsInfoProviderApi; @@ -39,8 +39,8 @@ SkylarkBuildApiGlobals skylarkBuildApiGlobals, StarlarkAttrModuleApi starlarkAttrModuleApi, StarlarkCommandLineApi starlarkCommandLineApi, - SkylarkNativeModuleApi skylarkNativeModuleApi, - SkylarkRuleFunctionsApi<?> skylarkRuleFunctionsApi, + StarlarkNativeModuleApi starlarkNativeModuleApi, + StarlarkRuleFunctionsApi<?> starlarkRuleFunctionsApi, StructApi.StructProviderApi structProvider, OutputGroupInfoApiProvider outputGroupInfoProvider, ActionsInfoProviderApi actionsInfoProviderApi, @@ -48,8 +48,8 @@ this.starlarkAttrModuleApi = starlarkAttrModuleApi; this.skylarkBuildApiGlobals = skylarkBuildApiGlobals; this.starlarkCommandLineApi = starlarkCommandLineApi; - this.skylarkNativeModuleApi = skylarkNativeModuleApi; - this.skylarkRuleFunctionsApi = skylarkRuleFunctionsApi; + this.starlarkNativeModuleApi = starlarkNativeModuleApi; + this.starlarkRuleFunctionsApi = starlarkRuleFunctionsApi; this.structProvider = structProvider; this.outputGroupInfoProvider = outputGroupInfoProvider; this.actionsInfoProviderApi = actionsInfoProviderApi; @@ -59,10 +59,10 @@ @Override public void addBindingsToBuilder(ImmutableMap.Builder<String, Object> builder) { Starlark.addMethods(builder, skylarkBuildApiGlobals); - Starlark.addMethods(builder, skylarkRuleFunctionsApi); + Starlark.addMethods(builder, starlarkRuleFunctionsApi); Starlark.addModule(builder, starlarkAttrModuleApi); // "attr" Starlark.addModule(builder, starlarkCommandLineApi); // "cmd_helper" - Starlark.addModule(builder, skylarkNativeModuleApi); // "native" + Starlark.addModule(builder, starlarkNativeModuleApi); // "native" builder.put("struct", structProvider); builder.put("OutputGroupInfo", outputGroupInfoProvider); builder.put("Actions", actionsInfoProviderApi);
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleCommonApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleCommonApi.java index 7a66d80..71331e1 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleCommonApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleCommonApi.java
@@ -17,9 +17,9 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkAspectApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.SplitTransitionProviderApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkAspectApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.apple.AppleStaticLibraryInfoApi.AppleStaticLibraryInfoProvider; import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.core.StructApi; @@ -40,7 +40,7 @@ public interface AppleCommonApi< FileApiT extends FileApi, ConstraintValueT extends ConstraintValueInfoApi, - SkylarkRuleContextT extends SkylarkRuleContextApi<ConstraintValueT>, + SkylarkRuleContextT extends StarlarkRuleContextApi<ConstraintValueT>, ObjcProviderApiT extends ObjcProviderApi<?>, XcodeConfigInfoApiT extends XcodeConfigInfoApi<?, ?>, ApplePlatformApiT extends ApplePlatformApi> @@ -340,7 +340,7 @@ parameters = { @Param( name = "ctx", - type = SkylarkRuleContextApi.class, + type = StarlarkRuleContextApi.class, named = true, positional = false, doc = "The Starlark rule context."), @@ -387,5 +387,5 @@ "objc_proto_aspect gathers the proto dependencies of the attached rule target,and" + " propagates the proto values of its dependencies through the ObjcProto provider.", structField = true) - SkylarkAspectApi getObjcProtoAspect(); + StarlarkAspectApi getObjcProtoAspect(); }
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/BazelCcModuleApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/BazelCcModuleApi.java index 58ce4ea..33be41c 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/BazelCcModuleApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/BazelCcModuleApi.java
@@ -16,8 +16,8 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkActionFactoryApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; import com.google.devtools.build.lib.skylarkinterface.Param; import com.google.devtools.build.lib.skylarkinterface.ParamType; @@ -37,7 +37,7 @@ SkylarkActionFactoryT extends StarlarkActionFactoryApi, FileT extends FileApi, ConstraintValueT extends ConstraintValueInfoApi, - SkylarkRuleContextT extends SkylarkRuleContextApi<ConstraintValueT>, + SkylarkRuleContextT extends StarlarkRuleContextApi<ConstraintValueT>, CcToolchainProviderT extends CcToolchainProviderApi<FeatureConfigurationT>, FeatureConfigurationT extends FeatureConfigurationApi, CompilationContextT extends CcCompilationContextApi<FileT>,
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcBootstrap.java index 9fb54f5..272d485 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcBootstrap.java
@@ -16,8 +16,8 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkActionFactoryApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.core.Bootstrap; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; import com.google.devtools.build.lib.syntax.FlagGuardedValue; @@ -37,7 +37,7 @@ ? extends LibraryToLinkApi<? extends FileApi>, ? extends CcToolchainVariablesApi, ? extends ConstraintValueInfoApi, - ? extends SkylarkRuleContextApi<? extends ConstraintValueInfoApi>, + ? extends StarlarkRuleContextApi<? extends ConstraintValueInfoApi>, ? extends CcToolchainConfigInfoApi, ? extends CcCompilationOutputsApi<? extends FileApi>> ccModule; @@ -62,7 +62,7 @@ ? extends LibraryToLinkApi<? extends FileApi>, ? extends CcToolchainVariablesApi, ? extends ConstraintValueInfoApi, - ? extends SkylarkRuleContextApi<? extends ConstraintValueInfoApi>, + ? extends StarlarkRuleContextApi<? extends ConstraintValueInfoApi>, ? extends CcToolchainConfigInfoApi, ? extends CcCompilationOutputsApi<? extends FileApi>> ccModule,
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcModuleApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcModuleApi.java index b854368..dabf7c9 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcModuleApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcModuleApi.java
@@ -17,8 +17,8 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkActionFactoryApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; import com.google.devtools.build.lib.skylarkinterface.Param; @@ -49,7 +49,7 @@ LibraryToLinkT extends LibraryToLinkApi<FileT>, CcToolchainVariablesT extends CcToolchainVariablesApi, ConstraintValueT extends ConstraintValueInfoApi, - SkylarkRuleContextT extends SkylarkRuleContextApi<ConstraintValueT>, + SkylarkRuleContextT extends StarlarkRuleContextApi<ConstraintValueT>, CcToolchainConfigInfoT extends CcToolchainConfigInfoApi, CompilationOutputsT extends CcCompilationOutputsApi<FileT>> extends StarlarkValue { @@ -82,7 +82,7 @@ named = true, noneable = true, defaultValue = "None", - type = SkylarkRuleContextApi.class, + type = StarlarkRuleContextApi.class, doc = "The rule context."), @Param( name = "cc_toolchain", @@ -816,7 +816,7 @@ name = "ctx", positional = false, named = true, - type = SkylarkRuleContextApi.class, + type = StarlarkRuleContextApi.class, doc = "The rule context."), }, doc = "Returns true if the --incompatible_enable_cc_toolchain_resolution flag is enabled.") @@ -830,7 +830,7 @@ name = "ctx", positional = false, named = true, - type = SkylarkRuleContextApi.class, + type = StarlarkRuleContextApi.class, doc = "The rule context."), @Param( name = "features",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoWrapCcHelperApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoWrapCcHelperApi.java index 87dd73a..dc913dc 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoWrapCcHelperApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/GoWrapCcHelperApi.java
@@ -17,7 +17,7 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.RunfilesApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.skylarkbuildapi.go.GoConfigurationApi; import com.google.devtools.build.lib.skylarkbuildapi.go.GoContextInfoApi; @@ -46,7 +46,7 @@ public interface GoWrapCcHelperApi< FileT extends FileApi, ConstraintValueT extends ConstraintValueInfoApi, - SkylarkRuleContextT extends SkylarkRuleContextApi<ConstraintValueT>, + SkylarkRuleContextT extends StarlarkRuleContextApi<ConstraintValueT>, CcInfoT extends CcInfoApi<FileT>, FeatureConfigurationT extends FeatureConfigurationApi, CcToolchainProviderT extends CcToolchainProviderApi<FeatureConfigurationT>, @@ -72,7 +72,7 @@ doc = "", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), }) // TODO(b/113797843): Not written in Starlark because of GoRunfilesProvider. public RunfilesApi skylarkGetGoRunfiles(SkylarkRuleContextT skylarkRuleContext) @@ -93,7 +93,7 @@ doc = "", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), @Param(name = "export", positional = false, named = true, type = FileApi.class), @Param(name = "pkg", positional = false, named = true, type = FileApi.class), @Param(name = "gopkg", positional = false, named = true, type = FileApi.class), @@ -122,7 +122,7 @@ doc = "", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), @Param(name = "cc_info", positional = false, named = true, type = CcInfoApi.class), }) // TODO(b/113797843): GoWrapCcInfo is not written in Starlark because several native rules use it. @@ -135,7 +135,7 @@ doc = "", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), @Param( name = "linking_context", positional = false, @@ -151,7 +151,7 @@ doc = "", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), @Param( name = "cc_toolchain", positional = false, @@ -172,7 +172,7 @@ doc = "", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), @Param( name = "cc_toolchain", positional = false, @@ -193,7 +193,7 @@ doc = "", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), @Param(name = "gopkg", positional = false, named = true, type = FileApi.class), @Param(name = "export", positional = false, named = true, type = FileApi.class), @Param(name = "swig_out_go", positional = false, named = true, type = FileApi.class), @@ -206,7 +206,7 @@ doc = "", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), @Param(name = "gopkg", positional = false, named = true, type = FileApi.class), }) public Depset /*<FileT>*/ getGopackageFilesForStarlark(
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/PyWrapCcHelperApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/PyWrapCcHelperApi.java index 67de8e6..cb4e945 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/PyWrapCcHelperApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/PyWrapCcHelperApi.java
@@ -17,7 +17,7 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.RunfilesApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; import com.google.devtools.build.lib.skylarkinterface.Param; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; @@ -41,7 +41,7 @@ public interface PyWrapCcHelperApi< FileT extends FileApi, ConstraintValueT extends ConstraintValueInfoApi, - SkylarkRuleContextT extends SkylarkRuleContextApi<ConstraintValueT>, + SkylarkRuleContextT extends StarlarkRuleContextApi<ConstraintValueT>, CcInfoT extends CcInfoApi<FileT>, FeatureConfigurationT extends FeatureConfigurationApi, CcToolchainProviderT extends CcToolchainProviderApi<FeatureConfigurationT>, @@ -63,7 +63,7 @@ doc = "", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), }) // TODO(plf): PyExtension is not in Starlark. public Sequence<String> getPyExtensionLinkopts(SkylarkRuleContextT skylarkRuleContext) @@ -74,7 +74,7 @@ doc = "", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), @Param(name = "py_file", positional = false, named = true, type = FileApi.class), }) // TODO(plf): Not written in Starlark because of PyCommon. @@ -86,7 +86,7 @@ doc = "", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), @Param(name = "files_to_build", positional = false, named = true, type = Depset.class), }) // TODO(plf): Not written in Starlark because of PythonRunfilesProvider. @@ -98,7 +98,7 @@ doc = "", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), @Param(name = "cc_info", positional = false, named = true, type = CcInfoApi.class), }) // TODO(plf): PyWrapCcInfo is not written in Starlark because several native rules use it.
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/WrapCcHelperApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/WrapCcHelperApi.java index 933bd6c..28b2d0d 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/WrapCcHelperApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/WrapCcHelperApi.java
@@ -17,7 +17,7 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.FilesToRunProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; import com.google.devtools.build.lib.skylarkinterface.Param; import com.google.devtools.build.lib.skylarkinterface.ParamType; @@ -39,7 +39,7 @@ public interface WrapCcHelperApi< FeatureConfigurationT extends FeatureConfigurationApi, ConstraintValueT extends ConstraintValueInfoApi, - SkylarkRuleContextT extends SkylarkRuleContextApi<ConstraintValueT>, + SkylarkRuleContextT extends StarlarkRuleContextApi<ConstraintValueT>, CcToolchainProviderT extends CcToolchainProviderApi<FeatureConfigurationT>, CompilationInfoT extends CompilationInfoApi<FileT>, FileT extends FileApi, @@ -52,7 +52,7 @@ documented = false, doc = "", parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), @Param( name = "cc_toolchain", positional = false, @@ -67,7 +67,7 @@ name = "collect_transitive_swig_includes", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), }) public Depset skylarkCollectTransitiveSwigIncludes(SkylarkRuleContextT skylarkRuleContext); @@ -75,7 +75,7 @@ name = "create_compile_actions", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), @Param( name = "feature_configuration", positional = false, @@ -110,7 +110,7 @@ documented = false, doc = "", parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), }) public String skylarkGetMangledTargetName(SkylarkRuleContextT skylarkRuleContext) throws EvalException, InterruptedException; @@ -120,7 +120,7 @@ doc = "", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), @Param(name = "swig_includes", positional = false, named = true, type = Depset.class), }) // TODO(plf): Not written in Starlark because of PythonRunfilesProvider. @@ -132,7 +132,7 @@ name = "register_swig_action", documented = false, parameters = { - @Param(name = "ctx", positional = false, named = true, type = SkylarkRuleContextApi.class), + @Param(name = "ctx", positional = false, named = true, type = StarlarkRuleContextApi.class), @Param( name = "cc_toolchain", positional = false,
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCommonApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCommonApi.java index 4f3b656..687cc1e 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCommonApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaCommonApi.java
@@ -18,8 +18,8 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkActionFactoryApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; import com.google.devtools.build.lib.skylarkinterface.Param; @@ -40,7 +40,7 @@ JavaToolchainT extends JavaToolchainSkylarkApiProviderApi, JavaRuntimeT extends JavaRuntimeInfoApi, ConstraintValueT extends ConstraintValueInfoApi, - SkylarkRuleContextT extends SkylarkRuleContextApi<ConstraintValueT>, + SkylarkRuleContextT extends StarlarkRuleContextApi<ConstraintValueT>, SkylarkActionFactoryT extends StarlarkActionFactoryApi> extends StarlarkValue { @@ -64,7 +64,7 @@ name = "ctx", positional = true, named = false, - type = SkylarkRuleContextApi.class, + type = StarlarkRuleContextApi.class, doc = "The rule context."), @Param( name = "source_jars", @@ -456,7 +456,7 @@ name = "ctx", positional = false, named = true, - type = SkylarkRuleContextApi.class, + type = StarlarkRuleContextApi.class, doc = "The rule context."), }, doc = "Returns true if --incompatible_use_toolchain_resolution_for_java_rules is enabled.")
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaProtoCommonApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaProtoCommonApi.java index 28f1ff1..d5ceaab 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaProtoCommonApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java/JavaProtoCommonApi.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.java; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; import com.google.devtools.build.lib.skylarkinterface.Param; @@ -29,7 +29,7 @@ public interface JavaProtoCommonApi< FileT extends FileApi, ConstraintValueT extends ConstraintValueInfoApi, - SkylarkRuleContextT extends SkylarkRuleContextApi<ConstraintValueT>, + SkylarkRuleContextT extends StarlarkRuleContextApi<ConstraintValueT>, TransitiveInfoCollectionT extends TransitiveInfoCollectionApi> extends StarlarkValue { @@ -42,7 +42,7 @@ name = "ctx", positional = true, named = false, - type = SkylarkRuleContextApi.class, + type = StarlarkRuleContextApi.class, doc = "The rule context."), @Param( name = "target", @@ -96,7 +96,7 @@ name = "ctx", positional = true, named = false, - type = SkylarkRuleContextApi.class, + type = StarlarkRuleContextApi.class, doc = "The rule context."), @Param(name = "proto_toolchain_attr", positional = false, named = true, type = String.class) })
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ExecGroupCollectionApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ExecGroupCollectionApi.java index 893b62a..223a63a 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ExecGroupCollectionApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/platform/ExecGroupCollectionApi.java
@@ -31,9 +31,9 @@ /** * Stores information about a single ExecGroup. The SkylarkCallable functions in this module * should be a subset of the SkylarkCallable functions available for the default exec group via - * {@link com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi}. This allows a user - * to pass in a rule ctx to the same places that take an exec group ctx to have them operate on - * the default exec group. + * {@link com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi}. This allows a + * user to pass in a rule ctx to the same places that take an exec group ctx to have them operate + * on the default exec group. */ @StarlarkBuiltin( name = "ExecGroupContext",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/ProtoBootstrap.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/ProtoBootstrap.java index 48287b6..39fa848 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/ProtoBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/proto/ProtoBootstrap.java
@@ -16,7 +16,7 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.skylarkbuildapi.ProtoInfoApi.ProtoInfoProviderApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkAspectApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkAspectApi; import com.google.devtools.build.lib.skylarkbuildapi.core.Bootstrap; import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.FlagGuardedValue; @@ -33,13 +33,13 @@ private final ProtoInfoProviderApi protoInfoApiProvider; private final Object protoCommon; - private final SkylarkAspectApi protoRegistryAspect; + private final StarlarkAspectApi protoRegistryAspect; private final ProviderApi protoRegistryProvider; public ProtoBootstrap( ProtoInfoProviderApi protoInfoApiProvider, Object protoCommon, - SkylarkAspectApi protoRegistryAspect, + StarlarkAspectApi protoRegistryAspect, ProviderApi protoRegistryProvider) { this.protoInfoApiProvider = protoInfoApiProvider; this.protoCommon = protoCommon;
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/stubs/SkylarkAspectStub.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/stubs/StarlarkAspectStub.java similarity index 79% rename from src/main/java/com/google/devtools/build/lib/skylarkbuildapi/stubs/SkylarkAspectStub.java rename to src/main/java/com/google/devtools/build/lib/skylarkbuildapi/stubs/StarlarkAspectStub.java index be0cc8e..ff51c39 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/stubs/SkylarkAspectStub.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/stubs/StarlarkAspectStub.java
@@ -14,14 +14,14 @@ package com.google.devtools.build.lib.skylarkbuildapi.stubs; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkAspectApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkAspectApi; import com.google.devtools.build.lib.syntax.Printer; /** - * Stub implementation of {@link SkylarkAspectApi}. Should only be used for experimental, + * Stub implementation of {@link StarlarkAspectApi}. Should only be used for experimental, * unimplemented code paths. */ -public final class SkylarkAspectStub implements SkylarkAspectApi { +public final class StarlarkAspectStub implements StarlarkAspectApi { @Override public void repr(Printer printer) { printer.append("<unimplemented aspect>");
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/CoverageCommonApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/CoverageCommonApi.java index 4f4a399..b2aded0 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/CoverageCommonApi.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/test/CoverageCommonApi.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.skylarkbuildapi.test; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; import com.google.devtools.build.lib.skylarkinterface.Param; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; @@ -29,7 +29,7 @@ doc = "Helper functions to access coverage-related infrastructure.") public interface CoverageCommonApi< ConstraintValueT extends ConstraintValueInfoApi, - RuleContextT extends SkylarkRuleContextApi<ConstraintValueT>> + RuleContextT extends StarlarkRuleContextApi<ConstraintValueT>> extends StarlarkValue { @SkylarkCallable( @@ -44,7 +44,7 @@ name = "ctx", positional = true, named = true, - type = SkylarkRuleContextApi.class, + type = StarlarkRuleContextApi.class, doc = "The rule context."), @Param( name = "source_attributes",
diff --git a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java index d8202be..ac099a9 100644 --- a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java +++ b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
@@ -56,7 +56,7 @@ import com.google.devtools.build.lib.skylarkbuildapi.python.PyBootstrap; import com.google.devtools.build.lib.skylarkbuildapi.repository.RepositoryBootstrap; import com.google.devtools.build.lib.skylarkbuildapi.stubs.ProviderStub; -import com.google.devtools.build.lib.skylarkbuildapi.stubs.SkylarkAspectStub; +import com.google.devtools.build.lib.skylarkbuildapi.stubs.StarlarkAspectStub; import com.google.devtools.build.lib.skylarkbuildapi.test.TestingBootstrap; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; @@ -81,10 +81,10 @@ import com.google.devtools.build.skydoc.fakebuildapi.FakeConfigApi; import com.google.devtools.build.skydoc.fakebuildapi.FakeDefaultInfoProvider; import com.google.devtools.build.skydoc.fakebuildapi.FakeOutputGroupInfo.FakeOutputGroupInfoProvider; -import com.google.devtools.build.skydoc.fakebuildapi.FakeSkylarkNativeModuleApi; -import com.google.devtools.build.skydoc.fakebuildapi.FakeSkylarkRuleFunctionsApi; import com.google.devtools.build.skydoc.fakebuildapi.FakeStarlarkAttrModuleApi; import com.google.devtools.build.skydoc.fakebuildapi.FakeStarlarkCommandLineApi; +import com.google.devtools.build.skydoc.fakebuildapi.FakeStarlarkNativeModuleApi; +import com.google.devtools.build.skydoc.fakebuildapi.FakeStarlarkRuleFunctionsApi; import com.google.devtools.build.skydoc.fakebuildapi.FakeStructApi; import com.google.devtools.build.skydoc.fakebuildapi.FakeStructApi.FakeStructProviderApi; import com.google.devtools.build.skydoc.fakebuildapi.android.FakeAndroidApplicationResourceInfo.FakeAndroidApplicationResourceInfoProvider; @@ -550,8 +550,8 @@ new FakeBuildApiGlobals(), new FakeStarlarkAttrModuleApi(), new FakeStarlarkCommandLineApi(), - new FakeSkylarkNativeModuleApi(), - new FakeSkylarkRuleFunctionsApi(ruleInfoList, providerInfoList, aspectInfoList), + new FakeStarlarkNativeModuleApi(), + new FakeStarlarkRuleFunctionsApi(ruleInfoList, providerInfoList, aspectInfoList), new FakeStructProviderApi(), new FakeOutputGroupInfoProvider(), new FakeActionsInfoProvider(), @@ -589,7 +589,7 @@ new ProtoBootstrap( new FakeProtoInfoProvider(), new FakeProtoCommon(), - new SkylarkAspectStub(), + new StarlarkAspectStub(), new ProviderStub()); PyBootstrap pyBootstrap = new PyBootstrap(
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeSkylarkAspect.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkAspect.java similarity index 84% rename from src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeSkylarkAspect.java rename to src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkAspect.java index 6e94bff..0594de4 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeSkylarkAspect.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkAspect.java
@@ -14,12 +14,12 @@ package com.google.devtools.build.skydoc.fakebuildapi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkAspectApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkAspectApi; import com.google.devtools.build.lib.syntax.Printer; import com.google.devtools.build.lib.syntax.StarlarkCallable; -/** Fake implementation of {@link SkylarkAspectApi}. */ -public class FakeSkylarkAspect implements StarlarkCallable, SkylarkAspectApi { +/** Fake implementation of {@link StarlarkAspectApi}. */ +public class FakeStarlarkAspect implements StarlarkCallable, StarlarkAspectApi { /** * Each fake is constructed with a unique name, controlled by this counter being the name suffix.
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeSkylarkNativeModuleApi.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkNativeModuleApi.java similarity index 93% rename from src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeSkylarkNativeModuleApi.java rename to src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkNativeModuleApi.java index 54fc291..e86ff85 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeSkylarkNativeModuleApi.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkNativeModuleApi.java
@@ -16,7 +16,7 @@ import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkNativeModuleApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkNativeModuleApi; import com.google.devtools.build.lib.syntax.ClassObject; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; @@ -30,8 +30,8 @@ import com.google.devtools.build.lib.syntax.StarlarkThread; import javax.annotation.Nullable; -/** Fake implementation of {@link SkylarkNativeModuleApi}. */ -public class FakeSkylarkNativeModuleApi implements SkylarkNativeModuleApi, ClassObject { +/** Fake implementation of {@link StarlarkNativeModuleApi}. */ +public class FakeStarlarkNativeModuleApi implements StarlarkNativeModuleApi, ClassObject { @Override public Sequence<?> glob(
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeSkylarkRuleFunctionsApi.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkRuleFunctionsApi.java similarity index 95% rename from src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeSkylarkRuleFunctionsApi.java rename to src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkRuleFunctionsApi.java index b03ca67..c359f5f 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeSkylarkRuleFunctionsApi.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkRuleFunctionsApi.java
@@ -20,8 +20,8 @@ import com.google.devtools.build.lib.cmdline.LabelSyntaxException; import com.google.devtools.build.lib.skylarkbuildapi.ExecGroupApi; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkAspectApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleFunctionsApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkAspectApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleFunctionsApi; import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; @@ -48,12 +48,12 @@ import java.util.stream.Collectors; /** - * Fake implementation of {@link SkylarkRuleFunctionsApi}. + * Fake implementation of {@link StarlarkRuleFunctionsApi}. * * <p>This fake hooks into the global {@code rule()} function, adding descriptors of calls of that * function to a {@link List} given in the class constructor.</p> */ -public class FakeSkylarkRuleFunctionsApi implements SkylarkRuleFunctionsApi<FileApi> { +public class FakeStarlarkRuleFunctionsApi implements StarlarkRuleFunctionsApi<FileApi> { private static final FakeDescriptor IMPLICIT_NAME_ATTRIBUTE_DESCRIPTOR = new FakeDescriptor( @@ -74,7 +74,7 @@ * @param aspectInfoList the list of {@link AspectInfo} objects to which aspect() invocation * information will be added */ - public FakeSkylarkRuleFunctionsApi( + public FakeStarlarkRuleFunctionsApi( List<RuleInfoWrapper> ruleInfoList, List<ProviderInfoWrapper> providerInfoList, List<AspectInfoWrapper> aspectInfoList) { @@ -175,7 +175,7 @@ } @Override - public SkylarkAspectApi aspect( + public StarlarkAspectApi aspect( StarlarkFunction implementation, Sequence<?> attributeAspects, Object attrs, @@ -188,7 +188,7 @@ Boolean applyToFiles, StarlarkThread thread) throws EvalException { - FakeSkylarkAspect fakeAspect = new FakeSkylarkAspect(); + FakeStarlarkAspect fakeAspect = new FakeStarlarkAspect(); ImmutableMap.Builder<String, FakeDescriptor> attrsMapBuilder = ImmutableMap.builder(); if (attrs != null && attrs != Starlark.NONE) { attrsMapBuilder.putAll(Dict.cast(attrs, String.class, FakeDescriptor.class, "attrs"));
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/apple/FakeAppleCommon.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/apple/FakeAppleCommon.java index a660494..a5211b6 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/apple/FakeAppleCommon.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/apple/FakeAppleCommon.java
@@ -16,9 +16,9 @@ import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkAspectApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.SplitTransitionProviderApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkAspectApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.apple.AppleCommonApi; import com.google.devtools.build.lib.skylarkbuildapi.apple.AppleDynamicFrameworkInfoApi; import com.google.devtools.build.lib.skylarkbuildapi.apple.ApplePlatformApi; @@ -34,8 +34,8 @@ import com.google.devtools.build.lib.syntax.Sequence; import com.google.devtools.build.lib.syntax.StarlarkThread; import com.google.devtools.build.skydoc.fakebuildapi.FakeProviderApi; -import com.google.devtools.build.skydoc.fakebuildapi.FakeSkylarkAspect; import com.google.devtools.build.skydoc.fakebuildapi.FakeSplitTransitionProvider; +import com.google.devtools.build.skydoc.fakebuildapi.FakeStarlarkAspect; import com.google.devtools.build.skydoc.fakebuildapi.FakeStructApi; import com.google.devtools.build.skydoc.fakebuildapi.apple.FakeAppleStaticLibraryInfo.FakeAppleStaticLibraryInfoProvider; @@ -44,7 +44,7 @@ implements AppleCommonApi< FileApi, ConstraintValueInfoApi, - SkylarkRuleContextApi<ConstraintValueInfoApi>, + StarlarkRuleContextApi<ConstraintValueInfoApi>, ObjcProviderApi<?>, XcodeConfigInfoApi<?, ?>, ApplePlatformApi> { @@ -121,7 +121,7 @@ @Override public StructApi linkMultiArchBinary( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, Sequence<?> extraLinkopts, Sequence<?> extraLinkInputs, StarlarkThread thread) { @@ -134,8 +134,8 @@ } @Override - public SkylarkAspectApi getObjcProtoAspect() { - return new FakeSkylarkAspect(); + public StarlarkAspectApi getObjcProtoAspect() { + return new FakeStarlarkAspect(); } @Override
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeCcModule.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeCcModule.java index 6d7397c..9d14faf 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeCcModule.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeCcModule.java
@@ -16,8 +16,8 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkActionFactoryApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.BazelCcModuleApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcCompilationContextApi; @@ -47,7 +47,7 @@ StarlarkActionFactoryApi, FileApi, ConstraintValueInfoApi, - SkylarkRuleContextApi<ConstraintValueInfoApi>, + StarlarkRuleContextApi<ConstraintValueInfoApi>, CcToolchainProviderApi<FeatureConfigurationApi>, FeatureConfigurationApi, CcCompilationContextApi<FileApi>, @@ -218,7 +218,7 @@ @Override public boolean isCcToolchainResolutionEnabled( - SkylarkRuleContextApi<ConstraintValueInfoApi> context) { + StarlarkRuleContextApi<ConstraintValueInfoApi> context) { return false; } @@ -289,7 +289,7 @@ @Override public CcToolchainConfigInfoApi ccToolchainConfigInfoFromSkylark( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, Sequence<?> features, Sequence<?> actionConfigs, Sequence<?> artifactNamePatterns,
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeGoWrapCcHelper.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeGoWrapCcHelper.java index dc8b7b5..df472e1 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeGoWrapCcHelper.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakeGoWrapCcHelper.java
@@ -17,7 +17,7 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.RunfilesApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcCompilationContextApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcInfoApi; @@ -41,7 +41,7 @@ implements GoWrapCcHelperApi< FileApi, ConstraintValueInfoApi, - SkylarkRuleContextApi<ConstraintValueInfoApi>, + StarlarkRuleContextApi<ConstraintValueInfoApi>, CcInfoApi<FileApi>, FeatureConfigurationApi, CcToolchainProviderApi<FeatureConfigurationApi>, @@ -55,7 +55,7 @@ @Override public RunfilesApi skylarkGetGoRunfiles( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) { + StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext) { return null; } @@ -66,7 +66,7 @@ @Override public GoContextInfoApi skylarkCollectTransitiveGoContextGopkg( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext, FileApi export, FileApi pkg, FileApi gopkg, @@ -77,20 +77,21 @@ @Override public GoWrapCcInfoApi<FileApi> getGoWrapCcInfo( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, CcInfoApi<FileApi> ccInfo) { + StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext, + CcInfoApi<FileApi> ccInfo) { return null; } @Override public GoCcLinkParamsInfoApi getGoCcLinkParamsProvider( - SkylarkRuleContextApi<ConstraintValueInfoApi> ruleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> ruleContext, CcLinkingContextApi<FileApi> ccLinkingContext) { return null; } @Override public Tuple<FileApi> createGoCompileActions( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext, CcToolchainProviderApi<FeatureConfigurationApi> ccToolchainProvider, Sequence<?> srcs, Sequence<?> deps) { @@ -99,7 +100,7 @@ @Override public Tuple<FileApi> createGoCompileActionsGopkg( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext, CcToolchainProviderApi<FeatureConfigurationApi> ccToolchainProvider, Sequence<?> srcs, Sequence<?> deps) { @@ -108,7 +109,7 @@ @Override public GoPackageInfoApi createTransitiveGopackageInfo( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext, FileApi skylarkGopkg, FileApi export, FileApi swigOutGo) { @@ -117,26 +118,26 @@ @Override public Depset /*<FileApi>*/ getGopackageFilesForStarlark( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, FileApi skylarkGopkg) { + StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext, FileApi skylarkGopkg) { return null; } @Override public FeatureConfigurationApi skylarkGetFeatureConfiguration( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext, CcToolchainProviderApi<FeatureConfigurationApi> ccToolchain) { return null; } @Override public Depset skylarkCollectTransitiveSwigIncludes( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) { + StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext) { return null; } @Override public CompilationInfoApi<FileApi> skylarkCreateCompileActions( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext, FeatureConfigurationApi featureConfiguration, CcToolchainProviderApi<FeatureConfigurationApi> ccToolchain, FileApi ccFile, @@ -148,19 +149,19 @@ @Override public String skylarkGetMangledTargetName( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) { + StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext) { return null; } @Override public WrapCcIncludeProviderApi getWrapCcIncludeProvider( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, Depset swigIncludes) { + StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext, Depset swigIncludes) { return null; } @Override public void registerSwigAction( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext, CcToolchainProviderApi<FeatureConfigurationApi> ccToolchain, FeatureConfigurationApi featureConfiguration, CcCompilationContextApi<FileApi> wrapperCcCompilationContext,
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakePyWrapCcHelper.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakePyWrapCcHelper.java index 002ae46..a8ef0d5 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakePyWrapCcHelper.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/cpp/FakePyWrapCcHelper.java
@@ -17,7 +17,7 @@ import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; import com.google.devtools.build.lib.skylarkbuildapi.RunfilesApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcCompilationContextApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcInfoApi; import com.google.devtools.build.lib.skylarkbuildapi.cpp.CcToolchainProviderApi; @@ -34,7 +34,7 @@ implements PyWrapCcHelperApi< FileApi, ConstraintValueInfoApi, - SkylarkRuleContextApi<ConstraintValueInfoApi>, + StarlarkRuleContextApi<ConstraintValueInfoApi>, CcInfoApi<FileApi>, FeatureConfigurationApi, CcToolchainProviderApi<FeatureConfigurationApi>, @@ -44,56 +44,57 @@ @Override public Sequence<String> getPyExtensionLinkopts( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) { + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) { return null; } @Override public Depset getTransitivePythonSources( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, FileApi pyFile) { + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, FileApi pyFile) { return null; } @Override public RunfilesApi getPythonRunfiles( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, Depset filesToBuild) { + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, Depset filesToBuild) { return null; } @Override public PyWrapCcInfoApi<FileApi> getPyWrapCcInfo( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, CcInfoApi<FileApi> ccInfo) { + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + CcInfoApi<FileApi> ccInfo) { return null; } @Override public FeatureConfigurationApi skylarkGetFeatureConfiguration( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, CcToolchainProviderApi<FeatureConfigurationApi> ccToolchain) { return null; } @Override public Depset skylarkCollectTransitiveSwigIncludes( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) { + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) { return null; } @Override public String skylarkGetMangledTargetName( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) { + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext) { return null; } @Override public WrapCcIncludeProviderApi getWrapCcIncludeProvider( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, Depset swigIncludes) { + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, Depset swigIncludes) { return null; } @Override public void registerSwigAction( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, CcToolchainProviderApi<FeatureConfigurationApi> ccToolchain, FeatureConfigurationApi featureConfiguration, CcCompilationContextApi<FileApi> wrapperCcCompilationContext, @@ -111,7 +112,7 @@ @Override public CompilationInfoApi<FileApi> skylarkCreateCompileActions( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, FeatureConfigurationApi featureConfiguration, CcToolchainProviderApi<FeatureConfigurationApi> ccToolchain, FileApi ccFile,
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaCommon.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaCommon.java index cbe45a0..a866042 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaCommon.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaCommon.java
@@ -18,8 +18,8 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.StarlarkActionFactoryApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.core.ProviderApi; import com.google.devtools.build.lib.skylarkbuildapi.java.JavaCommonApi; import com.google.devtools.build.lib.skylarkbuildapi.java.JavaToolchainSkylarkApiProviderApi; @@ -37,7 +37,7 @@ FakeJavaToolchainSkylarkApiProviderApi, FakeJavaRuntimeInfoApi, ConstraintValueInfoApi, - SkylarkRuleContextApi<ConstraintValueInfoApi>, + StarlarkRuleContextApi<ConstraintValueInfoApi>, StarlarkActionFactoryApi> { @Override @@ -47,7 +47,7 @@ @Override public FakeJavaInfo createJavaCompileAction( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, Sequence<?> sourceJars, Sequence<?> sourceFiles, FileApi outputJar, @@ -127,7 +127,7 @@ @Override public boolean isJavaToolchainResolutionEnabled( - SkylarkRuleContextApi<ConstraintValueInfoApi> ruleContext) { + StarlarkRuleContextApi<ConstraintValueInfoApi> ruleContext) { return false; }
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaProtoCommon.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaProtoCommon.java index f769d41..f871347 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaProtoCommon.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/java/FakeJavaProtoCommon.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.skydoc.fakebuildapi.java; import com.google.devtools.build.lib.skylarkbuildapi.FileApi; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.core.TransitiveInfoCollectionApi; import com.google.devtools.build.lib.skylarkbuildapi.java.JavaInfoApi; import com.google.devtools.build.lib.skylarkbuildapi.java.JavaProtoCommonApi; @@ -27,12 +27,12 @@ implements JavaProtoCommonApi< FileApi, ConstraintValueInfoApi, - SkylarkRuleContextApi<ConstraintValueInfoApi>, + StarlarkRuleContextApi<ConstraintValueInfoApi>, TransitiveInfoCollectionApi> { @Override public void createProtoCompileAction( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext, TransitiveInfoCollectionApi target, FileApi sourceJar, String protoToolchainAttr, @@ -46,7 +46,7 @@ @Override public JavaInfoApi<FileApi> getRuntimeToolchainProvider( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, String protoToolchainAttr) + StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext, String protoToolchainAttr) throws EvalException { return new FakeJavaInfo(); }
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/repository/FakeRepositoryModule.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/repository/FakeRepositoryModule.java index ff03fd1..6f9afb9 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/repository/FakeRepositoryModule.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/repository/FakeRepositoryModule.java
@@ -25,7 +25,7 @@ import com.google.devtools.build.lib.syntax.StarlarkCallable; import com.google.devtools.build.lib.syntax.StarlarkThread; import com.google.devtools.build.skydoc.fakebuildapi.FakeDescriptor; -import com.google.devtools.build.skydoc.fakebuildapi.FakeSkylarkRuleFunctionsApi.AttributeNameComparator; +import com.google.devtools.build.skydoc.fakebuildapi.FakeStarlarkRuleFunctionsApi.AttributeNameComparator; import com.google.devtools.build.skydoc.rendering.RuleInfoWrapper; import com.google.devtools.build.skydoc.rendering.proto.StardocOutputProtos.AttributeInfo; import com.google.devtools.build.skydoc.rendering.proto.StardocOutputProtos.AttributeType;
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/test/FakeCoverageCommon.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/test/FakeCoverageCommon.java index 2049bc1..484191e 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/test/FakeCoverageCommon.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/test/FakeCoverageCommon.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.skydoc.fakebuildapi.test; -import com.google.devtools.build.lib.skylarkbuildapi.SkylarkRuleContextApi; +import com.google.devtools.build.lib.skylarkbuildapi.StarlarkRuleContextApi; import com.google.devtools.build.lib.skylarkbuildapi.platform.ConstraintValueInfoApi; import com.google.devtools.build.lib.skylarkbuildapi.test.CoverageCommonApi; import com.google.devtools.build.lib.skylarkbuildapi.test.InstrumentedFilesInfoApi; @@ -24,11 +24,11 @@ /** Fake implementation of {@link CoverageCommonApi}. */ public class FakeCoverageCommon implements CoverageCommonApi< - ConstraintValueInfoApi, SkylarkRuleContextApi<ConstraintValueInfoApi>> { + ConstraintValueInfoApi, StarlarkRuleContextApi<ConstraintValueInfoApi>> { @Override public InstrumentedFilesInfoApi instrumentedFilesInfo( - SkylarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, + StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext, Sequence<?> sourceAttributes, Sequence<?> dependencyAttributes, Object extensions) {
diff --git a/src/test/java/com/google/devtools/build/docgen/StarlarkDocumentationTest.java b/src/test/java/com/google/devtools/build/docgen/StarlarkDocumentationTest.java index 283ecab..2f87a29 100644 --- a/src/test/java/com/google/devtools/build/docgen/StarlarkDocumentationTest.java +++ b/src/test/java/com/google/devtools/build/docgen/StarlarkDocumentationTest.java
@@ -21,8 +21,8 @@ import com.google.devtools.build.docgen.starlark.StarlarkBuiltinDoc; import com.google.devtools.build.docgen.starlark.StarlarkConstructorMethodDoc; import com.google.devtools.build.docgen.starlark.StarlarkMethodDoc; -import com.google.devtools.build.lib.analysis.skylark.SkylarkModules; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; +import com.google.devtools.build.lib.analysis.skylark.StarlarkModules; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skylarkinterface.Param; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; @@ -55,7 +55,7 @@ @Test public void testSkylarkRuleClassBuiltInItemsAreDocumented() throws Exception { ImmutableMap.Builder<String, Object> env = ImmutableMap.builder(); - SkylarkModules.addSkylarkGlobalsToBuilder(env); + StarlarkModules.addStarlarkGlobalsToBuilder(env); checkSkylarkTopLevelEnvItemsAreDocumented(env.build()); } @@ -101,7 +101,7 @@ // TODO(bazel-team): come up with better Starlark specific tests. @Test public void testDirectJavaMethodsAreGenerated() throws Exception { - assertThat(collect(SkylarkRuleContext.class)).isNotEmpty(); + assertThat(collect(StarlarkRuleContext.class)).isNotEmpty(); } /** MockClassA */
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/StarlarkExecGroupTest.java b/src/test/java/com/google/devtools/build/lib/analysis/StarlarkExecGroupTest.java index 2bdcf58..9ded060 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/StarlarkExecGroupTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/StarlarkExecGroupTest.java
@@ -31,7 +31,7 @@ /** * Test for exec groups. Functionality related to rule context tested in {@link - * com.google.devtools.build.lib.skylark.SkylarkRuleContextTest}. + * com.google.devtools.build.lib.skylark.StarlarkRuleContextTest}. */ @RunWith(JUnit4.class) public class StarlarkExecGroupTest extends BuildViewTestCase {
diff --git a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java index 16d1108..4d1eddb 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/config/ConfigFeatureFlagTest.java
@@ -21,11 +21,11 @@ import com.google.common.testing.EqualsTester; import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider; import com.google.devtools.build.lib.analysis.ConfiguredTarget; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; import com.google.devtools.build.lib.packages.ConfiguredAttributeMapper; import com.google.devtools.build.lib.packages.Type; import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData; -import com.google.devtools.build.lib.skylark.util.SkylarkTestCase; +import com.google.devtools.build.lib.skylark.util.StarlarkTestCase; import com.google.devtools.build.lib.testutil.TestRuleClassProvider; import org.junit.Before; import org.junit.Test; @@ -34,7 +34,7 @@ /** Tests for the config_feature_flag rule. */ @RunWith(JUnit4.class) -public final class ConfigFeatureFlagTest extends SkylarkTestCase { +public final class ConfigFeatureFlagTest extends StarlarkTestCase { @Before public void useTrimmedConfigurations() throws Exception { @@ -178,8 +178,8 @@ ConfiguredTarget top = getConfiguredTarget("//test:top"); ConfiguredTarget wrapper = (ConfiguredTarget) Iterables.getOnlyElement(getPrerequisites(top, "deps")); - SkylarkRuleContext ctx = - new SkylarkRuleContext(getRuleContextForStarlark(wrapper), null, getStarlarkSemantics()); + StarlarkRuleContext ctx = + new StarlarkRuleContext(getRuleContextForStarlark(wrapper), null, getStarlarkSemantics()); update("ruleContext", ctx); update("config_common", new ConfigSkylarkCommon()); String value = (String) eval("ruleContext.attr.flag[config_common.FeatureFlagInfo].value"); @@ -230,7 +230,7 @@ " allowed_values = ['default', 'configured', 'other'],", " default_value = 'default',", ")"); - SkylarkRuleContext ctx = createRuleContext("//test:wrapper"); + StarlarkRuleContext ctx = createRuleContext("//test:wrapper"); update("ruleContext", ctx); update("config_common", new ConfigSkylarkCommon()); String provider = "ruleContext.attr.flag[config_common.FeatureFlagInfo]";
diff --git a/src/test/java/com/google/devtools/build/lib/rules/python/PyInfoTest.java b/src/test/java/com/google/devtools/build/lib/rules/python/PyInfoTest.java index 7318fd7..1330c1b 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/python/PyInfoTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/python/PyInfoTest.java
@@ -20,7 +20,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; -import com.google.devtools.build.lib.skylark.util.SkylarkTestCase; +import com.google.devtools.build.lib.skylark.util.StarlarkTestCase; import com.google.devtools.build.lib.syntax.Location; import org.junit.Before; import org.junit.Test; @@ -29,7 +29,7 @@ /** Tests for {@link PyInfo}. */ @RunWith(JUnit4.class) -public class PyInfoTest extends SkylarkTestCase { +public class PyInfoTest extends StarlarkTestCase { private Artifact dummyArtifact;
diff --git a/src/test/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfoTest.java b/src/test/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfoTest.java index f2108e1..e9157d0 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfoTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/python/PyRuntimeInfoTest.java
@@ -20,7 +20,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; -import com.google.devtools.build.lib.skylark.util.SkylarkTestCase; +import com.google.devtools.build.lib.skylark.util.StarlarkTestCase; import com.google.devtools.build.lib.syntax.Location; import com.google.devtools.build.lib.vfs.PathFragment; import org.junit.Before; @@ -30,7 +30,7 @@ /** Tests for {@link PyRuntimeInfo}. */ @RunWith(JUnit4.class) -public class PyRuntimeInfoTest extends SkylarkTestCase { +public class PyRuntimeInfoTest extends StarlarkTestCase { private Artifact dummyInterpreter; private Artifact dummyFile;
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkDefinedAspectsTest.java similarity index 99% rename from src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java rename to src/test/java/com/google/devtools/build/lib/skylark/StarlarkDefinedAspectsTest.java index fa87b2d..f320367 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkDefinedAspectsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkDefinedAspectsTest.java
@@ -55,7 +55,7 @@ /** Tests for Starlark aspects */ @RunWith(JUnit4.class) -public class SkylarkDefinedAspectsTest extends AnalysisTestCase { +public class StarlarkDefinedAspectsTest extends AnalysisTestCase { protected boolean keepGoing() { return false; } @@ -468,7 +468,7 @@ } @Test - public void aspectsFromSkylarkRules() throws Exception { + public void aspectsFromStarlarkRules() throws Exception { scratch.file( "test/aspect.bzl", "def _aspect_impl(target, ctx):", @@ -1088,7 +1088,7 @@ } @Test - public void duplicateSkylarkProviders() throws Exception { + public void duplicateStarlarkProviders() throws Exception { scratch.file( "test/aspect.bzl", "def _impl(target, ctx):", @@ -2503,10 +2503,10 @@ } @Test - // This test verifies that aspects which are defined natively and exported for use in skylark + // This test verifies that aspects which are defined natively and exported for use in Starlark // can be referenced at the top level using the --aspects flag. For ease of testing, // apple_common.objc_proto_aspect is used as an example. - public void testTopLevelSkylarkObjcProtoAspect() throws Exception { + public void testTopLevelStarlarkObjcProtoAspect() throws Exception { MockObjcSupport.setupObjcProtoLibrary(scratch); scratch.file("test_skylark/BUILD"); scratch.file("x/data_filter.pbascii"); @@ -3005,9 +3005,9 @@ Label.parseAbsolute("//test:charlie", ImmutableMap.of())); } - /** SkylarkAspectTest with "keep going" flag */ + /** StarlarkAspectTest with "keep going" flag */ @RunWith(JUnit4.class) - public static final class WithKeepGoing extends SkylarkDefinedAspectsTest { + public static final class WithKeepGoing extends StarlarkDefinedAspectsTest { @Override protected FlagBuilder defaultFlags() { return super.defaultFlags().with(Flag.KEEP_GOING);
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java similarity index 96% rename from src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java rename to src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java index db7a8da..ab0ddab 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleClassFunctionsTest.java
@@ -23,9 +23,9 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.analysis.config.transitions.NoTransition; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleClassFunctions.SkylarkRuleFunction; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; import com.google.devtools.build.lib.analysis.skylark.StarlarkAttrModule; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleClassFunctions.StarlarkRuleFunction; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.events.Event; @@ -41,15 +41,15 @@ import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType; import com.google.devtools.build.lib.packages.SkylarkAspectClass; -import com.google.devtools.build.lib.packages.SkylarkDefinedAspect; import com.google.devtools.build.lib.packages.SkylarkInfo; +import com.google.devtools.build.lib.packages.StarlarkDefinedAspect; import com.google.devtools.build.lib.packages.StarlarkProvider; import com.google.devtools.build.lib.packages.StarlarkProviderIdentifier; import com.google.devtools.build.lib.packages.StructImpl; import com.google.devtools.build.lib.packages.StructProvider; import com.google.devtools.build.lib.packages.Type; import com.google.devtools.build.lib.skyframe.StarlarkImportLookupFunction; -import com.google.devtools.build.lib.skylark.util.SkylarkTestCase; +import com.google.devtools.build.lib.skylark.util.StarlarkTestCase; import com.google.devtools.build.lib.syntax.ClassObject; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; @@ -75,7 +75,7 @@ /** Tests for SkylarkRuleClassFunctions. */ @RunWith(JUnit4.class) -public final class SkylarkRuleClassFunctionsTest extends SkylarkTestCase { +public final class StarlarkRuleClassFunctionsTest extends StarlarkTestCase { @Rule public ExpectedException thrown = ExpectedException.none(); @Before @@ -136,7 +136,7 @@ } private RuleClass getRuleClass(String name) throws Exception { - return ((SkylarkRuleFunction) lookup(name)).getRuleClass(); + return ((StarlarkRuleFunction) lookup(name)).getRuleClass(); } private void registerDummyStarlarkFunction() throws Exception { @@ -377,7 +377,7 @@ "my_aspect = aspect(implementation = _impl)", "a = attr.label_list(aspects = [my_aspect])"); StarlarkAttrModule.Descriptor attr = (StarlarkAttrModule.Descriptor) lookup("a"); - SkylarkDefinedAspect aspect = (SkylarkDefinedAspect) lookup("my_aspect"); + StarlarkDefinedAspect aspect = (StarlarkDefinedAspect) lookup("my_aspect"); assertThat(aspect).isNotNull(); assertThat(attr.build("xxx").getAspectClasses()).containsExactly(aspect.getAspectClass()); } @@ -390,7 +390,7 @@ "my_aspect = aspect(implementation = _impl)", "a = attr.label(aspects = [my_aspect])"); StarlarkAttrModule.Descriptor attr = (StarlarkAttrModule.Descriptor) lookup("a"); - SkylarkDefinedAspect aspect = (SkylarkDefinedAspect) lookup("my_aspect"); + StarlarkDefinedAspect aspect = (StarlarkDefinedAspect) lookup("my_aspect"); assertThat(aspect).isNotNull(); assertThat(attr.build("xxx").getAspectClasses()).containsExactly(aspect.getAspectClass()); } @@ -413,7 +413,7 @@ "my_aspect = aspect(_impl,", " attrs = { '_extra_deps' : attr.label(default = Label('//foo/bar:baz')) }", ")"); - SkylarkDefinedAspect aspect = (SkylarkDefinedAspect) lookup("my_aspect"); + StarlarkDefinedAspect aspect = (StarlarkDefinedAspect) lookup("my_aspect"); Attribute attribute = Iterables.getOnlyElement(aspect.getAttributes()); assertThat(attribute.getName()).isEqualTo("$extra_deps"); assertThat(attribute.getDefaultValue(null)) @@ -432,7 +432,7 @@ "my_aspect = aspect(_impl,", " attrs = { 'param' : attr.string(values=['a', 'b']) }", ")"); - SkylarkDefinedAspect aspect = (SkylarkDefinedAspect) lookup("my_aspect"); + StarlarkDefinedAspect aspect = (StarlarkDefinedAspect) lookup("my_aspect"); Attribute attribute = Iterables.getOnlyElement(aspect.getAttributes()); assertThat(attribute.getName()).isEqualTo("param"); } @@ -470,7 +470,7 @@ " attrs = { 'param' : attr.string(values=['a', 'b']),", " '_extra' : attr.label(default = Label('//foo/bar:baz')) }", ")"); - SkylarkDefinedAspect aspect = (SkylarkDefinedAspect) lookup("my_aspect"); + StarlarkDefinedAspect aspect = (StarlarkDefinedAspect) lookup("my_aspect"); assertThat(aspect.getAttributes()).hasSize(2); assertThat(aspect.getParamAttributes()).containsExactly("param"); } @@ -491,7 +491,7 @@ scratch.file("test/BUILD", "toolchain_type(name = 'my_toolchain_type')"); evalAndExport( "def _impl(ctx): pass", "a1 = aspect(_impl, toolchains=['//test:my_toolchain_type'])"); - SkylarkDefinedAspect a = (SkylarkDefinedAspect) lookup("a1"); + StarlarkDefinedAspect a = (StarlarkDefinedAspect) lookup("a1"); assertThat(a.getRequiredToolchains()).containsExactly(makeLabel("//test:my_toolchain_type")); } @@ -686,7 +686,7 @@ @Test public void testRuleImplementation() throws Exception { evalAndExport("def impl(ctx): return None", "rule1 = rule(impl)"); - RuleClass c = ((SkylarkRuleFunction) lookup("rule1")).getRuleClass(); + RuleClass c = ((StarlarkRuleFunction) lookup("rule1")).getRuleClass(); assertThat(c.getConfiguredTargetFunction().getName()).isEqualTo("impl"); } @@ -741,7 +741,7 @@ @Test public void testRuleAddAttribute() throws Exception { evalAndExport("def impl(ctx): return None", "r1 = rule(impl, attrs={'a1': attr.string()})"); - RuleClass c = ((SkylarkRuleFunction) lookup("r1")).getRuleClass(); + RuleClass c = ((StarlarkRuleFunction) lookup("r1")).getRuleClass(); assertThat(c.hasAttr("a1", Type.STRING)).isTrue(); } @@ -776,8 +776,8 @@ "x = d", "y = d", "z = d"); - String dName = ((SkylarkRuleFunction) lookup("d")).getRuleClass().getName(); - String fooName = ((SkylarkRuleFunction) lookup("foo")).getRuleClass().getName(); + String dName = ((StarlarkRuleFunction) lookup("d")).getRuleClass().getName(); + String fooName = ((StarlarkRuleFunction) lookup("foo")).getRuleClass().getName(); assertThat(dName).isEqualTo("d"); assertThat(fooName).isEqualTo("d"); } @@ -785,7 +785,7 @@ @Test public void testOutputToGenfiles() throws Exception { evalAndExport("def impl(ctx): pass", "r1 = rule(impl, output_to_genfiles=True)"); - RuleClass c = ((SkylarkRuleFunction) lookup("r1")).getRuleClass(); + RuleClass c = ((StarlarkRuleFunction) lookup("r1")).getRuleClass(); assertThat(c.hasBinaryOutput()).isFalse(); } @@ -798,7 +798,7 @@ " 'a1': attr.label_list(allow_files=True),", " 'a2': attr.int()", "})"); - RuleClass c = ((SkylarkRuleFunction) lookup("r1")).getRuleClass(); + RuleClass c = ((StarlarkRuleFunction) lookup("r1")).getRuleClass(); assertThat(c.hasAttr("a1", BuildType.LABEL_LIST)).isTrue(); assertThat(c.hasAttr("a2", Type.INTEGER)).isTrue(); } @@ -808,7 +808,7 @@ evalAndExport( "def impl(ctx): return None", "r1 = rule(impl, attrs = {'a1': attr.string(mandatory=True)})"); - RuleClass c = ((SkylarkRuleFunction) lookup("r1")).getRuleClass(); + RuleClass c = ((StarlarkRuleFunction) lookup("r1")).getRuleClass(); assertThat(c.getAttributeByName("a1").isMandatory()).isTrue(); } @@ -817,7 +817,7 @@ evalAndExport( "def impl(ctx): return None", "r1 = rule(impl, outputs = {'a': 'a.txt'})"); - RuleClass c = ((SkylarkRuleFunction) lookup("r1")).getRuleClass(); + RuleClass c = ((StarlarkRuleFunction) lookup("r1")).getRuleClass(); ImplicitOutputsFunction function = c.getDefaultImplicitOutputsFunction(); assertThat(function.getImplicitOutputs(ev.getEventHandler(), null)).containsExactly("a.txt"); } @@ -887,7 +887,7 @@ "def impl(ctx): return None\n" + "r1 = rule(impl, attrs = {'a1': " + "attr.label(default = Label('//foo:foo'), allow_files=True)})"); - RuleClass c = ((SkylarkRuleFunction) lookup("r1")).getRuleClass(); + RuleClass c = ((StarlarkRuleFunction) lookup("r1")).getRuleClass(); Attribute a = c.getAttributeByName("a1"); assertThat(a.getDefaultValueUnchecked()).isInstanceOf(Label.class); assertThat(a.getDefaultValueUnchecked().toString()).isEqualTo("//foo:foo"); @@ -898,7 +898,7 @@ evalAndExport( "def impl(ctx): return None", "r1 = rule(impl, attrs = {'a1': attr.int(default = 40+2)})"); - RuleClass c = ((SkylarkRuleFunction) lookup("r1")).getRuleClass(); + RuleClass c = ((StarlarkRuleFunction) lookup("r1")).getRuleClass(); Attribute a = c.getAttributeByName("a1"); assertThat(a.getDefaultValueUnchecked()).isEqualTo(42); } @@ -906,7 +906,7 @@ @Test public void testRuleInheritsBaseRuleAttributes() throws Exception { evalAndExport("def impl(ctx): return None", "r1 = rule(impl)"); - RuleClass c = ((SkylarkRuleFunction) lookup("r1")).getRuleClass(); + RuleClass c = ((StarlarkRuleFunction) lookup("r1")).getRuleClass(); assertThat(c.hasAttr("tags", Type.STRING_LIST)).isTrue(); assertThat(c.hasAttr("visibility", BuildType.NODEP_LABEL_LIST)).isTrue(); assertThat(c.hasAttr("deprecation", Type.STRING)).isTrue(); @@ -1166,7 +1166,7 @@ } @Test - public void testStructAccessingFieldsFromSkylark() throws Exception { + public void testStructAccessingFieldsFromStarlark() throws Exception { exec("x = struct(a = 1, b = 2)", "x1 = x.a", "x2 = x.b"); assertThat(lookup("x1")).isEqualTo(1); assertThat(lookup("x2")).isEqualTo(2); @@ -1469,7 +1469,7 @@ " pass", "my_aspect = aspect(_impl, attr_aspects=['*'])"); - SkylarkDefinedAspect myAspect = (SkylarkDefinedAspect) lookup("my_aspect"); + StarlarkDefinedAspect myAspect = (StarlarkDefinedAspect) lookup("my_aspect"); assertThat(myAspect.getDefinition(AspectParameters.EMPTY).propagateAlong("foo")).isTrue(); } @@ -1481,7 +1481,7 @@ "cc = provider()", "my_aspect = aspect(_impl, required_aspect_providers=['java', cc])" ); - SkylarkDefinedAspect myAspect = (SkylarkDefinedAspect) lookup("my_aspect"); + StarlarkDefinedAspect myAspect = (StarlarkDefinedAspect) lookup("my_aspect"); RequiredProviders requiredProviders = myAspect.getDefinition(AspectParameters.EMPTY) .getRequiredProvidersForAspects(); assertThat(requiredProviders.isSatisfiedBy(AdvertisedProviderSet.ANY)).isTrue(); @@ -1507,7 +1507,7 @@ "cc = provider()", "my_aspect = aspect(_impl, required_aspect_providers=[['java'], [cc]])" ); - SkylarkDefinedAspect myAspect = (SkylarkDefinedAspect) lookup("my_aspect"); + StarlarkDefinedAspect myAspect = (StarlarkDefinedAspect) lookup("my_aspect"); RequiredProviders requiredProviders = myAspect.getDefinition(AspectParameters.EMPTY) .getRequiredProvidersForAspects(); assertThat(requiredProviders.isSatisfiedBy(AdvertisedProviderSet.ANY)).isTrue(); @@ -1536,7 +1536,7 @@ " pass", "my_aspect = aspect(_impl, required_aspect_providers=[])" ); - SkylarkDefinedAspect myAspect = (SkylarkDefinedAspect) lookup("my_aspect"); + StarlarkDefinedAspect myAspect = (StarlarkDefinedAspect) lookup("my_aspect"); RequiredProviders requiredProviders = myAspect.getDefinition(AspectParameters.EMPTY) .getRequiredProvidersForAspects(); assertThat(requiredProviders.isSatisfiedBy(AdvertisedProviderSet.ANY)).isFalse(); @@ -1550,7 +1550,7 @@ " pass", "my_aspect = aspect(_impl)" ); - SkylarkDefinedAspect myAspect = (SkylarkDefinedAspect) lookup("my_aspect"); + StarlarkDefinedAspect myAspect = (StarlarkDefinedAspect) lookup("my_aspect"); RequiredProviders requiredProviders = myAspect.getDefinition(AspectParameters.EMPTY) .getRequiredProvidersForAspects(); assertThat(requiredProviders.isSatisfiedBy(AdvertisedProviderSet.ANY)).isFalse(); @@ -1565,7 +1565,7 @@ "y = provider()", "my_aspect = aspect(_impl, provides = ['x', y])" ); - SkylarkDefinedAspect myAspect = (SkylarkDefinedAspect) lookup("my_aspect"); + StarlarkDefinedAspect myAspect = (StarlarkDefinedAspect) lookup("my_aspect"); AdvertisedProviderSet advertisedProviders = myAspect.getDefinition(AspectParameters.EMPTY) .getAdvertisedProviders(); assertThat(advertisedProviders.canHaveAnyProvider()).isFalse(); @@ -1612,7 +1612,7 @@ "]" ); StarlarkProvider p = (StarlarkProvider) lookup("p"); - SkylarkDefinedAspect a = (SkylarkDefinedAspect) lookup("a"); + StarlarkDefinedAspect a = (StarlarkDefinedAspect) lookup("a"); StarlarkProvider p1 = (StarlarkProvider) lookup("p1"); assertThat(p.getPrintableName()).isEqualTo("p"); assertThat(p.getKey()).isEqualTo(new StarlarkProvider.Key(FAKE_LABEL, "p")); @@ -1761,7 +1761,7 @@ scratch.file("test/BUILD", "toolchain_type(name = 'my_toolchain_type')"); evalAndExport( "def impl(ctx): return None", "r1 = rule(impl, toolchains=['//test:my_toolchain_type'])"); - RuleClass c = ((SkylarkRuleFunction) lookup("r1")).getRuleClass(); + RuleClass c = ((StarlarkRuleFunction) lookup("r1")).getRuleClass(); assertThat(c.getRequiredToolchains()).containsExactly(makeLabel("//test:my_toolchain_type")); } @@ -1775,7 +1775,7 @@ " toolchains=['//test:my_toolchain_type'],", " exec_compatible_with=['//constraint:cv1', '//constraint:cv2'],", ")"); - RuleClass c = ((SkylarkRuleFunction) lookup("r1")).getRuleClass(); + RuleClass c = ((StarlarkRuleFunction) lookup("r1")).getRuleClass(); assertThat(c.getExecutionPlatformConstraints()) .containsExactly(makeLabel("//constraint:cv1"), makeLabel("//constraint:cv2")); } @@ -1797,7 +1797,7 @@ " ),", " },", ")"); - RuleClass plum = ((SkylarkRuleFunction) lookup("plum")).getRuleClass(); + RuleClass plum = ((StarlarkRuleFunction) lookup("plum")).getRuleClass(); assertThat(plum.getRequiredToolchains()).isEmpty(); assertThat(plum.getExecGroups().get("group").getRequiredToolchains()) .containsExactly(makeLabel("//test:my_toolchain_type")); @@ -1825,7 +1825,7 @@ " params = [type(r), type(c)]", ")"); invalidatePackages(); - SkylarkRuleContext context = createRuleContext("//test:check"); + StarlarkRuleContext context = createRuleContext("//test:check"); @SuppressWarnings("unchecked") StarlarkList<Object> params = (StarlarkList<Object>) context.getAttr().getValue("params"); assertThat(params.get(0)).isEqualTo("NoneType");
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleContextTest.java similarity index 97% rename from src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java rename to src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleContextTest.java index 1d1ff4f..001026e 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleContextTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleContextTest.java
@@ -38,7 +38,7 @@ import com.google.devtools.build.lib.analysis.actions.FileWriteAction; import com.google.devtools.build.lib.analysis.actions.StarlarkAction; import com.google.devtools.build.lib.analysis.configuredtargets.FileConfiguredTarget; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; import com.google.devtools.build.lib.analysis.util.MockRule; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset; @@ -50,7 +50,7 @@ import com.google.devtools.build.lib.rules.java.JavaInfo; import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider; import com.google.devtools.build.lib.rules.python.PyProviderUtils; -import com.google.devtools.build.lib.skylark.util.SkylarkTestCase; +import com.google.devtools.build.lib.skylark.util.StarlarkTestCase; import com.google.devtools.build.lib.syntax.Dict; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.Mutability; @@ -70,10 +70,10 @@ import org.junit.runners.JUnit4; /** - * Tests for SkylarkRuleContext. + * Tests for {@link StarlarkRuleContext}. */ @RunWith(JUnit4.class) -public class SkylarkRuleContextTest extends SkylarkTestCase { +public class StarlarkRuleContextTest extends StarlarkTestCase { /** A test rule that exercises the semantics of mandatory providers. */ private static final MockRule TESTING_RULE_FOR_MANDATORY_PROVIDERS = @@ -143,7 +143,7 @@ ); } - private void setRuleContext(SkylarkRuleContext ctx) throws Exception { + private void setRuleContext(StarlarkRuleContext ctx) throws Exception { update("ruleContext", ctx); } @@ -191,7 +191,7 @@ } @Test - public void hasCorrectLocationForRuleAttributeError_SkylarkRuleWithMacro() throws Exception { + public void hasCorrectLocationForRuleAttributeError_StarlarkRuleWithMacro() throws Exception { setUpAttributeErrorTest(); assertThrows(Exception.class, () -> createRuleContext("//test:m_skylark")); assertContainsEvent( @@ -213,7 +213,7 @@ } @Test - public void hasCorrectLocationForRuleAttributeError_SkylarkRule() throws Exception { + public void hasCorrectLocationForRuleAttributeError_StarlarkRule() throws Exception { setUpAttributeErrorTest(); assertThrows(Exception.class, () -> createRuleContext("//test:skyrule")); assertContainsEvent( @@ -223,7 +223,7 @@ } @Test - public void testMandatoryProvidersListWithSkylark() throws Exception { + public void testMandatoryProvidersListWithStarlark() throws Exception { setStarlarkSemanticsOptions("--incompatible_disallow_struct_provider_syntax=false"); scratch.file("test/BUILD", "load('//test:rules.bzl', 'skylark_rule', 'my_rule', 'my_other_rule')", @@ -311,7 +311,7 @@ } @Test - public void testPackageBoundaryError_SkylarkRule() throws Exception { + public void testPackageBoundaryError_StarlarkRule() throws Exception { scratch.file("test/BUILD", "load('//test:macros.bzl', 'skylark_rule')", "skylark_rule(name = 'skyrule',", @@ -336,7 +336,7 @@ } @Test - public void testPackageBoundaryError_SkylarkMacro() throws Exception { + public void testPackageBoundaryError_StarlarkMacro() throws Exception { scratch.file("test/BUILD", "load('//test:macros.bzl', 'macro_skylark_rule')", "macro_skylark_rule(name = 'm_skylark',", @@ -413,7 +413,7 @@ * with it. */ @Test - public void testPackageBoundaryError_SkylarkMacroWithErrorInBzlFile() throws Exception { + public void testPackageBoundaryError_StarlarkMacroWithErrorInBzlFile() throws Exception { scratch.file("test/BUILD", "load('//test:macros.bzl', 'macro_skylark_rule')", "macro_skylark_rule(name = 'm_skylark')"); @@ -457,7 +457,7 @@ @Test public void shouldGetPrerequisiteArtifacts() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); Object result = eval("ruleContext.files.srcs"); assertArtifactList(result, ImmutableList.of("a.txt", "b.img")); @@ -475,7 +475,7 @@ @Test public void shouldGetPrerequisites() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:bar"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:bar"); setRuleContext(ruleContext); Object result = eval("ruleContext.attr.srcs"); // Check for a known provider @@ -487,7 +487,7 @@ @Test public void shouldGetPrerequisite() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:asr"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:asr"); setRuleContext(ruleContext); Object result = eval("ruleContext.attr.srcjar"); TransitiveInfoCollection tic = (TransitiveInfoCollection) result; @@ -497,7 +497,7 @@ @Test public void testGetRuleAttributeListType() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); Object result = eval("ruleContext.attr.outs"); assertThat(result).isInstanceOf(Sequence.class); @@ -589,7 +589,7 @@ " s = adict.keys())", "consume_rule(name = 'c_str', s = [cdict['kind'], cdict['name'], cdict['x']])"); - SkylarkRuleContext allContext = createRuleContext("//test/getrule:all_str"); + StarlarkRuleContext allContext = createRuleContext("//test/getrule:all_str"); setRuleContext(allContext); List<?> result = (List) eval("ruleContext.attr.s"); assertThat(result).containsExactly("genrule", "a", "nop_rule", "c"); @@ -649,7 +649,7 @@ @Test public void testGetRuleAttributeListValue() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); Object result = eval("ruleContext.attr.outs"); assertThat(((Sequence) result)).hasSize(1); @@ -657,7 +657,7 @@ @Test public void testGetRuleAttributeListValueNoGet() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); Object result = eval("ruleContext.attr.outs"); assertThat(((Sequence) result)).hasSize(1); @@ -665,7 +665,7 @@ @Test public void testGetRuleAttributeStringTypeValue() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); Object result = eval("ruleContext.attr.cmd"); assertThat((String) result).isEqualTo("dummy_cmd"); @@ -673,7 +673,7 @@ @Test public void testGetRuleAttributeStringTypeValueNoGet() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); Object result = eval("ruleContext.attr.cmd"); assertThat((String) result).isEqualTo("dummy_cmd"); @@ -713,7 +713,7 @@ @Test public void testCreateSpawnActionArgumentsWithExecutableFilesToRunProvider() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:androidlib"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:androidlib"); setRuleContext(ruleContext); exec( "ruleContext.actions.run(", @@ -730,7 +730,7 @@ @Test public void testCreateStarlarkActionArgumentsWithUnusedInputsList() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "ruleContext.actions.run(", @@ -750,7 +750,7 @@ @Test public void testCreateStarlarkActionArgumentsWithoutUnusedInputsList() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "ruleContext.actions.run(", @@ -774,7 +774,7 @@ } @Test - public void testSkylarkRuleContextGetDefaultShellEnv() throws Exception { + public void testStarlarkRuleContextGetDefaultShellEnv() throws Exception { setRuleContext(createRuleContext("//foo:foo")); Object result = eval("ruleContext.configuration.default_shell_env"); assertThat(result).isInstanceOf(Dict.class); @@ -861,7 +861,7 @@ @Test public void testConfiguration() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); Object result = eval("ruleContext.configuration"); assertThat(ruleContext.getRuleContext().getConfiguration()).isSameInstanceAs(result); @@ -883,7 +883,7 @@ @Test public void testHostConfiguration() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); Object result = eval("ruleContext.host_configuration"); assertThat(ruleContext.getRuleContext().getHostConfiguration()).isSameInstanceAs(result); @@ -1797,7 +1797,7 @@ " executable = 1,", ")"); invalidatePackages(); - SkylarkRuleContext ruleContext = createRuleContext("//test:lib"); + StarlarkRuleContext ruleContext = createRuleContext("//test:lib"); setRuleContext(ruleContext); String filename = eval("ruleContext.files.srcs[0].short_path").toString(); assertThat(filename).isEqualTo("../foo/bar.txt"); @@ -1817,7 +1817,7 @@ // a testing rule, where the rule under test has one output and one caller-supplied action. private static String getSimpleUnderTestDefinition( - boolean withSkylarkTestable, String[] actionLines) { + boolean withStarlarkTestable, String[] actionLines) { return linesAsString( // TODO(b/153667498): Just passing fail to map_each parameter of Args.add_all does not work. "def fail_with_message(s):", @@ -1829,7 +1829,7 @@ "undertest_rule = rule(", " implementation = _undertest_impl,", " outputs = {'out': '%{name}.txt'},", - withSkylarkTestable ? " _skylark_testable = True," : "", + withStarlarkTestable ? " _skylark_testable = True," : "", ")"); } @@ -1869,7 +1869,7 @@ testingRuleDefinition); scratch.file("test/BUILD", simpleBuildDefinition); - SkylarkRuleContext ruleContext = createRuleContext("//test:testing"); + StarlarkRuleContext ruleContext = createRuleContext("//test:testing"); setRuleContext(ruleContext); Object provider = eval("ruleContext.attr.dep[Actions]"); @@ -1885,7 +1885,7 @@ } @Test - public void testNoAccessToDependencyActionsWithoutSkylarkTest() throws Exception { + public void testNoAccessToDependencyActionsWithoutStarlarkTest() throws Exception { reporter.removeHandler(failFastHandler); scratch.file("test/rules.bzl", getSimpleNontestableUnderTestDefinition( @@ -1893,7 +1893,7 @@ testingRuleDefinition); scratch.file("test/BUILD", simpleBuildDefinition); - SkylarkRuleContext ruleContext = createRuleContext("//test:testing"); + StarlarkRuleContext ruleContext = createRuleContext("//test:testing"); setRuleContext(ruleContext); Exception e = assertThrows(Exception.class, () -> eval("ruleContext.attr.dep[Actions]")); @@ -1926,7 +1926,7 @@ testingRuleDefinition); scratch.file("test/BUILD", simpleBuildDefinition); - SkylarkRuleContext ruleContext = createRuleContext("//test:testing"); + StarlarkRuleContext ruleContext = createRuleContext("//test:testing"); setRuleContext(ruleContext); update("file1", eval("ruleContext.attr.dep.out1")); update("file2", eval("ruleContext.attr.dep.out2")); @@ -1977,7 +1977,7 @@ ); scratch.file("test/BUILD", simpleBuildDefinition); - SkylarkRuleContext ruleContext = createRuleContext("//test:testing"); + StarlarkRuleContext ruleContext = createRuleContext("//test:testing"); setRuleContext(ruleContext); Object mapUnchecked = eval("ruleContext.attr.dep.v"); @@ -1994,7 +1994,7 @@ } @Test - public void testNoAccessToCreatedActionsWithoutSkylarkTest() throws Exception { + public void testNoAccessToCreatedActionsWithoutStarlarkTest() throws Exception { scratch.file("test/rules.bzl", getSimpleNontestableUnderTestDefinition( "ctx.actions.run_shell(outputs=[out], command='echo foo123 > ' + out.path)") @@ -2004,7 +2004,7 @@ "undertest_rule(", " name = 'undertest',", ")"); - SkylarkRuleContext ruleContext = createRuleContext("//test:undertest"); + StarlarkRuleContext ruleContext = createRuleContext("//test:undertest"); setRuleContext(ruleContext); Object result = eval("ruleContext.created_actions()"); @@ -2019,7 +2019,7 @@ testingRuleDefinition); scratch.file("test/BUILD", simpleBuildDefinition); - SkylarkRuleContext ruleContext = createRuleContext("//test:testing"); + StarlarkRuleContext ruleContext = createRuleContext("//test:testing"); setRuleContext(ruleContext); update("file", eval("ruleContext.attr.dep.files.to_list()[0]")); update("action", eval("ruleContext.attr.dep[Actions].by_file[file]")); @@ -2075,7 +2075,7 @@ ")", testingRuleDefinition); scratch.file("test/BUILD", simpleBuildDefinition); - SkylarkRuleContext ruleContext = createRuleContext("//test:testing"); + StarlarkRuleContext ruleContext = createRuleContext("//test:testing"); setRuleContext(ruleContext); Object mapUnchecked = eval("ruleContext.attr.dep.v"); @@ -2135,7 +2135,7 @@ testingRuleDefinition); scratch.file("test/BUILD", simpleBuildDefinition); - SkylarkRuleContext ruleContext = createRuleContext("//test:testing"); + StarlarkRuleContext ruleContext = createRuleContext("//test:testing"); setRuleContext(ruleContext); update("file", eval("ruleContext.attr.dep.files.to_list()[0]")); update("action", eval("ruleContext.attr.dep[Actions].by_file[file]")); @@ -2157,7 +2157,7 @@ "ctx.actions.write(output=out, content=args)"), testingRuleDefinition); scratch.file("test/BUILD", simpleBuildDefinition); - SkylarkRuleContext ruleContext = createRuleContext("//test:testing"); + StarlarkRuleContext ruleContext = createRuleContext("//test:testing"); setRuleContext(ruleContext); update("file", eval("ruleContext.attr.dep.files.to_list()[0]")); update("action", eval("ruleContext.attr.dep[Actions].by_file[file]")); @@ -2185,7 +2185,7 @@ "ctx.actions.write(output=out, content=args)"), testingRuleDefinition); scratch.file("test/BUILD", simpleBuildDefinition); - SkylarkRuleContext ruleContext = createRuleContext("//test:testing"); + StarlarkRuleContext ruleContext = createRuleContext("//test:testing"); setRuleContext(ruleContext); update("file", eval("ruleContext.attr.dep.files.to_list()[0]")); update("action", eval("ruleContext.attr.dep[Actions].by_file[file]")); @@ -2208,7 +2208,7 @@ "ctx.actions.write(output=out, content=args)"), testingRuleDefinition); scratch.file("test/BUILD", simpleBuildDefinition); - SkylarkRuleContext ruleContext = createRuleContext("//test:testing"); + StarlarkRuleContext ruleContext = createRuleContext("//test:testing"); setRuleContext(ruleContext); update("file", eval("ruleContext.attr.dep.files.to_list()[0]")); update("action", eval("ruleContext.attr.dep[Actions].by_file[file]")); @@ -2255,7 +2255,7 @@ " name = 'testing',", " dep = ':undertest',", ")"); - SkylarkRuleContext ruleContext = createRuleContext("//test:testing"); + StarlarkRuleContext ruleContext = createRuleContext("//test:testing"); setRuleContext(ruleContext); update("file", eval("ruleContext.attr.dep.files.to_list()[0]")); update("action", eval("ruleContext.attr.dep[Actions].by_file[file]")); @@ -2288,7 +2288,7 @@ public void testCoverageInstrumentedCoverageDisabled() throws Exception { setUpCoverageInstrumentedTest(); useConfiguration("--nocollect_code_coverage", "--instrumentation_filter=."); - SkylarkRuleContext ruleContext = createRuleContext("//test:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//test:foo"); setRuleContext(ruleContext); Object result = eval("ruleContext.coverage_instrumented()"); assertThat((Boolean) result).isFalse();
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleImplementationFunctionsTest.java similarity index 97% rename from src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java rename to src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleImplementationFunctionsTest.java index 64e465c..b24439d 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkRuleImplementationFunctionsTest.java
@@ -47,14 +47,14 @@ import com.google.devtools.build.lib.analysis.actions.TemplateExpansionAction; import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget; import com.google.devtools.build.lib.analysis.skylark.Args; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.packages.Provider; import com.google.devtools.build.lib.packages.StarlarkProvider; import com.google.devtools.build.lib.packages.StructImpl; -import com.google.devtools.build.lib.skylark.util.SkylarkTestCase; +import com.google.devtools.build.lib.skylark.util.StarlarkTestCase; import com.google.devtools.build.lib.skylarkinterface.Param; import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable; import com.google.devtools.build.lib.skylarkinterface.SkylarkGlobalLibrary; @@ -84,7 +84,7 @@ /** Tests for Starlark functions relating to rule implementation. */ @RunWith(JUnit4.class) @SkylarkGlobalLibrary // needed for CallUtils.getBuiltinCallable, sadly -public class SkylarkRuleImplementationFunctionsTest extends SkylarkTestCase { +public class StarlarkRuleImplementationFunctionsTest extends StarlarkTestCase { @Rule public ExpectedException thrown = ExpectedException.none(); @@ -160,7 +160,7 @@ ")"); } - private void setRuleContext(SkylarkRuleContext ctx) throws Exception { + private void setRuleContext(StarlarkRuleContext ctx) throws Exception { update("ruleContext", ctx); } @@ -179,7 +179,7 @@ return (StructImpl) configuredTarget.get(key); } - // Defines all @SkylarkCallable-annotated methods (mock, throw, ...) in the environment. + // Defines all @StarlarkCallable-annotated methods (mock, throw, ...) in the environment. private void defineTestMethods() throws Exception { ImmutableMap.Builder<String, Object> env = ImmutableMap.builder(); Starlark.addMethods(env, this); @@ -188,7 +188,7 @@ } } - private void checkSkylarkFunctionError(String errorSubstring, String line) throws Exception { + private void checkStarlarkFunctionError(String errorSubstring, String line) throws Exception { defineTestMethods(); EvalException e = assertThrows(EvalException.class, () -> exec(line)); assertThat(e).hasMessageThat().contains(errorSubstring); @@ -197,7 +197,7 @@ // TODO(adonovan): move these tests of the interpreter core into lib.syntax. @Test - public void testSkylarkFunctionPosArgs() throws Exception { + public void testStarlarkFunctionPosArgs() throws Exception { defineTestMethods(); exec("a = mock('a', 'b', mandatory_key='c')"); Map<?, ?> params = (Map<?, ?>) lookup("a"); @@ -208,7 +208,7 @@ } @Test - public void testSkylarkFunctionKwArgs() throws Exception { + public void testStarlarkFunctionKwArgs() throws Exception { defineTestMethods(); exec("a = mock(optional='b', mandatory='a', mandatory_key='c')"); Map<?, ?> params = (Map<?, ?>) lookup("a"); @@ -219,28 +219,28 @@ } @Test - public void testSkylarkFunctionTooFewArguments() throws Exception { - checkSkylarkFunctionError( + public void testStarlarkFunctionTooFewArguments() throws Exception { + checkStarlarkFunctionError( "missing 1 required positional argument: mandatory", "mock(mandatory_key='y')"); } @Test - public void testSkylarkFunctionTooManyArguments() throws Exception { - checkSkylarkFunctionError( + public void testStarlarkFunctionTooManyArguments() throws Exception { + checkStarlarkFunctionError( "mock() accepts no more than 2 positional arguments but got 3", "mock('a', 'b', 'c', mandatory_key='y')"); } @Test - public void testSkylarkFunctionAmbiguousArguments() throws Exception { - checkSkylarkFunctionError( + public void testStarlarkFunctionAmbiguousArguments() throws Exception { + checkStarlarkFunctionError( "mock() got multiple values for argument 'mandatory'", "mock('by position', mandatory='by_key', mandatory_key='c')"); } @Test public void testCreateSpawnActionCreatesSpawnAction() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); createTestSpawnAction(ruleContext); ActionAnalysisMetadata action = @@ -265,7 +265,7 @@ @Test public void testCreateSpawnActionArgumentsWithCommand() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); createTestSpawnAction(ruleContext); SpawnAction action = @@ -284,7 +284,7 @@ @Test public void testCreateSpawnActionArgumentsWithExecutable() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "ruleContext.actions.run(", @@ -304,7 +304,7 @@ @Test public void testCreateActionWithDepsetInput() throws Exception { // Same test as above, with depset as inputs. - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "ruleContext.actions.run(", @@ -335,7 +335,7 @@ @Test public void testCreateSpawnActionShellCommandList() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "ruleContext.actions.run_shell(", @@ -355,7 +355,7 @@ @Test public void testCreateSpawnActionEnvAndExecInfo() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "ruleContext.actions.run_shell(", @@ -384,7 +384,7 @@ "ruleContext.actions.run(outputs=[], bad_param = 'some text', executable = f)"); } - private Object createTestSpawnAction(SkylarkRuleContext ruleContext) throws Exception { + private Object createTestSpawnAction(StarlarkRuleContext ruleContext) throws Exception { setRuleContext(ruleContext); return eval( "ruleContext.actions.run_shell(", @@ -515,7 +515,7 @@ @Test public void testCreateFileAction() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "ruleContext.actions.write(", @@ -581,7 +581,7 @@ @Test public void testExpandLocation() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:bar"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:bar"); setRuleContext(ruleContext); // If there is only a single target, both "location" and "locations" should work @@ -614,7 +614,7 @@ /** Regression test to check that expand_location allows ${var} and $$. */ @Test public void testExpandLocationWithDollarSignsAndCurlys() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:bar"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:bar"); setRuleContext(ruleContext); assertThat((String) eval("ruleContext.expand_location('${abc} $(echo) $$ $')")) .isEqualTo("${abc} $(echo) $$ $"); @@ -732,7 +732,7 @@ @Test public void testResolveTools() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:resolve_me"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:resolve_me"); setRuleContext(ruleContext); exec( "inputs, input_manifests = ruleContext.resolve_tools(tools=ruleContext.attr.tools)", @@ -778,7 +778,7 @@ @Test public void testCreateTemplateAction() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "ruleContext.actions.expand_template(", @@ -814,7 +814,7 @@ byte[] bytesToDecode = {(byte) 0xC2, (byte) 0xA2, (byte) 0xC2, (byte) 0xA2}; Charset latin1 = StandardCharsets.ISO_8859_1; Charset utf8 = StandardCharsets.UTF_8; - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "ruleContext.actions.expand_template(", @@ -1805,7 +1805,7 @@ @Test public void testBinDirPath() throws Exception { - SkylarkRuleContext ctx = createRuleContext("//foo:bar"); + StarlarkRuleContext ctx = createRuleContext("//foo:bar"); setRuleContext(ctx); Object result = eval("ruleContext.bin_dir.path"); assertThat(result).isEqualTo(ctx.getConfiguration().getBinFragment().getPathString()); @@ -1828,7 +1828,7 @@ @Test public void testCodeCoverageConfigurationAccess() throws Exception { - SkylarkRuleContext ctx = createRuleContext("//foo:baz"); + StarlarkRuleContext ctx = createRuleContext("//foo:baz"); setRuleContext(ctx); boolean coverage = (Boolean) eval("ruleContext.configuration.coverage_enabled"); assertThat(ctx.getRuleContext().getConfiguration().isCodeCoverageEnabled()).isEqualTo(coverage); @@ -1893,7 +1893,7 @@ public void testStackTraceWithoutOriginalMessage() throws Exception { defineTestMethods(); checkEvalErrorContains( - "There Is No Message: SkylarkRuleImplementationFunctionsTest", "throw1()"); + "There Is No Message: StarlarkRuleImplementationFunctionsTest", "throw1()"); } @SkylarkCallable(name = "throw2", documented = false) @@ -2006,7 +2006,7 @@ @Test public void testArgsScalarAdd() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "args = ruleContext.actions.args()", @@ -2047,7 +2047,7 @@ @Test public void testArgsAddAll() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "args = ruleContext.actions.args()", @@ -2106,7 +2106,7 @@ @Test public void testArgsAddAllWithMapEach() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "def add_one(val): return str(val + 1)", @@ -2132,7 +2132,7 @@ @Test public void testOmitIfEmpty() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "def add_one(val): return str(val + 1)", @@ -2175,7 +2175,7 @@ @Test public void testUniquify() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "def add_one(val): return str(val + 1)", @@ -2200,7 +2200,7 @@ @Test public void testArgsAddJoined() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "def add_one(val): return str(val + 1)", @@ -2245,7 +2245,7 @@ @Test public void testMultipleLazyArgsMixedWithStrings() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "foo_args = ruleContext.actions.args()", @@ -2293,7 +2293,7 @@ @Test public void testWriteArgsToParamFile() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "args = ruleContext.actions.args()", @@ -2371,7 +2371,7 @@ @Test public void testMapEachAcceptsBuiltinFunction() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); // map_each accepts a non-Starlark built-in function such as str. exec("ruleContext.actions.args().add_all(['foo'], map_each = str)"); @@ -2379,7 +2379,7 @@ @Test public void testLazyArgMapEachThrowsError() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "args = ruleContext.actions.args()", @@ -2402,7 +2402,7 @@ @Test public void testLazyArgMapEachReturnsNone() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "args = ruleContext.actions.args()", @@ -2423,7 +2423,7 @@ @Test public void testLazyArgMapEachReturnsWrongType() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "args = ruleContext.actions.args()", @@ -2447,7 +2447,7 @@ @Test public void createShellWithLazyArgs() throws Exception { - SkylarkRuleContext ruleContext = createRuleContext("//foo:foo"); + StarlarkRuleContext ruleContext = createRuleContext("//foo:foo"); setRuleContext(ruleContext); exec( "args = ruleContext.actions.args()", @@ -2501,7 +2501,7 @@ } @Test - public void testConfigurationField_SkylarkSplitTransitionProhibited() throws Exception { + public void testConfigurationField_StarlarkSplitTransitionProhibited() throws Exception { scratch.file( "tools/whitelists/function_transition_whitelist/BUILD", "package_group(", @@ -2765,7 +2765,7 @@ } @Test - public void testSkylarkCustomCommandLineKeyComputation() throws Exception { + public void testStarlarkCustomCommandLineKeyComputation() throws Exception { setRuleContext(createRuleContext("//foo:foo")); ImmutableList.Builder<CommandLine> commandLines = ImmutableList.builder(); @@ -2934,7 +2934,7 @@ @Test public void testParamFileHasDirectoryAsInput() throws Exception { - SkylarkRuleContext ctx = createRuleContext("//foo:foo"); + StarlarkRuleContext ctx = createRuleContext("//foo:foo"); setRuleContext(ctx); exec( "args = ruleContext.actions.args()",
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkStringRepresentationsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkStringRepresentationsTest.java similarity index 87% rename from src/test/java/com/google/devtools/build/lib/skylark/SkylarkStringRepresentationsTest.java rename to src/test/java/com/google/devtools/build/lib/skylark/StarlarkStringRepresentationsTest.java index 0b1eb59..2225579 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkStringRepresentationsTest.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/StarlarkStringRepresentationsTest.java
@@ -27,14 +27,14 @@ /** Tests for string representations of Starlark objects. */ @RunWith(JUnit4.class) -public class SkylarkStringRepresentationsTest extends BuildViewTestCase { +public class StarlarkStringRepresentationsTest extends BuildViewTestCase { // Different ways to format objects, these suffixes are used in the `prepare_params` function private static final ImmutableList<String> SUFFIXES = ImmutableList.of("_str", "_repr", "_format", "_str_perc", "_repr_perc"); - private Object skylarkLoadingEval(String code) throws Exception { - return skylarkLoadingEval(code, ""); + private Object starlarkLoadingEval(String code) throws Exception { + return starlarkLoadingEval(code, ""); } /** @@ -43,7 +43,7 @@ * @param code The code to execute * @param definition Additional code to define necessary variables */ - private Object skylarkLoadingEval(String code, String definition) throws Exception { + private Object starlarkLoadingEval(String code, String definition) throws Exception { scratch.overwriteFile("eval/BUILD", "load(':eval.bzl', 'eval')", "eval(name='eval')"); scratch.overwriteFile( "eval/eval.bzl", @@ -69,7 +69,7 @@ * * @param code The code to execute */ - private Object skylarkLoadingEvalInBuildFile(String code) throws Exception { + private Object starlarkLoadingEvalInBuildFile(String code) throws Exception { scratch.overwriteFile("eval/BUILD", "load(':eval.bzl', 'eval')", String.format("eval(name='eval', param = %s)", code)); @@ -101,15 +101,15 @@ */ private void assertStringRepresentationInBuildFile( String expression, String representation) throws Exception { - assertThat(skylarkLoadingEvalInBuildFile(String.format("str(%s)", expression))) + assertThat(starlarkLoadingEvalInBuildFile(String.format("str(%s)", expression))) .isEqualTo(representation); - assertThat(skylarkLoadingEvalInBuildFile(String.format("repr(%s)", expression))) + assertThat(starlarkLoadingEvalInBuildFile(String.format("repr(%s)", expression))) .isEqualTo(representation); - assertThat(skylarkLoadingEvalInBuildFile(String.format("'%%s' %% (%s,)", expression))) + assertThat(starlarkLoadingEvalInBuildFile(String.format("'%%s' %% (%s,)", expression))) .isEqualTo(representation); - assertThat(skylarkLoadingEvalInBuildFile(String.format("'%%r' %% (%s,)", expression))) + assertThat(starlarkLoadingEvalInBuildFile(String.format("'%%r' %% (%s,)", expression))) .isEqualTo(representation); - assertThat(skylarkLoadingEvalInBuildFile(String.format("'{}'.format(%s)", expression))) + assertThat(starlarkLoadingEvalInBuildFile(String.format("'{}'.format(%s)", expression))) .isEqualTo(representation); } @@ -125,15 +125,15 @@ */ private void assertStringRepresentation( String definition, String expression, String representation) throws Exception { - assertThat(skylarkLoadingEval(String.format("str(%s)", expression), definition)) + assertThat(starlarkLoadingEval(String.format("str(%s)", expression), definition)) .isEqualTo(representation); - assertThat(skylarkLoadingEval(String.format("repr(%s)", expression), definition)) + assertThat(starlarkLoadingEval(String.format("repr(%s)", expression), definition)) .isEqualTo(representation); - assertThat(skylarkLoadingEval(String.format("'%%s' %% (%s,)", expression), definition)) + assertThat(starlarkLoadingEval(String.format("'%%s' %% (%s,)", expression), definition)) .isEqualTo(representation); - assertThat(skylarkLoadingEval(String.format("'%%r' %% (%s,)", expression), definition)) + assertThat(starlarkLoadingEval(String.format("'%%r' %% (%s,)", expression), definition)) .isEqualTo(representation); - assertThat(skylarkLoadingEval(String.format("'{}'.format(%s)", expression), definition)) + assertThat(starlarkLoadingEval(String.format("'{}'.format(%s)", expression), definition)) .isEqualTo(representation); } @@ -224,22 +224,22 @@ @Test public void testStringRepresentations_Strings() throws Exception { - assertThat(skylarkLoadingEval("str('foo')")).isEqualTo("foo"); - assertThat(skylarkLoadingEval("'%s' % 'foo'")).isEqualTo("foo"); - assertThat(skylarkLoadingEval("'{}'.format('foo')")).isEqualTo("foo"); - assertThat(skylarkLoadingEval("repr('foo')")).isEqualTo("\"foo\""); - assertThat(skylarkLoadingEval("'%r' % 'foo'")).isEqualTo("\"foo\""); + assertThat(starlarkLoadingEval("str('foo')")).isEqualTo("foo"); + assertThat(starlarkLoadingEval("'%s' % 'foo'")).isEqualTo("foo"); + assertThat(starlarkLoadingEval("'{}'.format('foo')")).isEqualTo("foo"); + assertThat(starlarkLoadingEval("repr('foo')")).isEqualTo("\"foo\""); + assertThat(starlarkLoadingEval("'%r' % 'foo'")).isEqualTo("\"foo\""); } @Test public void testStringRepresentations_Labels() throws Exception { - assertThat(skylarkLoadingEval("str(Label('//foo:bar'))")).isEqualTo("//foo:bar"); - assertThat(skylarkLoadingEval("'%s' % Label('//foo:bar')")).isEqualTo("//foo:bar"); - assertThat(skylarkLoadingEval("'{}'.format(Label('//foo:bar'))")).isEqualTo("//foo:bar"); - assertThat(skylarkLoadingEval("repr(Label('//foo:bar'))")).isEqualTo("Label(\"//foo:bar\")"); - assertThat(skylarkLoadingEval("'%r' % Label('//foo:bar')")).isEqualTo("Label(\"//foo:bar\")"); + assertThat(starlarkLoadingEval("str(Label('//foo:bar'))")).isEqualTo("//foo:bar"); + assertThat(starlarkLoadingEval("'%s' % Label('//foo:bar')")).isEqualTo("//foo:bar"); + assertThat(starlarkLoadingEval("'{}'.format(Label('//foo:bar'))")).isEqualTo("//foo:bar"); + assertThat(starlarkLoadingEval("repr(Label('//foo:bar'))")).isEqualTo("Label(\"//foo:bar\")"); + assertThat(starlarkLoadingEval("'%r' % Label('//foo:bar')")).isEqualTo("Label(\"//foo:bar\")"); - assertThat(skylarkLoadingEval("'{}'.format([Label('//foo:bar')])")) + assertThat(starlarkLoadingEval("'{}'.format([Label('//foo:bar')])")) .isEqualTo("[Label(\"//foo:bar\")]"); }
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java b/src/test/java/com/google/devtools/build/lib/skylark/util/StarlarkTestCase.java similarity index 88% rename from src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java rename to src/test/java/com/google/devtools/build/lib/skylark/util/StarlarkTestCase.java index e9913bf..81fe6eb 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/util/StarlarkTestCase.java
@@ -16,8 +16,8 @@ import com.google.common.collect.ImmutableMap; -import com.google.devtools.build.lib.analysis.skylark.SkylarkModules; -import com.google.devtools.build.lib.analysis.skylark.SkylarkRuleContext; +import com.google.devtools.build.lib.analysis.skylark.StarlarkModules; +import com.google.devtools.build.lib.analysis.skylark.StarlarkRuleContext; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.events.Event; @@ -36,11 +36,11 @@ * A class to contain the common functionality for analysis-phase Starlark tests. The less stuff * here, the better. */ -public abstract class SkylarkTestCase extends BuildViewTestCase { +public abstract class StarlarkTestCase extends BuildViewTestCase { protected EvaluationTestCase ev; - // Subclasses must call this method after change SkylarkSemantics (among other things). + // Subclasses must call this method after change StarlarkSemantics (among other things). @Before public final void reset() throws Exception { ev = createEvaluationTestCase(); @@ -49,7 +49,7 @@ private EvaluationTestCase createEvaluationTestCase() throws Exception { // Set up globals. ImmutableMap.Builder<String, Object> env = ImmutableMap.builder(); - SkylarkModules.addSkylarkGlobalsToBuilder(env); + StarlarkModules.addStarlarkGlobalsToBuilder(env); Starlark.addModule(env, new PlatformCommon()); Module globals = Module.createForBuiltins(env.build()); @@ -68,7 +68,7 @@ thread.setPrintHandler(Event.makeDebugPrintHandler(getEventHandler())); // This StarlarkThread has no PackageContext, so attempts to create a rule will fail. - // Rule creation is tested by SkylarkIntegrationTest. + // Rule creation is tested by StarlarkIntegrationTest. new BazelStarlarkContext( BazelStarlarkContext.Phase.LOADING, @@ -107,8 +107,8 @@ ev.checkEvalErrorContains(msg, input); } - protected final SkylarkRuleContext createRuleContext(String label) throws Exception { - return new SkylarkRuleContext( + protected final StarlarkRuleContext createRuleContext(String label) throws Exception { + return new StarlarkRuleContext( getRuleContextForStarlark(getConfiguredTarget(label)), null, getStarlarkSemantics()); }
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java index 52680ca..9896f18 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
@@ -17,7 +17,7 @@ import static org.junit.Assert.fail; import com.google.common.collect.ImmutableMap; -import com.google.devtools.build.lib.analysis.skylark.SkylarkModules; // a bad dependency +import com.google.devtools.build.lib.analysis.skylark.StarlarkModules; // a bad dependency import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventCollector; import com.google.devtools.build.lib.events.EventKind; @@ -68,12 +68,12 @@ /** * Returns a new thread using the semantics set by setSemantics(), the predeclared environment of - * SkylarkModules and prior calls to predeclared(), and a new mutability. Overridden by + * StarlarkModules and prior calls to predeclared(), and a new mutability. Overridden by * subclasses. */ public StarlarkThread newStarlarkThread() { ImmutableMap.Builder<String, Object> envBuilder = ImmutableMap.builder(); - SkylarkModules.addSkylarkGlobalsToBuilder(envBuilder); // TODO(adonovan): break bad dependency + StarlarkModules.addStarlarkGlobalsToBuilder(envBuilder); // TODO(adonovan): break bad dependency envBuilder.putAll(extraPredeclared); StarlarkThread thread = @@ -207,14 +207,14 @@ */ public final class Scenario { private final SetupActions setup = new SetupActions(); - private final String[] skylarkOptions; + private final String[] starlarkOptions; - public Scenario(String... skylarkOptions) { - this.skylarkOptions = skylarkOptions; + public Scenario(String... starlarkOptions) { + this.starlarkOptions = starlarkOptions; } private void run(Testable testable) throws Exception { - setSemantics(skylarkOptions); + setSemantics(starlarkOptions); testable.run(); }