Skylark -> Starlark for various methods, variables, constants, etc.
PiperOrigin-RevId: 312113900
diff --git a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
index bbf51b8..217182c 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/AbstractAction.java
@@ -523,17 +523,17 @@
}
@Override
- public Depset getSkylarkInputs() {
+ public Depset getStarlarkInputs() {
return Depset.of(Artifact.TYPE, getInputs());
}
@Override
- public Depset getSkylarkOutputs() {
+ public Depset getStarlarkOutputs() {
return Depset.of(Artifact.TYPE, NestedSetBuilder.wrap(Order.STABLE_ORDER, getOutputs()));
}
@Override
- public Sequence<String> getSkylarkArgv() throws EvalException {
+ public Sequence<String> getStarlarkArgv() throws EvalException {
return null;
}
@@ -544,12 +544,12 @@
}
@Override
- public String getSkylarkContent() throws IOException, EvalException {
+ public String getStarlarkContent() throws IOException, EvalException {
return null;
}
@Override
- public Dict<String, String> getSkylarkSubstitutions() {
+ public Dict<String, String> getStarlarkSubstitutions() {
return null;
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java
index dcc1b6e..69cf115 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisEnvironment.java
@@ -150,7 +150,7 @@
* Returns the options that affect the Starlark interpreter used for evaluating Starlark rule
* implementation functions.
*/
- StarlarkSemantics getSkylarkSemantics() throws InterruptedException;
+ StarlarkSemantics getStarlarkSemantics() throws InterruptedException;
/**
* Returns the Artifact that is used to hold the non-volatile workspace status for the current
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
index 737b351..e2522f1 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
@@ -358,7 +358,7 @@
}
@Override
- public StarlarkSemantics getSkylarkSemantics() throws InterruptedException {
+ public StarlarkSemantics getStarlarkSemantics() throws InterruptedException {
return PrecomputedValue.STARLARK_SEMANTICS.get(skyframeEnv);
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
index a753921..bf51cdb 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredTargetFactory.java
@@ -237,7 +237,7 @@
SourceArtifact artifact =
artifactFactory.getSourceArtifact(
inputFile.getExecPath(
- analysisEnvironment.getSkylarkSemantics().experimentalSiblingRepositoryLayout()),
+ analysisEnvironment.getStarlarkSemantics().experimentalSiblingRepositoryLayout()),
inputFile.getPackage().getSourceRoot().get(),
ConfiguredTargetKey.of(target.getLabel(), config));
return new InputFileConfiguredTarget(targetContext, inputFile, artifact);
@@ -470,7 +470,7 @@
rule.getRuleClassObject().getAdvertisedProviders(),
rule.getRuleClassObject().getConfiguredTargetFunction(),
rule.getLocation(),
- env.getSkylarkSemantics(),
+ env.getStarlarkSemantics(),
ruleClassProvider.getToolsRepository());
return target != null ? target : erroredConfiguredTarget(ruleContext);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/EmptyConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/EmptyConfiguredTarget.java
index d3b167d..798af73 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/EmptyConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/EmptyConfiguredTarget.java
@@ -33,12 +33,12 @@
@Nullable
@Override
- protected Info rawGetSkylarkProvider(Provider.Key providerKey) {
+ protected Info rawGetStarlarkProvider(Provider.Key providerKey) {
return null;
}
@Override
- protected Object rawGetSkylarkProvider(String providerKey) {
+ protected Object rawGetStarlarkProvider(String providerKey) {
return null;
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index 606e831..8beffa9 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -124,7 +124,7 @@
implements ActionConstructionContext, ActionRegistry, RuleErrorConsumer {
public boolean isAllowTagsPropagation() throws InterruptedException {
- return this.getAnalysisEnvironment().getSkylarkSemantics().experimentalAllowTagsPropagation();
+ return this.getAnalysisEnvironment().getStarlarkSemantics().experimentalAllowTagsPropagation();
}
/** Custom dependency validation logic. */
@@ -2030,7 +2030,7 @@
* build)
*/
public StarlarkSemantics getStarlarkSemantics() throws InterruptedException {
- return env.getSkylarkSemantics();
+ return env.getStarlarkSemantics();
}
/**
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java
index 7270acf..5cb26b4 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/FileWriteAction.java
@@ -222,7 +222,7 @@
}
@Override
- public String getSkylarkContent() {
+ public String getStarlarkContent() {
return getFileContents();
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/ParameterFileWriteAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/ParameterFileWriteAction.java
index de2a71f..39ac0462 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/ParameterFileWriteAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/ParameterFileWriteAction.java
@@ -122,7 +122,7 @@
}
@Override
- public String getSkylarkContent() throws IOException, EvalException {
+ public String getStarlarkContent() throws IOException, EvalException {
if (hasInputArtifactToExpand) {
// Tree artifact information isn't available at analysis time.
return null;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
index a2f5578..da11379 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/SpawnAction.java
@@ -256,7 +256,7 @@
}
@Override
- public Sequence<String> getSkylarkArgv() throws EvalException {
+ public Sequence<String> getStarlarkArgv() throws EvalException {
try {
return StarlarkList.immutableCopyOf(getArguments());
} catch (CommandLineExpansionException exception) {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionAction.java b/src/main/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionAction.java
index c4e3810..3744a60 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/actions/TemplateExpansionAction.java
@@ -138,7 +138,7 @@
}
@Override
- public String getSkylarkContent() throws IOException {
+ public String getStarlarkContent() throws IOException {
return getFileContents();
}
@@ -214,7 +214,7 @@
}
@Override
- public Dict<String, String> getSkylarkSubstitutions() {
+ public Dict<String, String> getStarlarkSubstitutions() {
ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
for (Substitution entry : substitutions) {
builder.put(entry.getKey(), entry.getValue());
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java
index 9766cbe..5d6951c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java
@@ -227,12 +227,12 @@
if (providerKey.equals(DefaultInfo.PROVIDER.getKey())) {
return getDefaultProvider();
}
- return rawGetSkylarkProvider(providerKey);
+ return rawGetStarlarkProvider(providerKey);
}
/** Implement in subclasses to get a Starlark provider for a given {@code providerKey}. */
@Nullable
- protected abstract Info rawGetSkylarkProvider(Provider.Key providerKey);
+ protected abstract Info rawGetStarlarkProvider(Provider.Key providerKey);
public String getRuleClassString() {
return "";
@@ -253,12 +253,12 @@
case OutputGroupInfo.SKYLARK_NAME:
return get(OutputGroupInfo.SKYLARK_CONSTRUCTOR);
default:
- return rawGetSkylarkProvider(providerKey);
+ return rawGetStarlarkProvider(providerKey);
}
}
/** Implement in subclasses to get a Starlark provider for a given {@code providerKey}. */
- protected abstract Object rawGetSkylarkProvider(String providerKey);
+ protected abstract Object rawGetStarlarkProvider(String providerKey);
// All main target classes must override this method to provide more descriptive strings.
// Exceptions are currently EnvironmentGroupConfiguredTarget and PackageGroupConfiguredTarget.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/EnvironmentGroupConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/EnvironmentGroupConfiguredTarget.java
index ad3b159..3630d09 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/EnvironmentGroupConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/EnvironmentGroupConfiguredTarget.java
@@ -41,12 +41,12 @@
}
@Override
- protected Info rawGetSkylarkProvider(Provider.Key providerKey) {
+ protected Info rawGetStarlarkProvider(Provider.Key providerKey) {
return null;
}
@Override
- protected Object rawGetSkylarkProvider(String providerKey) {
+ protected Object rawGetStarlarkProvider(String providerKey) {
return null;
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/FileConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/FileConfiguredTarget.java
index 853b909..980bff5 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/FileConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/FileConfiguredTarget.java
@@ -113,12 +113,12 @@
}
@Override
- protected Info rawGetSkylarkProvider(Provider.Key providerKey) {
+ protected Info rawGetStarlarkProvider(Provider.Key providerKey) {
return providers.get(providerKey);
}
@Override
- protected Object rawGetSkylarkProvider(String providerKey) {
+ protected Object rawGetStarlarkProvider(String providerKey) {
return providers.get(providerKey);
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
index 5d44784..6578ba3 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
@@ -92,7 +92,7 @@
}
@Override
- protected Info rawGetSkylarkProvider(Provider.Key providerKey) {
+ protected Info rawGetStarlarkProvider(Provider.Key providerKey) {
Info provider = nonBaseProviders.get(providerKey);
if (provider == null) {
provider = base.get(providerKey);
@@ -101,7 +101,7 @@
}
@Override
- protected Object rawGetSkylarkProvider(String providerKey) {
+ protected Object rawGetStarlarkProvider(String providerKey) {
if (providerKey.equals(AbstractConfiguredTarget.ACTIONS_FIELD_NAME)) {
ImmutableList.Builder<ActionAnalysisMetadata> actions = ImmutableList.builder();
// Only expose actions which are SkylarkValues.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/PackageGroupConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/PackageGroupConfiguredTarget.java
index 2d58c7f..decdf6e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/PackageGroupConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/PackageGroupConfiguredTarget.java
@@ -107,12 +107,12 @@
}
@Override
- protected Info rawGetSkylarkProvider(Provider.Key providerKey) {
+ protected Info rawGetStarlarkProvider(Provider.Key providerKey) {
return null;
}
@Override
- protected Object rawGetSkylarkProvider(String providerKey) {
+ protected Object rawGetStarlarkProvider(String providerKey) {
return null;
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java
index 4180582..e02f660 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java
@@ -195,12 +195,12 @@
}
@Override
- protected Info rawGetSkylarkProvider(Provider.Key providerKey) {
+ protected Info rawGetStarlarkProvider(Provider.Key providerKey) {
return providers.get(providerKey);
}
@Override
- protected Object rawGetSkylarkProvider(String providerKey) {
+ protected Object rawGetStarlarkProvider(String providerKey) {
if (providerKey.equals(ACTIONS_FIELD_NAME)) {
// Only expose actions which are legitimate Starlark values, otherwise they will later
// cause a Bazel crash.
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 e98aa88..13a427e 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
@@ -148,9 +148,9 @@
}
@Override
- public CcCompilationOutputs createCompilationOutputsFromSkylark(
+ public CcCompilationOutputs createCompilationOutputsFromStarlark(
Object objectsObject, Object picObjectsObject) throws EvalException {
- return super.createCompilationOutputsFromSkylark(objectsObject, picObjectsObject);
+ return super.createCompilationOutputsFromStarlark(objectsObject, picObjectsObject);
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/ninja/actions/NinjaGraph.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/ninja/actions/NinjaGraph.java
index 4ce6857..6ff13bf 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/ninja/actions/NinjaGraph.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/ninja/actions/NinjaGraph.java
@@ -72,7 +72,7 @@
@Override
public ConfiguredTarget create(RuleContext ruleContext)
throws InterruptedException, RuleErrorException, ActionConflictException {
- if (!ruleContext.getAnalysisEnvironment().getSkylarkSemantics().experimentalNinjaActions()) {
+ if (!ruleContext.getAnalysisEnvironment().getStarlarkSemantics().experimentalNinjaActions()) {
throw ruleContext.throwWithRuleError(
"Usage of ninja_graph is only allowed with --experimental_ninja_actions flag");
}
diff --git a/src/main/java/com/google/devtools/build/lib/collect/nestedset/Depset.java b/src/main/java/com/google/devtools/build/lib/collect/nestedset/Depset.java
index 0f0a125..3718d67 100644
--- a/src/main/java/com/google/devtools/build/lib/collect/nestedset/Depset.java
+++ b/src/main/java/com/google/devtools/build/lib/collect/nestedset/Depset.java
@@ -325,7 +325,7 @@
Order order = getOrder();
if (order != Order.STABLE_ORDER) {
printer.append(", order = ");
- printer.repr(order.getSkylarkName());
+ printer.repr(order.getStarlarkName());
}
printer.append(")");
}
@@ -389,7 +389,7 @@
if (!order.isCompatible(x.getOrder())) {
throw Starlark.errorf(
"Order '%s' is incompatible with order '%s'",
- order.getSkylarkName(), x.getOrder().getSkylarkName());
+ order.getStarlarkName(), x.getOrder().getStarlarkName());
}
builder.addTransitive(x.getSet());
}
diff --git a/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetBuilder.java b/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetBuilder.java
index 7ccbabf..5d9a663 100644
--- a/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetBuilder.java
@@ -138,7 +138,9 @@
Preconditions.checkNotNull(subset);
Preconditions.checkArgument(
order.isCompatible(subset.getOrder()),
- "Order mismatch: %s != %s", subset.getOrder().getSkylarkName(), order.getSkylarkName());
+ "Order mismatch: %s != %s",
+ subset.getOrder().getStarlarkName(),
+ order.getStarlarkName());
if (!subset.isEmpty()) {
if (transitiveSets == null) {
transitiveSets = CompactHashSet.create();
diff --git a/src/main/java/com/google/devtools/build/lib/collect/nestedset/Order.java b/src/main/java/com/google/devtools/build/lib/collect/nestedset/Order.java
index 078238a..2fd21f6 100644
--- a/src/main/java/com/google/devtools/build/lib/collect/nestedset/Order.java
+++ b/src/main/java/com/google/devtools/build/lib/collect/nestedset/Order.java
@@ -109,11 +109,11 @@
private static final ImmutableMap<String, Order> VALUES;
private static final Order[] ORDINALS;
- private final String skylarkName;
+ private final String starlarkName;
private final NestedSet<?> emptySet;
- private Order(String skylarkName) {
- this.skylarkName = skylarkName;
+ private Order(String starlarkName) {
+ this.starlarkName = starlarkName;
this.emptySet = new NestedSet<>(this);
}
@@ -148,8 +148,8 @@
return (NestedSet<E>) emptySet;
}
- public String getSkylarkName() {
- return skylarkName;
+ public String getStarlarkName() {
+ return starlarkName;
}
/**
@@ -185,7 +185,7 @@
HashMap<String, Order> entries = Maps.newHashMapWithExpectedSize(ORDINALS.length);
for (Order current : ORDINALS) {
- entries.put(current.getSkylarkName(), current);
+ entries.put(current.getStarlarkName(), current);
}
VALUES = ImmutableMap.copyOf(entries);
diff --git a/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java b/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
index ebb6e77..2797f0d 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
@@ -250,7 +250,7 @@
* @param rule a rule instance to get tags from
* @param allowTagsPropagation if set to true, tags will be propagated from a target to the
* actions' execution requirements, for more details {@see
- * SkylarkSematicOptions#experimentalAllowTagsPropagation}
+ * StarlarkSemanticsOptions#experimentalAllowTagsPropagation}
*/
public static ImmutableMap<String, String> getExecutionInfo(
Rule rule, boolean allowTagsPropagation) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java
index 954cb9e..847ee47 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/ArtifactCategory.java
@@ -44,13 +44,13 @@
// the options passed to the clif_matcher.
CLIF_OUTPUT_PROTO("", ".opb");
- private static final ArtifactCategory[] ALLOWED_FROM_SKYLARK = {
+ private static final ArtifactCategory[] ALLOWED_FROM_STARLARK = {
STATIC_LIBRARY, ALWAYSLINK_STATIC_LIBRARY, DYNAMIC_LIBRARY, INTERFACE_LIBRARY
};
private final String defaultPrefix;
private final String defaultExtension;
- private final String skylarkName;
+ private final String starlarkName;
// The extensions allowed for this artifact name pattern, Bazel should recognized them as
// corresponding file type in CppFileTypes.java
final ImmutableList<String> allowedExtensions;
@@ -67,17 +67,17 @@
.add(extraAllowedExtensions)
.build();
- this.skylarkName = toString().toLowerCase();
+ this.starlarkName = toString().toLowerCase();
}
- public String getSkylarkName() {
- return skylarkName;
+ public String getStarlarkName() {
+ return starlarkName;
}
public static ArtifactCategory fromString(
- String skylarkName, Location location, String fieldForError) throws EvalException {
- for (ArtifactCategory registerActions : ALLOWED_FROM_SKYLARK) {
- if (registerActions.getSkylarkName().equals(skylarkName)) {
+ String starlarkName, Location location, String fieldForError) throws EvalException {
+ for (ArtifactCategory registerActions : ALLOWED_FROM_STARLARK) {
+ if (registerActions.getStarlarkName().equals(starlarkName)) {
return registerActions;
}
}
@@ -88,8 +88,8 @@
fieldForError,
Joiner.on(", ")
.join(
- Arrays.stream(ALLOWED_FROM_SKYLARK)
- .map(ArtifactCategory::getSkylarkName)
+ Arrays.stream(ALLOWED_FROM_STARLARK)
+ .map(ArtifactCategory::getStarlarkName)
.collect(ImmutableList.toImmutableList()))));
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
index de4c76c..16335d2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java
@@ -294,7 +294,7 @@
if (ruleContext.attributes().isAttributeValueExplicitlySpecified("dynamic_deps")) {
if (!ruleContext
.getAnalysisEnvironment()
- .getSkylarkSemantics()
+ .getStarlarkSemantics()
.experimentalCcSharedLibrary()) {
ruleContext.ruleError(
"The attribute 'dynamic_deps' can only be used with the flag"
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 d6dfbff..5a52c0c 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
@@ -209,7 +209,7 @@
Label label = ruleClass.getRuleDefinitionEnvironmentLabel();
if (label != null) {
checkLocationWhitelisted(
- context.getAnalysisEnvironment().getSkylarkSemantics(),
+ context.getAnalysisEnvironment().getStarlarkSemantics(),
rule.getLocation(),
label.getPackageFragment().toString());
}
@@ -605,7 +605,7 @@
.getExecPath(
ruleContext
.getAnalysisEnvironment()
- .getSkylarkSemantics()
+ .getStarlarkSemantics()
.experimentalSiblingRepositoryLayout());
result.add(rulePackage);
@@ -622,7 +622,7 @@
.getExecPath(
ruleContext
.getAnalysisEnvironment()
- .getSkylarkSemantics()
+ .getStarlarkSemantics()
.experimentalSiblingRepositoryLayout());
// For now, anything with an 'includes' needs a blanket declaration
result.add(packageFragment.getRelative("**"));
@@ -634,7 +634,7 @@
boolean siblingRepositoryLayout =
ruleContext
.getAnalysisEnvironment()
- .getSkylarkSemantics()
+ .getStarlarkSemantics()
.experimentalSiblingRepositoryLayout();
List<PathFragment> result = new ArrayList<>();
PackageIdentifier packageIdentifier = ruleContext.getLabel().getPackageIdentifier();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
index c08b3c7..0554a9c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
@@ -950,7 +950,7 @@
boolean siblingRepositoryLayout =
actionConstructionContext
.getAnalysisEnvironment()
- .getSkylarkSemantics()
+ .getStarlarkSemantics()
.experimentalSiblingRepositoryLayout();
PathFragment repositoryPath =
label.getPackageIdentifier().getRepository().getExecPath(siblingRepositoryLayout);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java
index c5a8a8d..fff9050 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationOutputs.java
@@ -104,7 +104,7 @@
}
@Override
- public Sequence<Artifact> getSkylarkObjectFiles(boolean usePic, StarlarkThread thread)
+ public Sequence<Artifact> getStarlarkObjectFiles(boolean usePic, StarlarkThread thread)
throws EvalException {
CcCommon.checkLocationWhitelisted(
thread.getSemantics(),
@@ -117,12 +117,12 @@
}
@Override
- public Sequence<Artifact> getSkylarkObjects() throws EvalException {
+ public Sequence<Artifact> getStarlarkObjects() throws EvalException {
return StarlarkList.immutableCopyOf(getObjectFiles(/* usePic= */ false));
}
@Override
- public Sequence<Artifact> getSkylarkPicObjects() throws EvalException {
+ public Sequence<Artifact> getStarlarkPicObjects() throws EvalException {
return StarlarkList.immutableCopyOf(getObjectFiles(/* usePic= */ true));
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingContext.java
index 7ed4b1c..ed5b613 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingContext.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLinkingContext.java
@@ -429,17 +429,17 @@
}
@Override
- public Depset getSkylarkLinkerInputs() {
+ public Depset getStarlarkLinkerInputs() {
return Depset.of(LinkerInput.TYPE, linkerInputs);
}
@Override
- public Sequence<String> getSkylarkUserLinkFlags() {
+ public Sequence<String> getStarlarkUserLinkFlags() {
return StarlarkList.immutableCopyOf(getFlattenedUserLinkFlags());
}
@Override
- public Object getSkylarkLibrariesToLink(StarlarkSemantics semantics) {
+ public Object getStarlarkLibrariesToLink(StarlarkSemantics semantics) {
// TODO(plf): Flag can be removed already.
if (semantics.incompatibleDepsetForLibrariesToLinkGetter()) {
return Depset.of(LibraryToLink.TYPE, getLibraries());
@@ -449,7 +449,7 @@
}
@Override
- public Depset getSkylarkNonCodeInputs() {
+ public Depset getStarlarkNonCodeInputs() {
return Depset.of(Artifact.TYPE, getNonCodeInputs());
}
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 205f90a..fe2212b 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
@@ -342,9 +342,9 @@
/** Converts an object that can be ether Depset or None into NestedSet. */
protected NestedSet<String> asStringNestedSet(Object o) throws Depset.TypeException {
- Depset skylarkNestedSet = convertFromNoneable(o, /* defaultValue= */ (Depset) null);
- if (skylarkNestedSet != null) {
- return skylarkNestedSet.getSet(String.class);
+ Depset starlarkNestedSet = convertFromNoneable(o, /* defaultValue= */ (Depset) null);
+ if (starlarkNestedSet != null) {
+ return starlarkNestedSet.getSet(String.class);
} else {
return NestedSetBuilder.emptySet(Order.STABLE_ORDER);
}
@@ -352,10 +352,10 @@
/** Converts an object that can be either Sequence, or None into ImmutableList. */
protected ImmutableList<String> asStringImmutableList(Object o) {
- Sequence<String> skylarkList =
+ Sequence<String> starlarkList =
convertFromNoneable(o, /* defaultValue= */ (Sequence<String>) null);
- if (skylarkList != null) {
- return skylarkList.getImmutableList();
+ if (starlarkList != null) {
+ return starlarkList.getImmutableList();
} else {
return ImmutableList.of();
}
@@ -376,7 +376,7 @@
* This method returns a {@link LibraryToLink} object that will be used to contain linking
* artifacts and information for a single library that will later be used by a linking action.
*
- * @param actionsObject SkylarkActionFactory
+ * @param actionsObject StarlarkActionFactory
* @param featureConfigurationObject FeatureConfiguration
* @param staticLibraryObject Artifact
* @param picStaticLibraryObject Artifact
@@ -403,7 +403,7 @@
String interfaceLibraryPath,
StarlarkThread thread)
throws EvalException, InterruptedException {
- StarlarkActionFactory skylarkActionFactory =
+ StarlarkActionFactory starlarkActionFactory =
nullIfNone(actionsObject, StarlarkActionFactory.class);
FeatureConfigurationForStarlark featureConfiguration =
nullIfNone(featureConfigurationObject, FeatureConfigurationForStarlark.class);
@@ -508,16 +508,16 @@
}
dynamicLibrary =
SolibSymlinkAction.getDynamicLibrarySymlink(
- skylarkActionFactory.asActionRegistry(skylarkActionFactory),
- skylarkActionFactory.getActionConstructionContext(),
+ starlarkActionFactory.asActionRegistry(starlarkActionFactory),
+ starlarkActionFactory.getActionConstructionContext(),
ccToolchainProvider.getSolibDirectory(),
dynamicLibrary,
dynamicLibraryPathFragment);
} else {
dynamicLibrary =
SolibSymlinkAction.getDynamicLibrarySymlink(
- skylarkActionFactory.asActionRegistry(skylarkActionFactory),
- skylarkActionFactory.getActionConstructionContext(),
+ starlarkActionFactory.asActionRegistry(starlarkActionFactory),
+ starlarkActionFactory.getActionConstructionContext(),
ccToolchainProvider.getSolibDirectory(),
dynamicLibrary,
/* preserveName= */ true,
@@ -534,8 +534,9 @@
}
interfaceLibrary =
SolibSymlinkAction.getDynamicLibrarySymlink(
- /* actionRegistry= */ skylarkActionFactory.asActionRegistry(skylarkActionFactory),
- /* actionConstructionContext= */ skylarkActionFactory
+ /* actionRegistry= */ starlarkActionFactory.asActionRegistry(
+ starlarkActionFactory),
+ /* actionConstructionContext= */ starlarkActionFactory
.getActionConstructionContext(),
ccToolchainProvider.getSolibDirectory(),
interfaceLibrary,
@@ -543,8 +544,9 @@
} else {
interfaceLibrary =
SolibSymlinkAction.getDynamicLibrarySymlink(
- /* actionRegistry= */ skylarkActionFactory.asActionRegistry(skylarkActionFactory),
- /* actionConstructionContext= */ skylarkActionFactory
+ /* actionRegistry= */ starlarkActionFactory.asActionRegistry(
+ starlarkActionFactory),
+ /* actionConstructionContext= */ starlarkActionFactory
.getActionConstructionContext(),
ccToolchainProvider.getSolibDirectory(),
interfaceLibrary,
@@ -766,11 +768,11 @@
}
@Override
- public CcToolchainConfigInfo ccToolchainConfigInfoFromSkylark(
+ public CcToolchainConfigInfo ccToolchainConfigInfoFromStarlark(
StarlarkRuleContext starlarkRuleContext,
- Sequence<?> features, // <SkylarkInfo> expected
- Sequence<?> actionConfigs, // <SkylarkInfo> expected
- Sequence<?> artifactNamePatterns, // <SkylarkInfo> expected
+ Sequence<?> features, // <StarlarkInfo> expected
+ Sequence<?> actionConfigs, // <StarlarkInfo> expected
+ Sequence<?> artifactNamePatterns, // <StarlarkInfo> expected
Sequence<?> cxxBuiltInIncludeDirectoriesUnchecked, // <String> expected
String toolchainIdentifier,
String hostSystemName,
@@ -780,8 +782,8 @@
String compiler,
String abiVersion,
String abiLibcVersion,
- Sequence<?> toolPaths, // <SkylarkInfo> expected
- Sequence<?> makeVariables, // <SkylarkInfo> expected
+ Sequence<?> toolPaths, // <StarlarkInfo> expected
+ Sequence<?> makeVariables, // <StarlarkInfo> expected
Object builtinSysroot,
Object ccTargetOs)
throws EvalException {
@@ -792,8 +794,8 @@
ImmutableList.Builder<Feature> featureBuilder = ImmutableList.builder();
for (Object feature : features) {
- checkRightSkylarkInfoProvider(feature, "features", "FeatureInfo");
- featureBuilder.add(featureFromSkylark((StarlarkInfo) feature));
+ checkRightStarlarkInfoProvider(feature, "features", "FeatureInfo");
+ featureBuilder.add(featureFromStarlark((StarlarkInfo) feature));
}
ImmutableList<Feature> featureList = featureBuilder.build();
@@ -804,8 +806,8 @@
ImmutableList.Builder<ActionConfig> actionConfigBuilder = ImmutableList.builder();
for (Object actionConfig : actionConfigs) {
- checkRightSkylarkInfoProvider(actionConfig, "action_configs", "ActionConfigInfo");
- actionConfigBuilder.add(actionConfigFromSkylark((StarlarkInfo) actionConfig));
+ checkRightStarlarkInfoProvider(actionConfig, "action_configs", "ActionConfigInfo");
+ actionConfigBuilder.add(actionConfigFromStarlark((StarlarkInfo) actionConfig));
}
ImmutableList<ActionConfig> actionConfigList = actionConfigBuilder.build();
@@ -816,10 +818,10 @@
ImmutableList.Builder<ArtifactNamePattern> artifactNamePatternBuilder = ImmutableList.builder();
for (Object artifactNamePattern : artifactNamePatterns) {
- checkRightSkylarkInfoProvider(
+ checkRightStarlarkInfoProvider(
artifactNamePattern, "artifact_name_patterns", "ArtifactNamePatternInfo");
artifactNamePatternBuilder.add(
- artifactNamePatternFromSkylark((StarlarkInfo) artifactNamePattern));
+ artifactNamePatternFromStarlark((StarlarkInfo) artifactNamePattern));
}
getLegacyArtifactNamePatterns(artifactNamePatternBuilder);
@@ -827,8 +829,8 @@
// Pairs (toolName, toolPath)
ImmutableList.Builder<Pair<String, String>> toolPathPairs = ImmutableList.builder();
for (Object toolPath : toolPaths) {
- checkRightSkylarkInfoProvider(toolPath, "tool_paths", "ToolPathInfo");
- Pair<String, String> toolPathPair = toolPathFromSkylark((StarlarkInfo) toolPath);
+ checkRightStarlarkInfoProvider(toolPath, "tool_paths", "ToolPathInfo");
+ Pair<String, String> toolPathPair = toolPathFromStarlark((StarlarkInfo) toolPath);
toolPathPairs.add(toolPathPair);
}
ImmutableList<Pair<String, String>> toolPathList = toolPathPairs.build();
@@ -933,8 +935,8 @@
ImmutableList.Builder<Pair<String, String>> makeVariablePairs = ImmutableList.builder();
for (Object makeVariable : makeVariables) {
- checkRightSkylarkInfoProvider(makeVariable, "make_variables", "MakeVariableInfo");
- Pair<String, String> makeVariablePair = makeVariableFromSkylark((StarlarkInfo) makeVariable);
+ checkRightStarlarkInfoProvider(makeVariable, "make_variables", "MakeVariableInfo");
+ Pair<String, String> makeVariablePair = makeVariableFromStarlark((StarlarkInfo) makeVariable);
makeVariablePairs.add(makeVariablePair);
}
@@ -957,7 +959,7 @@
convertFromNoneable(ccTargetOs, /* defaultValue= */ ""));
}
- private static void checkRightSkylarkInfoProvider(
+ private static void checkRightStarlarkInfoProvider(
Object o, String parameterName, String expectedProvider) throws EvalException {
if (!(o instanceof StarlarkInfo)) {
throw Starlark.errorf(
@@ -993,10 +995,11 @@
/** Creates a {@link Feature} from a {@link StarlarkInfo}. */
@VisibleForTesting
- static Feature featureFromSkylark(StarlarkInfo featureStruct) throws EvalException {
+ static Feature featureFromStarlark(StarlarkInfo featureStruct) throws EvalException {
checkRightProviderType(featureStruct, "feature");
- String name = getMandatoryFieldFromSkylarkProvider(featureStruct, "name", String.class);
- Boolean enabled = getMandatoryFieldFromSkylarkProvider(featureStruct, "enabled", Boolean.class);
+ String name = getMandatoryFieldFromStarlarkProvider(featureStruct, "name", String.class);
+ Boolean enabled =
+ getMandatoryFieldFromStarlarkProvider(featureStruct, "enabled", Boolean.class);
if (name == null || (name.isEmpty() && !enabled)) {
throw new EvalException(
featureStruct.getCreationLoc(),
@@ -1014,9 +1017,9 @@
ImmutableList.Builder<FlagSet> flagSetBuilder = ImmutableList.builder();
ImmutableList<StarlarkInfo> flagSets =
- getSkylarkProviderListFromSkylarkField(featureStruct, "flag_sets");
+ getStarlarkProviderListFromStarlarkField(featureStruct, "flag_sets");
for (StarlarkInfo flagSetObject : flagSets) {
- FlagSet flagSet = flagSetFromSkylark(flagSetObject, /* actionName= */ null);
+ FlagSet flagSet = flagSetFromStarlark(flagSetObject, /* actionName= */ null);
if (flagSet.getActions().isEmpty()) {
throw new EvalException(
flagSetObject.getCreationLoc(),
@@ -1027,29 +1030,30 @@
ImmutableList.Builder<EnvSet> envSetBuilder = ImmutableList.builder();
ImmutableList<StarlarkInfo> envSets =
- getSkylarkProviderListFromSkylarkField(featureStruct, "env_sets");
+ getStarlarkProviderListFromStarlarkField(featureStruct, "env_sets");
for (StarlarkInfo envSet : envSets) {
- envSetBuilder.add(envSetFromSkylark(envSet));
+ envSetBuilder.add(envSetFromStarlark(envSet));
}
ImmutableList.Builder<ImmutableSet<String>> requiresBuilder = ImmutableList.builder();
ImmutableList<StarlarkInfo> requires =
- getSkylarkProviderListFromSkylarkField(featureStruct, "requires");
+ getStarlarkProviderListFromStarlarkField(featureStruct, "requires");
for (StarlarkInfo featureSetStruct : requires) {
if (!"feature_set".equals(featureSetStruct.getValue("type_name"))) { // getValue() may be null
throw new EvalException(
featureStruct.getCreationLoc(), "expected object of type 'feature_set'.");
}
ImmutableSet<String> featureSet =
- getStringSetFromSkylarkProviderField(featureSetStruct, "features");
+ getStringSetFromStarlarkProviderField(featureSetStruct, "features");
requiresBuilder.add(featureSet);
}
- ImmutableList<String> implies = getStringListFromSkylarkProviderField(featureStruct, "implies");
+ ImmutableList<String> implies =
+ getStringListFromStarlarkProviderField(featureStruct, "implies");
ImmutableList<String> provides =
- getStringListFromSkylarkProviderField(featureStruct, "provides");
+ getStringListFromStarlarkProviderField(featureStruct, "provides");
return new Feature(
name,
@@ -1067,11 +1071,11 @@
* StarlarkInfo}.
*/
@VisibleForTesting
- static Pair<String, String> makeVariableFromSkylark(StarlarkInfo makeVariableStruct)
+ static Pair<String, String> makeVariableFromStarlark(StarlarkInfo makeVariableStruct)
throws EvalException {
checkRightProviderType(makeVariableStruct, "make_variable");
- String name = getMandatoryFieldFromSkylarkProvider(makeVariableStruct, "name", String.class);
- String value = getMandatoryFieldFromSkylarkProvider(makeVariableStruct, "value", String.class);
+ String name = getMandatoryFieldFromStarlarkProvider(makeVariableStruct, "name", String.class);
+ String value = getMandatoryFieldFromStarlarkProvider(makeVariableStruct, "value", String.class);
if (name == null || name.isEmpty()) {
throw new EvalException(
makeVariableStruct.getCreationLoc(),
@@ -1091,11 +1095,11 @@
* StarlarkInfo}.
*/
@VisibleForTesting
- static Pair<String, String> toolPathFromSkylark(StarlarkInfo toolPathStruct)
+ static Pair<String, String> toolPathFromStarlark(StarlarkInfo toolPathStruct)
throws EvalException {
checkRightProviderType(toolPathStruct, "tool_path");
- String name = getMandatoryFieldFromSkylarkProvider(toolPathStruct, "name", String.class);
- String path = getMandatoryFieldFromSkylarkProvider(toolPathStruct, "path", String.class);
+ String name = getMandatoryFieldFromStarlarkProvider(toolPathStruct, "name", String.class);
+ String path = getMandatoryFieldFromStarlarkProvider(toolPathStruct, "path", String.class);
if (name == null || name.isEmpty()) {
throw new EvalException(
toolPathStruct.getCreationLoc(),
@@ -1111,13 +1115,13 @@
/** Creates a {@link VariableWithValue} from a {@link StarlarkInfo}. */
@VisibleForTesting
- static VariableWithValue variableWithValueFromSkylark(StarlarkInfo variableWithValueStruct)
+ static VariableWithValue variableWithValueFromStarlark(StarlarkInfo variableWithValueStruct)
throws EvalException {
checkRightProviderType(variableWithValueStruct, "variable_with_value");
String name =
- getMandatoryFieldFromSkylarkProvider(variableWithValueStruct, "name", String.class);
+ getMandatoryFieldFromStarlarkProvider(variableWithValueStruct, "name", String.class);
String value =
- getMandatoryFieldFromSkylarkProvider(variableWithValueStruct, "value", String.class);
+ getMandatoryFieldFromStarlarkProvider(variableWithValueStruct, "value", String.class);
if (name == null || name.isEmpty()) {
throw new EvalException(
variableWithValueStruct.getCreationLoc(),
@@ -1133,10 +1137,10 @@
/** Creates an {@link EnvEntry} from a {@link StarlarkInfo}. */
@VisibleForTesting
- static EnvEntry envEntryFromSkylark(StarlarkInfo envEntryStruct) throws EvalException {
+ static EnvEntry envEntryFromStarlark(StarlarkInfo envEntryStruct) throws EvalException {
checkRightProviderType(envEntryStruct, "env_entry");
- String key = getMandatoryFieldFromSkylarkProvider(envEntryStruct, "key", String.class);
- String value = getMandatoryFieldFromSkylarkProvider(envEntryStruct, "value", String.class);
+ String key = getMandatoryFieldFromStarlarkProvider(envEntryStruct, "key", String.class);
+ String value = getMandatoryFieldFromStarlarkProvider(envEntryStruct, "value", String.class);
if (key == null || key.isEmpty()) {
throw new EvalException(
envEntryStruct.getCreationLoc(),
@@ -1153,57 +1157,57 @@
/** Creates a {@link WithFeatureSet} from a {@link StarlarkInfo}. */
@VisibleForTesting
- static WithFeatureSet withFeatureSetFromSkylark(StarlarkInfo withFeatureSetStruct)
+ static WithFeatureSet withFeatureSetFromStarlark(StarlarkInfo withFeatureSetStruct)
throws EvalException {
checkRightProviderType(withFeatureSetStruct, "with_feature_set");
ImmutableSet<String> features =
- getStringSetFromSkylarkProviderField(withFeatureSetStruct, "features");
+ getStringSetFromStarlarkProviderField(withFeatureSetStruct, "features");
ImmutableSet<String> notFeatures =
- getStringSetFromSkylarkProviderField(withFeatureSetStruct, "not_features");
+ getStringSetFromStarlarkProviderField(withFeatureSetStruct, "not_features");
return new WithFeatureSet(features, notFeatures);
}
/** Creates an {@link EnvSet} from a {@link StarlarkInfo}. */
@VisibleForTesting
- static EnvSet envSetFromSkylark(StarlarkInfo envSetStruct) throws EvalException {
+ static EnvSet envSetFromStarlark(StarlarkInfo envSetStruct) throws EvalException {
checkRightProviderType(envSetStruct, "env_set");
- ImmutableSet<String> actions = getStringSetFromSkylarkProviderField(envSetStruct, "actions");
+ ImmutableSet<String> actions = getStringSetFromStarlarkProviderField(envSetStruct, "actions");
if (actions.isEmpty()) {
throw new EvalException(
envSetStruct.getCreationLoc(), "actions parameter of env_set must be a nonempty list.");
}
ImmutableList.Builder<EnvEntry> envEntryBuilder = ImmutableList.builder();
ImmutableList<StarlarkInfo> envEntryStructs =
- getSkylarkProviderListFromSkylarkField(envSetStruct, "env_entries");
+ getStarlarkProviderListFromStarlarkField(envSetStruct, "env_entries");
for (StarlarkInfo envEntryStruct : envEntryStructs) {
- envEntryBuilder.add(envEntryFromSkylark(envEntryStruct));
+ envEntryBuilder.add(envEntryFromStarlark(envEntryStruct));
}
ImmutableSet.Builder<WithFeatureSet> withFeatureSetBuilder = ImmutableSet.builder();
ImmutableList<StarlarkInfo> withFeatureSetStructs =
- getSkylarkProviderListFromSkylarkField(envSetStruct, "with_features");
+ getStarlarkProviderListFromStarlarkField(envSetStruct, "with_features");
for (StarlarkInfo withFeatureSetStruct : withFeatureSetStructs) {
- withFeatureSetBuilder.add(withFeatureSetFromSkylark(withFeatureSetStruct));
+ withFeatureSetBuilder.add(withFeatureSetFromStarlark(withFeatureSetStruct));
}
return new EnvSet(actions, envEntryBuilder.build(), withFeatureSetBuilder.build());
}
/** Creates a {@link FlagGroup} from a {@link StarlarkInfo}. */
@VisibleForTesting
- static FlagGroup flagGroupFromSkylark(StarlarkInfo flagGroupStruct) throws EvalException {
+ static FlagGroup flagGroupFromStarlark(StarlarkInfo flagGroupStruct) throws EvalException {
checkRightProviderType(flagGroupStruct, "flag_group");
ImmutableList.Builder<Expandable> expandableBuilder = ImmutableList.builder();
- ImmutableList<String> flags = getStringListFromSkylarkProviderField(flagGroupStruct, "flags");
+ ImmutableList<String> flags = getStringListFromStarlarkProviderField(flagGroupStruct, "flags");
for (String flag : flags) {
StringValueParser parser = new StringValueParser(flag);
expandableBuilder.add(Flag.create(parser.getChunks()));
}
ImmutableList<StarlarkInfo> flagGroups =
- getSkylarkProviderListFromSkylarkField(flagGroupStruct, "flag_groups");
+ getStarlarkProviderListFromStarlarkField(flagGroupStruct, "flag_groups");
for (StarlarkInfo flagGroup : flagGroups) {
- expandableBuilder.add(flagGroupFromSkylark(flagGroup));
+ expandableBuilder.add(flagGroupFromStarlark(flagGroup));
}
if (flagGroups.size() > 0 && flags.size() > 0) {
@@ -1218,21 +1222,21 @@
}
String iterateOver =
- getMandatoryFieldFromSkylarkProvider(flagGroupStruct, "iterate_over", String.class);
+ getMandatoryFieldFromStarlarkProvider(flagGroupStruct, "iterate_over", String.class);
String expandIfAvailable =
- getMandatoryFieldFromSkylarkProvider(flagGroupStruct, "expand_if_available", String.class);
+ getMandatoryFieldFromStarlarkProvider(flagGroupStruct, "expand_if_available", String.class);
String expandIfNotAvailable =
- getMandatoryFieldFromSkylarkProvider(
+ getMandatoryFieldFromStarlarkProvider(
flagGroupStruct, "expand_if_not_available", String.class);
String expandIfTrue =
- getMandatoryFieldFromSkylarkProvider(flagGroupStruct, "expand_if_true", String.class);
+ getMandatoryFieldFromStarlarkProvider(flagGroupStruct, "expand_if_true", String.class);
String expandIfFalse =
- getMandatoryFieldFromSkylarkProvider(flagGroupStruct, "expand_if_false", String.class);
+ getMandatoryFieldFromStarlarkProvider(flagGroupStruct, "expand_if_false", String.class);
StarlarkInfo expandIfEqualStruct =
- getMandatoryFieldFromSkylarkProvider(
+ getMandatoryFieldFromStarlarkProvider(
flagGroupStruct, "expand_if_equal", StarlarkInfo.class);
VariableWithValue expandIfEqual =
- expandIfEqualStruct == null ? null : variableWithValueFromSkylark(expandIfEqualStruct);
+ expandIfEqualStruct == null ? null : variableWithValueFromStarlark(expandIfEqualStruct);
return new FlagGroup(
expandableBuilder.build(),
@@ -1246,10 +1250,10 @@
/** Creates a {@link FlagSet} from a {@link StarlarkInfo}. */
@VisibleForTesting
- static FlagSet flagSetFromSkylark(StarlarkInfo flagSetStruct, String actionName)
+ static FlagSet flagSetFromStarlark(StarlarkInfo flagSetStruct, String actionName)
throws EvalException {
checkRightProviderType(flagSetStruct, "flag_set");
- ImmutableSet<String> actions = getStringSetFromSkylarkProviderField(flagSetStruct, "actions");
+ ImmutableSet<String> actions = getStringSetFromStarlarkProviderField(flagSetStruct, "actions");
// if we are creating a flag set for an action_config, we need to propagate the name of the
// action to its flag_set.action_names
if (actionName != null) {
@@ -1261,16 +1265,16 @@
}
ImmutableList.Builder<FlagGroup> flagGroupsBuilder = ImmutableList.builder();
ImmutableList<StarlarkInfo> flagGroups =
- getSkylarkProviderListFromSkylarkField(flagSetStruct, "flag_groups");
+ getStarlarkProviderListFromStarlarkField(flagSetStruct, "flag_groups");
for (StarlarkInfo flagGroup : flagGroups) {
- flagGroupsBuilder.add(flagGroupFromSkylark(flagGroup));
+ flagGroupsBuilder.add(flagGroupFromStarlark(flagGroup));
}
ImmutableSet.Builder<WithFeatureSet> withFeatureSetBuilder = ImmutableSet.builder();
ImmutableList<StarlarkInfo> withFeatureSetStructs =
- getSkylarkProviderListFromSkylarkField(flagSetStruct, "with_features");
+ getStarlarkProviderListFromStarlarkField(flagSetStruct, "with_features");
for (StarlarkInfo withFeatureSetStruct : withFeatureSetStructs) {
- withFeatureSetBuilder.add(withFeatureSetFromSkylark(withFeatureSetStruct));
+ withFeatureSetBuilder.add(withFeatureSetFromStarlark(withFeatureSetStruct));
}
return new FlagSet(
@@ -1282,11 +1286,12 @@
* {@link StarlarkInfo}.
*/
@VisibleForTesting
- static CcToolchainFeatures.Tool toolFromSkylark(StarlarkInfo toolStruct) throws EvalException {
+ static CcToolchainFeatures.Tool toolFromStarlark(StarlarkInfo toolStruct) throws EvalException {
checkRightProviderType(toolStruct, "tool");
- String toolPathString = getOptionalFieldFromSkylarkProvider(toolStruct, "path", String.class);
- Artifact toolArtifact = getOptionalFieldFromSkylarkProvider(toolStruct, "tool", Artifact.class);
+ String toolPathString = getOptionalFieldFromStarlarkProvider(toolStruct, "path", String.class);
+ Artifact toolArtifact =
+ getOptionalFieldFromStarlarkProvider(toolStruct, "tool", Artifact.class);
PathFragment toolPath;
CToolchain.Tool.PathOrigin toolPathOrigin;
@@ -1317,24 +1322,24 @@
ImmutableSet.Builder<WithFeatureSet> withFeatureSetBuilder = ImmutableSet.builder();
ImmutableList<StarlarkInfo> withFeatureSetStructs =
- getSkylarkProviderListFromSkylarkField(toolStruct, "with_features");
+ getStarlarkProviderListFromStarlarkField(toolStruct, "with_features");
for (StarlarkInfo withFeatureSetStruct : withFeatureSetStructs) {
- withFeatureSetBuilder.add(withFeatureSetFromSkylark(withFeatureSetStruct));
+ withFeatureSetBuilder.add(withFeatureSetFromStarlark(withFeatureSetStruct));
}
ImmutableSet<String> executionRequirements =
- getStringSetFromSkylarkProviderField(toolStruct, "execution_requirements");
+ getStringSetFromStarlarkProviderField(toolStruct, "execution_requirements");
return new CcToolchainFeatures.Tool(
toolPath, toolPathOrigin, executionRequirements, withFeatureSetBuilder.build());
}
/** Creates an {@link ActionConfig} from a {@link StarlarkInfo}. */
@VisibleForTesting
- static ActionConfig actionConfigFromSkylark(StarlarkInfo actionConfigStruct)
+ static ActionConfig actionConfigFromStarlark(StarlarkInfo actionConfigStruct)
throws EvalException {
checkRightProviderType(actionConfigStruct, "action_config");
String actionName =
- getMandatoryFieldFromSkylarkProvider(actionConfigStruct, "action_name", String.class);
+ getMandatoryFieldFromStarlarkProvider(actionConfigStruct, "action_name", String.class);
if (actionName == null || actionName.isEmpty()) {
throw new EvalException(
actionConfigStruct.getCreationLoc(),
@@ -1350,24 +1355,24 @@
}
Boolean enabled =
- getMandatoryFieldFromSkylarkProvider(actionConfigStruct, "enabled", Boolean.class);
+ getMandatoryFieldFromStarlarkProvider(actionConfigStruct, "enabled", Boolean.class);
ImmutableList.Builder<CcToolchainFeatures.Tool> toolBuilder = ImmutableList.builder();
ImmutableList<StarlarkInfo> toolStructs =
- getSkylarkProviderListFromSkylarkField(actionConfigStruct, "tools");
+ getStarlarkProviderListFromStarlarkField(actionConfigStruct, "tools");
for (StarlarkInfo toolStruct : toolStructs) {
- toolBuilder.add(toolFromSkylark(toolStruct));
+ toolBuilder.add(toolFromStarlark(toolStruct));
}
ImmutableList.Builder<FlagSet> flagSetBuilder = ImmutableList.builder();
ImmutableList<StarlarkInfo> flagSets =
- getSkylarkProviderListFromSkylarkField(actionConfigStruct, "flag_sets");
+ getStarlarkProviderListFromStarlarkField(actionConfigStruct, "flag_sets");
for (StarlarkInfo flagSet : flagSets) {
- flagSetBuilder.add(flagSetFromSkylark(flagSet, actionName));
+ flagSetBuilder.add(flagSetFromStarlark(flagSet, actionName));
}
ImmutableList<String> implies =
- getStringListFromSkylarkProviderField(actionConfigStruct, "implies");
+ getStringListFromStarlarkProviderField(actionConfigStruct, "implies");
return new ActionConfig(
actionName, actionName, toolBuilder.build(), flagSetBuilder.build(), enabled, implies);
@@ -1375,11 +1380,11 @@
/** Creates an {@link ArtifactNamePattern} from a {@link StarlarkInfo}. */
@VisibleForTesting
- static ArtifactNamePattern artifactNamePatternFromSkylark(StarlarkInfo artifactNamePatternStruct)
+ static ArtifactNamePattern artifactNamePatternFromStarlark(StarlarkInfo artifactNamePatternStruct)
throws EvalException {
checkRightProviderType(artifactNamePatternStruct, "artifact_name_pattern");
String categoryName =
- getMandatoryFieldFromSkylarkProvider(
+ getMandatoryFieldFromStarlarkProvider(
artifactNamePatternStruct, "category_name", String.class);
if (categoryName == null || categoryName.isEmpty()) {
throw new EvalException(
@@ -1401,7 +1406,7 @@
String extension =
Strings.nullToEmpty(
- getMandatoryFieldFromSkylarkProvider(
+ getMandatoryFieldFromStarlarkProvider(
artifactNamePatternStruct, "extension", String.class));
if (!foundCategory.getAllowedExtensions().contains(extension)) {
throw new EvalException(
@@ -1416,22 +1421,22 @@
String prefix =
Strings.nullToEmpty(
- getMandatoryFieldFromSkylarkProvider(
+ getMandatoryFieldFromStarlarkProvider(
artifactNamePatternStruct, "prefix", String.class));
return new ArtifactNamePattern(foundCategory, prefix, extension);
}
- private static <T> T getOptionalFieldFromSkylarkProvider(
+ private static <T> T getOptionalFieldFromStarlarkProvider(
StarlarkInfo provider, String fieldName, Class<T> clazz) throws EvalException {
- return getFieldFromSkylarkProvider(provider, fieldName, clazz, false);
+ return getFieldFromStarlarkProvider(provider, fieldName, clazz, false);
}
- private static <T> T getMandatoryFieldFromSkylarkProvider(
+ private static <T> T getMandatoryFieldFromStarlarkProvider(
StarlarkInfo provider, String fieldName, Class<T> clazz) throws EvalException {
- return getFieldFromSkylarkProvider(provider, fieldName, clazz, true);
+ return getFieldFromStarlarkProvider(provider, fieldName, clazz, true);
}
- private static <T> T getFieldFromSkylarkProvider(
+ private static <T> T getFieldFromStarlarkProvider(
StarlarkInfo provider, String fieldName, Class<T> clazz, boolean mandatory)
throws EvalException {
Object obj = provider.getValue(fieldName);
@@ -1454,7 +1459,7 @@
}
/** Returns a list of strings from a field of a {@link StarlarkInfo}. */
- private static ImmutableList<String> getStringListFromSkylarkProviderField(
+ private static ImmutableList<String> getStringListFromStarlarkProviderField(
StarlarkInfo provider, String fieldName) throws EvalException {
Object v = getValueOrNull(provider, fieldName);
return v == null
@@ -1463,7 +1468,7 @@
}
/** Returns a set of strings from a field of a {@link StarlarkInfo}. */
- private static ImmutableSet<String> getStringSetFromSkylarkProviderField(
+ private static ImmutableSet<String> getStringSetFromStarlarkProviderField(
StarlarkInfo provider, String fieldName) throws EvalException {
Object v = getValueOrNull(provider, fieldName);
return v == null
@@ -1471,8 +1476,8 @@
: ImmutableSet.copyOf(Sequence.noneableCast(v, String.class, fieldName));
}
- /** Returns a list of SkylarkInfo providers from a field of a {@link StarlarkInfo}. */
- private static ImmutableList<StarlarkInfo> getSkylarkProviderListFromSkylarkField(
+ /** Returns a list of StarlarkInfo providers from a field of a {@link StarlarkInfo}. */
+ private static ImmutableList<StarlarkInfo> getStarlarkProviderListFromStarlarkField(
StarlarkInfo provider, String fieldName) throws EvalException {
Object v = getValueOrNull(provider, fieldName);
return v == null
@@ -1517,9 +1522,9 @@
@Override
public Tuple<Object> createLinkingContextFromCompilationOutputs(
- StarlarkActionFactory skylarkActionFactoryApi,
- FeatureConfigurationForStarlark skylarkFeatureConfiguration,
- CcToolchainProvider skylarkCcToolchainProvider,
+ StarlarkActionFactory starlarkActionFactoryApi,
+ FeatureConfigurationForStarlark starlarkFeatureConfiguration,
+ CcToolchainProvider starlarkCcToolchainProvider,
CcCompilationOutputs compilationOutputs,
Sequence<?> userLinkFlags, // <String> expected
Sequence<?> linkingContexts, // <CcLinkingContext> expected
@@ -1533,10 +1538,11 @@
StarlarkThread thread)
throws InterruptedException, EvalException {
validateLanguage(language);
- StarlarkActionFactory actions = skylarkActionFactoryApi;
- CcToolchainProvider ccToolchainProvider = convertFromNoneable(skylarkCcToolchainProvider, null);
+ StarlarkActionFactory actions = starlarkActionFactoryApi;
+ CcToolchainProvider ccToolchainProvider =
+ convertFromNoneable(starlarkCcToolchainProvider, null);
FeatureConfigurationForStarlark featureConfiguration =
- convertFromNoneable(skylarkFeatureConfiguration, null);
+ convertFromNoneable(starlarkFeatureConfiguration, null);
Label label = getCallerLabel(actions, name);
FdoContext fdoContext = ccToolchainProvider.getFdoContext();
LinkTargetType staticLinkTargetType = null;
@@ -1649,9 +1655,9 @@
}
protected Tuple<Object> compile(
- StarlarkActionFactory skylarkActionFactoryApi,
- FeatureConfigurationForStarlark skylarkFeatureConfiguration,
- CcToolchainProvider skylarkCcToolchainProvider,
+ StarlarkActionFactory starlarkActionFactoryApi,
+ FeatureConfigurationForStarlark starlarkFeatureConfiguration,
+ CcToolchainProvider starlarkCcToolchainProvider,
Sequence<?> sourcesUnchecked, // <Artifact> expected
Sequence<?> publicHeadersUnchecked, // <Artifact> expected
Sequence<?> privateHeadersUnchecked, // <Artifact> expected
@@ -1675,10 +1681,11 @@
List<Artifact> publicHeaders = Sequence.cast(publicHeadersUnchecked, Artifact.class, "srcs");
List<Artifact> privateHeaders = Sequence.cast(privateHeadersUnchecked, Artifact.class, "srcs");
- StarlarkActionFactory actions = skylarkActionFactoryApi;
- CcToolchainProvider ccToolchainProvider = convertFromNoneable(skylarkCcToolchainProvider, null);
+ StarlarkActionFactory actions = starlarkActionFactoryApi;
+ CcToolchainProvider ccToolchainProvider =
+ convertFromNoneable(starlarkCcToolchainProvider, null);
FeatureConfigurationForStarlark featureConfiguration =
- convertFromNoneable(skylarkFeatureConfiguration, null);
+ convertFromNoneable(starlarkFeatureConfiguration, null);
Label label = getCallerLabel(actions, name);
FdoContext fdoContext = ccToolchainProvider.getFdoContext();
validateExtensions(
@@ -1765,8 +1772,8 @@
protected CcLinkingOutputs link(
StarlarkActionFactory actions,
- FeatureConfigurationForStarlark skylarkFeatureConfiguration,
- CcToolchainProvider skylarkCcToolchainProvider,
+ FeatureConfigurationForStarlark starlarkFeatureConfiguration,
+ CcToolchainProvider starlarkCcToolchainProvider,
CcCompilationOutputs compilationOutputs,
Sequence<?> userLinkFlags,
Sequence<?> linkingContexts,
@@ -1783,9 +1790,10 @@
validateOutputType(outputType);
boolean isStampingEnabled =
isStampingEnabled(stamp, actions.getRuleContext().getConfiguration());
- CcToolchainProvider ccToolchainProvider = convertFromNoneable(skylarkCcToolchainProvider, null);
+ CcToolchainProvider ccToolchainProvider =
+ convertFromNoneable(starlarkCcToolchainProvider, null);
FeatureConfigurationForStarlark featureConfiguration =
- convertFromNoneable(skylarkFeatureConfiguration, null);
+ convertFromNoneable(starlarkFeatureConfiguration, null);
Label label = getCallerLabel(actions, name);
FdoContext fdoContext = ccToolchainProvider.getFdoContext();
LinkTargetType dynamicLinkTargetType = null;
@@ -1850,7 +1858,7 @@
}
}
- protected CcCompilationOutputs createCompilationOutputsFromSkylark(
+ protected CcCompilationOutputs createCompilationOutputsFromStarlark(
Object objectsObject, Object picObjectsObject) throws EvalException {
CcCompilationOutputs.Builder ccCompilationOutputsBuilder = CcCompilationOutputs.builder();
NestedSet<Artifact> objects = convertToNestedSet(objectsObject, Artifact.class, "objects");
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java
index 2f31970..cd6df06 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderHelper.java
@@ -78,7 +78,7 @@
ruleContext.getLabel(),
ruleContext
.getAnalysisEnvironment()
- .getSkylarkSemantics()
+ .getStarlarkSemantics()
.experimentalSiblingRepositoryLayout());
try {
toolPaths = computeToolPaths(toolchainConfigInfo, toolsDirectory);
@@ -188,7 +188,7 @@
attributes.getWhitelistForLayeringCheck();
return new CcToolchainProvider(
- getToolchainForSkylark(toolPaths),
+ getToolchainForStarlark(toolPaths),
cppConfiguration,
toolchainFeatures,
toolsDirectory,
@@ -374,23 +374,23 @@
return pathPrefix.getRelative(path);
}
- private static String getSkylarkValueForTool(
+ private static String getStarlarkValueForTool(
Tool tool, ImmutableMap<String, PathFragment> toolPaths) {
PathFragment toolPath = getToolPathFragment(toolPaths, tool);
return toolPath != null ? toolPath.getPathString() : "";
}
- private static ImmutableMap<String, Object> getToolchainForSkylark(
+ private static ImmutableMap<String, Object> getToolchainForStarlark(
ImmutableMap<String, PathFragment> toolPaths) {
return ImmutableMap.<String, Object>builder()
- .put("objcopy_executable", getSkylarkValueForTool(Tool.OBJCOPY, toolPaths))
- .put("compiler_executable", getSkylarkValueForTool(Tool.GCC, toolPaths))
- .put("preprocessor_executable", getSkylarkValueForTool(Tool.CPP, toolPaths))
- .put("nm_executable", getSkylarkValueForTool(Tool.NM, toolPaths))
- .put("objdump_executable", getSkylarkValueForTool(Tool.OBJDUMP, toolPaths))
- .put("ar_executable", getSkylarkValueForTool(Tool.AR, toolPaths))
- .put("strip_executable", getSkylarkValueForTool(Tool.STRIP, toolPaths))
- .put("ld_executable", getSkylarkValueForTool(Tool.LD, toolPaths))
+ .put("objcopy_executable", getStarlarkValueForTool(Tool.OBJCOPY, toolPaths))
+ .put("compiler_executable", getStarlarkValueForTool(Tool.GCC, toolPaths))
+ .put("preprocessor_executable", getStarlarkValueForTool(Tool.CPP, toolPaths))
+ .put("nm_executable", getStarlarkValueForTool(Tool.NM, toolPaths))
+ .put("objdump_executable", getStarlarkValueForTool(Tool.OBJDUMP, toolPaths))
+ .put("ar_executable", getStarlarkValueForTool(Tool.AR, toolPaths))
+ .put("strip_executable", getStarlarkValueForTool(Tool.STRIP, toolPaths))
+ .put("ld_executable", getStarlarkValueForTool(Tool.LD, toolPaths))
.build();
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
index bf5523b..3ae5e3d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java
@@ -576,7 +576,7 @@
}
@Override
- public Sequence<String> getSkylarkArgv() throws EvalException {
+ public Sequence<String> getStarlarkArgv() throws EvalException {
try {
return StarlarkList.immutableCopyOf(getArguments());
} catch (CommandLineExpansionException exception) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
index 9f90295..25a95f8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionBuilder.java
@@ -958,7 +958,7 @@
linkCommandLineBuilder.setBuildVariables(buildVariables);
if (CppHelper.doNotSplitLinkingCmdLine(
- actionConstructionContext.getAnalysisEnvironment().getSkylarkSemantics(), toolchain)) {
+ actionConstructionContext.getAnalysisEnvironment().getStarlarkSemantics(), toolchain)) {
linkCommandLineBuilder.doNotSplitLinkingCmdLine();
}
LinkCommandLine linkCommandLine = linkCommandLineBuilder.build();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoHelper.java
index b54b5f0..2b310dc 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FdoHelper.java
@@ -462,7 +462,7 @@
.getExecPath(
ruleContext
.getAnalysisEnvironment()
- .getSkylarkSemantics()
+ .getStarlarkSemantics()
.experimentalSiblingRepositoryLayout())
.getRelative(fdoLabel.getName())
.equals(fdoArtifact.getExecPath())) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
index 0ddd3ca..eb6289d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoAspect.java
@@ -357,7 +357,7 @@
.getExecPath(
ruleContext
.getAnalysisEnvironment()
- .getSkylarkSemantics()
+ .getStarlarkSemantics()
.experimentalSiblingRepositoryLayout());
if (protoRootFragment.startsWith(repositoryPath)) {
protoRootFragment = protoRootFragment.relativeTo(repositoryPath);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
index c9571cf..eb88793 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
@@ -487,7 +487,7 @@
}
@Override
- public Sequence<String> getSkylarkArgv() throws EvalException {
+ public Sequence<String> getStarlarkArgv() throws EvalException {
try {
return StarlarkList.immutableCopyOf(getArguments());
} catch (CommandLineExpansionException exception) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java
index 172cbd3..5dd3699 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java
@@ -115,7 +115,7 @@
throws InterruptedException {
PathFragment rootRelativePath = resource.getRootRelativePath();
StarlarkSemantics starlarkSemantics =
- ruleContext.getAnalysisEnvironment().getSkylarkSemantics();
+ ruleContext.getAnalysisEnvironment().getStarlarkSemantics();
if (!ruleContext.getLabel().getWorkspaceRoot(starlarkSemantics).isEmpty()) {
PathFragment workspace =
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntime.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntime.java
index 7b58b71..60787bf 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuntime.java
@@ -54,7 +54,7 @@
boolean siblingRepositoryLayout =
ruleContext
.getAnalysisEnvironment()
- .getSkylarkSemantics()
+ .getStarlarkSemantics()
.experimentalSiblingRepositoryLayout();
PathFragment javaHome = defaultJavaHome(ruleContext.getLabel(), siblingRepositoryLayout);
if (ruleContext.attributes().isAttributeValueExplicitlySpecified("java_home")) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java
index d99be8b..126cace 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinary.java
@@ -201,7 +201,7 @@
platform);
ObjcProvider.Builder objcProviderBuilder =
- new ObjcProvider.NativeBuilder(ruleContext.getAnalysisEnvironment().getSkylarkSemantics());
+ new ObjcProvider.NativeBuilder(ruleContext.getAnalysisEnvironment().getStarlarkSemantics());
for (DependencySpecificConfiguration dependencySpecificConfiguration :
dependencySpecificConfigurations) {
objcProviderBuilder.addTransitiveAndPropagate(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java
index 9649b48..a98cf51 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibrary.java
@@ -89,7 +89,7 @@
ruleContext.getPrerequisites(
AppleStaticLibraryRule.AVOID_DEPS_ATTR_NAME,
TransitionMode.TARGET,
- ObjcProtoProvider.SKYLARK_CONSTRUCTOR);
+ ObjcProtoProvider.STARLARK_CONSTRUCTOR);
NestedSet<Artifact> protosToAvoid = protoArtifactsToAvoid(avoidProtoProviders);
Map<BuildConfiguration, CcToolchainProvider> childConfigurationsAndToolchains =
@@ -104,11 +104,11 @@
.add(ruleIntermediateArtifacts.combinedArchitectureArchive());
ObjcProvider.Builder objcProviderBuilder =
- new ObjcProvider.NativeBuilder(ruleContext.getAnalysisEnvironment().getSkylarkSemantics());
+ new ObjcProvider.NativeBuilder(ruleContext.getAnalysisEnvironment().getStarlarkSemantics());
ImmutableListMultimap<BuildConfiguration, ObjcProtoProvider> objcProtoProvidersByConfig =
ruleContext.getPrerequisitesByConfiguration(
- "deps", TransitionMode.SPLIT, ObjcProtoProvider.SKYLARK_CONSTRUCTOR);
+ "deps", TransitionMode.SPLIT, ObjcProtoProvider.STARLARK_CONSTRUCTOR);
Multimap<String, ObjcProtoProvider> objcProtoProvidersMap =
MultiArchBinarySupport.transformMap(objcProtoProvidersByConfig);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java
index 975669c..9f12bdd 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java
@@ -795,7 +795,7 @@
.getExecPath(
ruleContext
.getAnalysisEnvironment()
- .getSkylarkSemantics()
+ .getStarlarkSemantics()
.experimentalSiblingRepositoryLayout()));
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java
index d63633b..09fc30b1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java
@@ -215,7 +215,7 @@
throws RuleErrorException, InterruptedException {
Iterable<ObjcProvider> dylibObjcProviders = getDylibObjcProviders(dylibProviders);
Iterable<ObjcProtoProvider> dylibProtoProviders =
- getTypedProviders(dylibProviders, ObjcProtoProvider.SKYLARK_CONSTRUCTOR);
+ getTypedProviders(dylibProviders, ObjcProtoProvider.STARLARK_CONSTRUCTOR);
NestedSet<Artifact> protosToAvoid = protoArtifactsToAvoid(dylibProtoProviders);
ImmutableSet.Builder<DependencySpecificConfiguration> childInfoBuilder = ImmutableSet.builder();
@@ -223,7 +223,7 @@
String childCpu = childToolchainConfig.getCpu();
Iterable<TransitiveInfoCollection> infoCollections = cpuToDepsCollectionMap.get(childCpu);
ImmutableList<ObjcProtoProvider> depProtoProviders =
- getTypedProviders(infoCollections, ObjcProtoProvider.SKYLARK_CONSTRUCTOR);
+ getTypedProviders(infoCollections, ObjcProtoProvider.STARLARK_CONSTRUCTOR);
Optional<ObjcProvider> protosObjcProvider;
if (ObjcRuleClasses.objcConfiguration(ruleContext).enableAppleBinaryNativeProtos()) {
ProtobufSupport protoSupport =
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
index f403ad2..f377b1d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
@@ -136,7 +136,7 @@
throws InterruptedException {
this.purpose = purpose;
this.context = Preconditions.checkNotNull(context);
- this.semantics = context.getAnalysisEnvironment().getSkylarkSemantics();
+ this.semantics = context.getAnalysisEnvironment().getStarlarkSemantics();
this.buildConfiguration = Preconditions.checkNotNull(buildConfiguration);
ObjcConfiguration objcConfiguration = buildConfiguration.getFragment(ObjcConfiguration.class);
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 b6cb14a..6ed2a40 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
@@ -63,7 +63,7 @@
if (ruleContext.attributes().has("deps", BuildType.LABEL_LIST)) {
Iterable<ObjcProtoProvider> depObjcProtoProviders =
ruleContext.getPrerequisites(
- "deps", TransitionMode.TARGET, ObjcProtoProvider.SKYLARK_CONSTRUCTOR);
+ "deps", TransitionMode.TARGET, ObjcProtoProvider.STARLARK_CONSTRUCTOR);
aspectObjcProtoProvider.addTransitive(depObjcProtoProviders);
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoProvider.java
index b0c230d..e77a5c7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProtoProvider.java
@@ -42,11 +42,11 @@
public class ObjcProtoProvider extends NativeInfo {
/** Starlark name for the ObjcProtoProvider. */
- public static final String SKYLARK_NAME = "ObjcProto";
+ public static final String STARLARK_NAME = "ObjcProto";
/** Starlark constructor and identifier for AppleExecutableBinaryInfo. */
- public static final NativeProvider<ObjcProtoProvider> SKYLARK_CONSTRUCTOR =
- new NativeProvider<ObjcProtoProvider>(ObjcProtoProvider.class, SKYLARK_NAME) {};
+ public static final NativeProvider<ObjcProtoProvider> STARLARK_CONSTRUCTOR =
+ new NativeProvider<ObjcProtoProvider>(ObjcProtoProvider.class, STARLARK_NAME) {};
private final NestedSet<Artifact> protoFiles;
private final NestedSet<Artifact> protobufHeaders;
@@ -58,7 +58,7 @@
NestedSet<Artifact> portableProtoFilters,
NestedSet<Artifact> protobufHeaders,
NestedSet<PathFragment> protobufHeaderSearchPaths) {
- super(SKYLARK_CONSTRUCTOR);
+ super(STARLARK_CONSTRUCTOR);
this.protoFiles = Preconditions.checkNotNull(protoFiles);
this.portableProtoFilters = Preconditions.checkNotNull(portableProtoFilters);
this.protobufHeaders = Preconditions.checkNotNull(protobufHeaders);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
index ebd7403..55aef9a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
@@ -269,7 +269,7 @@
PathFragment importPrefix;
StarlarkSemantics starlarkSemantics =
- ruleContext.getAnalysisEnvironment().getSkylarkSemantics();
+ ruleContext.getAnalysisEnvironment().getStarlarkSemantics();
boolean siblingRepositoryLayout = starlarkSemantics.experimentalSiblingRepositoryLayout();
if (stripImportPrefixAttribute != null || importPrefixAttribute != null) {
if (stripImportPrefixAttribute == null) {
@@ -500,7 +500,7 @@
.getExecPath(
ruleContext
.getAnalysisEnvironment()
- .getSkylarkSemantics()
+ .getStarlarkSemantics()
.experimentalSiblingRepositoryLayout())
.getPathString();
library =
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
index 1a29766..60ee0d0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilder.java
@@ -268,7 +268,7 @@
boolean siblingRepositoryLayout =
ruleContext
.getAnalysisEnvironment()
- .getSkylarkSemantics()
+ .getStarlarkSemantics()
.experimentalSiblingRepositoryLayout();
// Add include maps
@@ -470,7 +470,7 @@
boolean siblingRepositoryLayout =
ruleContext
.getAnalysisEnvironment()
- .getSkylarkSemantics()
+ .getStarlarkSemantics()
.experimentalSiblingRepositoryLayout();
result
diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java
index f37cffa..16b9698 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyCommon.java
@@ -188,7 +188,7 @@
private static String getOrderErrorMessage(String fieldName, Order expected, Order actual) {
return String.format(
"Incompatible order for %s: expected 'default' or '%s', got '%s'",
- fieldName, expected.getSkylarkName(), actual.getSkylarkName());
+ fieldName, expected.getStarlarkName(), actual.getStarlarkName());
}
public PyCommon(RuleContext ruleContext, PythonSemantics semantics) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyInfo.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyInfo.java
index faf1aba..bb98d89 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/python/PyInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyInfo.java
@@ -58,7 +58,7 @@
private static String describeType(Object value) {
if (value instanceof Depset) {
Depset depset = (Depset) value;
- return depset.getOrder().getSkylarkName()
+ return depset.getOrder().getStarlarkName()
+ "-ordered depset of "
+ depset.getElementType()
+ "s";
diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PyStructUtils.java b/src/main/java/com/google/devtools/build/lib/rules/python/PyStructUtils.java
index e5c9848..3801a6d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/python/PyStructUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/python/PyStructUtils.java
@@ -109,7 +109,7 @@
if (!set.getOrder().isCompatible(Order.COMPILE_ORDER)) {
throw Starlark.errorf(
"Incompatible depset order for '%s': expected 'default' or 'postorder', but got '%s'",
- TRANSITIVE_SOURCES, set.getOrder().getSkylarkName());
+ TRANSITIVE_SOURCES, set.getOrder().getStarlarkName());
}
return set;
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 1dbe662..b1df35b 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -1142,7 +1142,7 @@
PrecomputedValue.DEFAULT_VISIBILITY.set(injectable(), defaultVisibility);
}
- private void setSkylarkSemantics(StarlarkSemantics starlarkSemantics) {
+ private void setStarlarkSemantics(StarlarkSemantics starlarkSemantics) {
PrecomputedValue.STARLARK_SEMANTICS.set(injectable(), starlarkSemantics);
}
@@ -1401,7 +1401,7 @@
setDefaultVisibility(packageOptions.defaultVisibility);
StarlarkSemantics starlarkSemantics = getEffectiveStarlarkSemantics(starlarkSemanticsOptions);
- setSkylarkSemantics(starlarkSemantics);
+ setStarlarkSemantics(starlarkSemantics);
setSiblingDirectoryLayout(starlarkSemantics.experimentalSiblingRepositoryLayout());
setPackageLocator(pkgLocator);
@@ -2797,7 +2797,7 @@
new ConfiguredTargetCycleReporter(packageManager),
new TestExpansionCycleReporter(packageManager),
new RegisteredToolchainsCycleReporter(),
- // TODO(ulfjack): The SkylarkModuleCycleReporter swallows previously reported cycles
+ // TODO(ulfjack): The StarlarkModuleCycleReporter swallows previously reported cycles
// unconditionally! Is that intentional?
new StarlarkModuleCycleReporter());
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkAspectFactory.java b/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkAspectFactory.java
index bd39fb1..e6fa831 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkAspectFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkAspectFactory.java
@@ -65,14 +65,14 @@
try {
starlarkRuleContext =
new StarlarkRuleContext(
- ruleContext, aspectDescriptor, analysisEnv.getSkylarkSemantics());
+ ruleContext, aspectDescriptor, analysisEnv.getStarlarkSemantics());
} catch (EvalException | RuleErrorException e) {
ruleContext.ruleError(e.getMessage());
return null;
}
StarlarkThread thread =
StarlarkThread.builder(mutability)
- .setSemantics(analysisEnv.getSkylarkSemantics())
+ .setSemantics(analysisEnv.getStarlarkSemantics())
.build();
thread.setPrintHandler(Event.makeDebugPrintHandler(analysisEnv.getEventHandler()));
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
index 85526aa..d8fd5d6 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
@@ -182,12 +182,12 @@
return this;
}
- public Builder setSkylarkSemantics(StarlarkSemantics semantics) {
+ public Builder setStarlarkSemantics(StarlarkSemantics semantics) {
this.starlarkSemantics = semantics;
return this;
}
- public Builder useDefaultSkylarkSemantics() {
+ public Builder useDefaultStarlarkSemantics() {
this.starlarkSemantics = StarlarkSemantics.DEFAULT;
return this;
}
@@ -232,7 +232,7 @@
protected void validate() {
if (starlarkSemantics == null) {
throw new IllegalArgumentException(
- "must call either setSkylarkSemantics or useDefaultSkylarkSemantics");
+ "must call either setStarlarkSemantics or useDefaultStarlarkSemantics");
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/ActionApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/ActionApi.java
index 68bf54d..f2407c8 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/ActionApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/ActionApi.java
@@ -50,13 +50,13 @@
name = "inputs",
doc = "A set of the input files of this action.",
structField = true)
- Depset getSkylarkInputs();
+ Depset getStarlarkInputs();
@StarlarkMethod(
name = "outputs",
doc = "A set of the output files of this action.",
structField = true)
- Depset getSkylarkOutputs();
+ Depset getStarlarkOutputs();
@StarlarkMethod(
name = "argv",
@@ -68,7 +68,7 @@
+ "and <code>\"-c\"</code>.",
structField = true,
allowReturnNones = true)
- Sequence<String> getSkylarkArgv() throws EvalException;
+ Sequence<String> getStarlarkArgv() throws EvalException;
@StarlarkMethod(
name = "args",
@@ -109,7 +109,7 @@
structField = true,
allowReturnNones = true)
@Nullable
- String getSkylarkContent() throws IOException, EvalException;
+ String getStarlarkContent() throws IOException, EvalException;
@StarlarkMethod(
name = "substitutions",
@@ -119,7 +119,7 @@
+ " an immutable dict holding the substitution mapping.",
structField = true,
allowReturnNones = true)
- Dict<String, String> getSkylarkSubstitutions();
+ Dict<String, String> getStarlarkSubstitutions();
@StarlarkMethod(
name = "env",
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 3cea3f0..5286247 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
@@ -40,7 +40,7 @@
public interface AppleCommonApi<
FileApiT extends FileApi,
ConstraintValueT extends ConstraintValueInfoApi,
- SkylarkRuleContextT extends StarlarkRuleContextApi<ConstraintValueT>,
+ StarlarkRuleContextT extends StarlarkRuleContextApi<ConstraintValueT>,
ObjcProviderApiT extends ObjcProviderApi<?>,
XcodeConfigInfoApiT extends XcodeConfigInfoApi<?, ?>,
ApplePlatformApiT extends ApplePlatformApi>
@@ -103,7 +103,7 @@
ProviderApi getXcodeVersionConfigConstructor();
@StarlarkMethod(
- // TODO(b/63899207): This currently does not match ObjcProvider.SKYLARK_NAME as it requires
+ // TODO(b/63899207): This currently does not match ObjcProvider.STARLARK_NAME as it requires
// a migration of existing Starlark rules.
name = "Objc",
doc =
@@ -364,7 +364,7 @@
useStarlarkThread = true)
// TODO(b/70937317): Iterate on, improve, and solidify this API.
StructApi linkMultiArchBinary(
- SkylarkRuleContextT skylarkRuleContext,
+ StarlarkRuleContextT starlarkRuleContext,
Sequence<?> extraLinkopts, // <String> expected.
Sequence<?> extraLinkInputs, // <? extends FileApi> expected.
StarlarkThread thread)
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 2559557..5c2c3b5 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
@@ -382,7 +382,7 @@
defaultValue = "None",
allowedTypes = {@ParamType(type = Depset.class), @ParamType(type = NoneType.class)}),
})
- CompilationOutputsT createCompilationOutputsFromSkylark(
+ CompilationOutputsT createCompilationOutputsFromStarlark(
Object objectsObject, Object picObjectsObject) throws EvalException;
@StarlarkMethod(
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcCompilationOutputsApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcCompilationOutputsApi.java
index b3ab4b2..9939940 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcCompilationOutputsApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcCompilationOutputsApi.java
@@ -32,7 +32,7 @@
doc = "Helper class containing CC compilation outputs.")
public interface CcCompilationOutputsApi<FileT extends FileApi> extends StarlarkValue {
- /** @deprecated use {@link #getSkylarkObjects} or {@link #getSkylarkPicObjects}. */
+ /** @deprecated use {@link #getStarlarkObjects} or {@link #getStarlarkPicObjects}. */
@StarlarkMethod(
name = "object_files",
doc = "Do not use. Use eiher 'objects' or 'pic_objects'.",
@@ -41,11 +41,12 @@
@Param(name = "use_pic", doc = "use_pic", positional = false, named = true),
})
@Deprecated
- Sequence<FileT> getSkylarkObjectFiles(boolean usePic, StarlarkThread thread) throws EvalException;
+ Sequence<FileT> getStarlarkObjectFiles(boolean usePic, StarlarkThread thread)
+ throws EvalException;
@StarlarkMethod(name = "objects", documented = false, structField = true)
- Sequence<FileT> getSkylarkObjects() throws EvalException;
+ Sequence<FileT> getStarlarkObjects() throws EvalException;
@StarlarkMethod(name = "pic_objects", documented = false, structField = true)
- Sequence<FileT> getSkylarkPicObjects() throws EvalException;
+ Sequence<FileT> getStarlarkPicObjects() throws EvalException;
}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcLinkingContextApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcLinkingContextApi.java
index 71686aa..6b39333 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcLinkingContextApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcLinkingContextApi.java
@@ -37,7 +37,7 @@
doc = "Returns the list of user link flags passed as strings.",
disableWithFlag = FlagIdentifier.INCOMPATIBLE_REQUIRE_LINKER_INPUT_CC_API,
structField = true)
- Sequence<String> getSkylarkUserLinkFlags();
+ Sequence<String> getStarlarkUserLinkFlags();
@StarlarkMethod(
name = "libraries_to_link",
@@ -47,18 +47,18 @@
disableWithFlag = FlagIdentifier.INCOMPATIBLE_REQUIRE_LINKER_INPUT_CC_API,
structField = true,
useStarlarkSemantics = true)
- Object getSkylarkLibrariesToLink(StarlarkSemantics semantics);
+ Object getStarlarkLibrariesToLink(StarlarkSemantics semantics);
@StarlarkMethod(
name = "additional_inputs",
doc = "Returns the depset of additional inputs, e.g.: linker scripts.",
disableWithFlag = FlagIdentifier.INCOMPATIBLE_REQUIRE_LINKER_INPUT_CC_API,
structField = true)
- Depset getSkylarkNonCodeInputs();
+ Depset getStarlarkNonCodeInputs();
@StarlarkMethod(
name = "linker_inputs",
doc = "Returns the depset of linker inputs.",
structField = true)
- Depset getSkylarkLinkerInputs();
+ Depset getStarlarkLinkerInputs();
}
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 a74232b..8e7dfde 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
@@ -964,7 +964,7 @@
named = true,
doc = "Internal purpose only, do not use."),
})
- CcToolchainConfigInfoT ccToolchainConfigInfoFromSkylark(
+ CcToolchainConfigInfoT ccToolchainConfigInfoFromStarlark(
SkylarkRuleContextT skylarkRuleContext,
Sequence<?> features, // <StructApi> expected
Sequence<?> actionConfigs, // <StructApi> expected
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerialization.java b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerialization.java
index 2b0d5fe..a16f8c7 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerialization.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdebug/server/DebuggerSerialization.java
@@ -156,7 +156,7 @@
Value.newBuilder()
.setLabel("order")
.setType("Traversal order")
- .setDescription(nestedSet.getOrder().getSkylarkName())
+ .setDescription(nestedSet.getOrder().getStarlarkName())
.build())
.addAll(getChildren(objectMap, new NestedSetView<>(nestedSet.getSet())))
.build();
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 a5211b6..1b1eb62 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
@@ -121,7 +121,7 @@
@Override
public StructApi linkMultiArchBinary(
- StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext,
+ StarlarkRuleContextApi<ConstraintValueInfoApi> starlarkRuleContext,
Sequence<?> extraLinkopts,
Sequence<?> extraLinkInputs,
StarlarkThread thread) {
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 9d14faf..f090057 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
@@ -288,7 +288,7 @@
}
@Override
- public CcToolchainConfigInfoApi ccToolchainConfigInfoFromSkylark(
+ public CcToolchainConfigInfoApi ccToolchainConfigInfoFromStarlark(
StarlarkRuleContextApi<ConstraintValueInfoApi> skylarkRuleContext,
Sequence<?> features,
Sequence<?> actionConfigs,
@@ -311,7 +311,7 @@
}
@Override
- public CcCompilationOutputsApi<FileApi> createCompilationOutputsFromSkylark(
+ public CcCompilationOutputsApi<FileApi> createCompilationOutputsFromStarlark(
Object objectsObject, Object picObjectsObject) {
return null;
}
