The great Skylark -> Starlark class migration:
AppleSkylarkCommon
ObjcProviderSkylarkConverters
SkylarkTestingModule
AspectValueKey.SkylarkAspectLoadingKey
AspectValueKey.HostSkylarkAspectLoadingKey
ErrorReadingSkylarkExtensionException
SkylarkAspectFactory
SkylarkModuleCycleReporter
ToplevelSkylarkAspectFunction
ToplevelSkylarkAspectFunction.LoadSkylarkAspectFunctionException
SkylarkBuildApiGlobals
AndroidSkylarkApiProviderApi
SkylarkTestingModuleTest
PiperOrigin-RevId: 311357679
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectValue.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectValue.java
index 6735b6c..9da5f0a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AspectValue.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectValue.java
@@ -30,8 +30,8 @@
@Nullable private Aspect aspect;
@Nullable private Location location;
// Normally the key used to evaluate this value in AspectFunction#compute. But in the case of a
- // top-level SkylarkAspectKey, the AspectValue will be this value but the key will be the
- // associated aspect key from SkylarkAspectKey#toAspectkey.
+ // top-level StarlarkAspectKey, the AspectValue will be this value but the key will be the
+ // associated aspect key from StarlarkAspectKey#toAspectkey.
@Nullable private AspectKey key;
@Nullable private ConfiguredAspect configuredAspect;
// May be null either after clearing or because transitive packages are not tracked.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 2e4a23b..76f5c89 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -342,7 +342,7 @@
aspectConfigurations.put(
Pair.of(targetSpec.getLabel(), aspect), targetSpec.getConfiguration());
aspectKeys.add(
- AspectValueKey.createSkylarkAspectKey(
+ AspectValueKey.createStarlarkAspectKey(
targetSpec.getLabel(),
// For invoking top-level aspects, use the top-level configuration for both the
// aspect and the base target while the top-level configuration is untrimmed.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
index b48f7ca..b6bbc08 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
@@ -66,7 +66,7 @@
this.actions = actions;
this.providers = providers;
- // Initialize every SkylarkApiProvider
+ // Initialize every StarlarkApiProvider
for (int i = 0; i < providers.getProviderCount(); i++) {
Object obj = providers.getProviderInstanceAt(i);
if (obj instanceof StarlarkApiProvider) {
@@ -184,12 +184,12 @@
return this;
}
- public Builder addSkylarkTransitiveInfo(String name, Object value) {
+ public Builder addStarlarkTransitiveInfo(String name, Object value) {
providers.put(name, value);
return this;
}
- public Builder addSkylarkDeclaredProvider(Info declaredProvider) throws EvalException {
+ public Builder addStarlarkDeclaredProvider(Info declaredProvider) throws EvalException {
Provider constructor = declaredProvider.getProvider();
if (!constructor.isExported()) {
throw new EvalException(
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/BazelBuildApiGlobals.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/BazelBuildApiGlobals.java
index 1380c81..3ee534a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/BazelBuildApiGlobals.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/BazelBuildApiGlobals.java
@@ -15,16 +15,16 @@
package com.google.devtools.build.lib.analysis.skylark;
import com.google.devtools.build.lib.packages.BazelStarlarkContext;
-import com.google.devtools.build.lib.skylarkbuildapi.SkylarkBuildApiGlobals;
+import com.google.devtools.build.lib.skylarkbuildapi.StarlarkBuildApiGlobals;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.Starlark;
import com.google.devtools.build.lib.syntax.StarlarkThread;
/**
- * Bazel implementation of {@link SkylarkBuildApiGlobals}: a collection of global Starlark build API
- * functions that belong in the global namespace.
+ * Bazel implementation of {@link StarlarkBuildApiGlobals}: a collection of global Starlark build
+ * API functions that belong in the global namespace.
*/
-public class BazelBuildApiGlobals implements SkylarkBuildApiGlobals {
+public class BazelBuildApiGlobals implements StarlarkBuildApiGlobals {
@Override
public StarlarkLateBoundDefault<?> configurationField(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkApiProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkApiProvider.java
index 62f7308..7b66231 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkApiProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidStarlarkApiProvider.java
@@ -26,7 +26,7 @@
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider;
import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider.OutputJar;
-import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidSkylarkApiProviderApi;
+import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidStarlarkApiProviderApi;
import java.util.function.Function;
import javax.annotation.Nullable;
@@ -36,7 +36,7 @@
*/
@Immutable
public class AndroidStarlarkApiProvider extends StarlarkApiProvider
- implements AndroidSkylarkApiProviderApi<Artifact> {
+ implements AndroidStarlarkApiProviderApi<Artifact> {
/** The name of the field in Starlark used to access this class. */
public static final String NAME = "android";
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java b/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java
index 2286eb1..746c8fd 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java
@@ -61,14 +61,14 @@
private static final ImmutableSet<String> BIT_32_TARGET_CPUS =
ImmutableSet.of("ios_i386", "ios_armv7", "ios_armv7s", "watchos_i386", "watchos_armv7k");
- private final String skylarkKey;
+ private final String starlarkKey;
private final String nameInPlist;
private final PlatformType platformType;
private final boolean isDevice;
ApplePlatform(
- String skylarkKey, String nameInPlist, PlatformType platformType, boolean isDevice) {
- this.skylarkKey = skylarkKey;
+ String starlarkKey, String nameInPlist, PlatformType platformType, boolean isDevice) {
+ this.starlarkKey = starlarkKey;
this.nameInPlist = Preconditions.checkNotNull(nameInPlist);
this.platformType = platformType;
this.isDevice = isDevice;
@@ -178,11 +178,11 @@
}
/** Returns a Starlark struct that contains the instances of this enum. */
- public static StructImpl getSkylarkStruct() {
+ public static StructImpl getStarlarkStruct() {
Provider constructor = new NativeProvider<StructImpl>(StructImpl.class, "platforms") {};
HashMap<String, Object> fields = new HashMap<>();
for (ApplePlatform type : values()) {
- fields.put(type.skylarkKey, type);
+ fields.put(type.starlarkKey, type);
}
return StarlarkInfo.create(constructor, fields, Location.BUILTIN);
}
@@ -215,10 +215,10 @@
* The key used to access the enum value as a field in the Starlark apple_common.platform_type
* struct.
*/
- private final String skylarkKey;
+ private final String starlarkKey;
- PlatformType(String skylarkKey) {
- this.skylarkKey = skylarkKey;
+ PlatformType(String starlarkKey) {
+ this.starlarkKey = starlarkKey;
}
@Override
@@ -242,11 +242,11 @@
}
/** Returns a Starlark struct that contains the instances of this enum. */
- public static StructImpl getSkylarkStruct() {
+ public static StructImpl getStarlarkStruct() {
Provider constructor = new NativeProvider<StructImpl>(StructImpl.class, "platform_types") {};
HashMap<String, Object> fields = new HashMap<>();
for (PlatformType type : values()) {
- fields.put(type.skylarkKey, type);
+ fields.put(type.starlarkKey, type);
}
return StarlarkInfo.create(constructor, fields, Location.BUILTIN);
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionProperties.java b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionProperties.java
index bdada11..7cabea4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionProperties.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/apple/XcodeVersionProperties.java
@@ -29,11 +29,11 @@
public class XcodeVersionProperties extends NativeInfo implements XcodePropertiesApi {
/** Starlark name for the XcodeVersionProperties provider. */
- public static final String SKYLARK_NAME = "XcodeProperties";
+ public static final String STARLARK_NAME = "XcodeProperties";
/** Starlark constructor and identifier for XcodeVersionProperties provider. */
- public static final NativeProvider<XcodeVersionProperties> SKYLARK_CONSTRUCTOR =
- new NativeProvider<XcodeVersionProperties>(XcodeVersionProperties.class, SKYLARK_NAME) {};
+ public static final NativeProvider<XcodeVersionProperties> STARLARK_CONSTRUCTOR =
+ new NativeProvider<XcodeVersionProperties>(XcodeVersionProperties.class, STARLARK_NAME) {};
@VisibleForTesting public static final String DEFAULT_IOS_SDK_VERSION = "8.4";
@VisibleForTesting public static final String DEFAULT_WATCHOS_SDK_VERSION = "2.0";
@@ -76,7 +76,7 @@
@Nullable String defaultWatchosSdkVersion,
@Nullable String defaultTvosSdkVersion,
@Nullable String defaultMacosSdkVersion) {
- super(SKYLARK_CONSTRUCTOR);
+ super(STARLARK_CONSTRUCTOR);
this.xcodeVersion = Optional.fromNullable(xcodeVersion);
this.defaultIosSdkVersion =
Strings.isNullOrEmpty(defaultIosSdkVersion)
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java
index 7eb118b..b2c8cfe 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationContext.java
@@ -139,34 +139,34 @@
}
@Override
- public Depset getSkylarkDefines() {
+ public Depset getStarlarkDefines() {
return Depset.of(Depset.ElementType.STRING, getDefines());
}
@Override
- public Depset getSkylarkNonTransitiveDefines() {
+ public Depset getStarlarkNonTransitiveDefines() {
return Depset.of(
Depset.ElementType.STRING,
NestedSetBuilder.wrap(Order.STABLE_ORDER, getNonTransitiveDefines()));
}
@Override
- public Depset getSkylarkHeaders() {
+ public Depset getStarlarkHeaders() {
return Depset.of(Artifact.TYPE, getDeclaredIncludeSrcs());
}
@Override
- public StarlarkList<Artifact> getSkylarkDirectModularHeaders() {
+ public StarlarkList<Artifact> getStarlarkDirectModularHeaders() {
return StarlarkList.immutableCopyOf(getDirectHdrs());
}
@Override
- public StarlarkList<Artifact> getSkylarkDirectTextualHeaders() {
+ public StarlarkList<Artifact> getStarlarkDirectTextualHeaders() {
return StarlarkList.immutableCopyOf(getTextualHdrs());
}
@Override
- public Depset getSkylarkSystemIncludeDirs() {
+ public Depset getStarlarkSystemIncludeDirs() {
return Depset.of(
Depset.ElementType.STRING,
NestedSetBuilder.wrap(
@@ -177,7 +177,7 @@
}
@Override
- public Depset getSkylarkFrameworkIncludeDirs() {
+ public Depset getStarlarkFrameworkIncludeDirs() {
return Depset.of(
Depset.ElementType.STRING,
NestedSetBuilder.wrap(
@@ -188,7 +188,7 @@
}
@Override
- public Depset getSkylarkIncludeDirs() {
+ public Depset getStarlarkIncludeDirs() {
return Depset.of(
Depset.ElementType.STRING,
NestedSetBuilder.wrap(
@@ -199,7 +199,7 @@
}
@Override
- public Depset getSkylarkQuoteIncludeDirs() {
+ public Depset getStarlarkQuoteIncludeDirs() {
return Depset.of(
Depset.ElementType.STRING,
NestedSetBuilder.wrap(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
index 012e213..4cb8a6e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
@@ -232,7 +232,7 @@
JavaStarlarkApiProvider skylarkApiProvider = JavaStarlarkApiProvider.fromRuleContext();
aspect
- .addSkylarkTransitiveInfo(JavaStarlarkApiProvider.NAME, skylarkApiProvider)
+ .addStarlarkTransitiveInfo(JavaStarlarkApiProvider.NAME, skylarkApiProvider)
.addNativeDeclaredProvider(javaInfo.build())
.addProvider(
new JavaProtoLibraryAspectProvider(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java
index 972aa2c..da1cece 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java
@@ -249,7 +249,7 @@
createCcLinkingInfo(ruleContext, aspectCommon.getProtoRuntimeDeps()));
JavaStarlarkApiProvider javaSkylarkApiProvider = JavaStarlarkApiProvider.fromRuleContext();
aspect
- .addSkylarkTransitiveInfo(JavaStarlarkApiProvider.NAME, javaSkylarkApiProvider)
+ .addStarlarkTransitiveInfo(JavaStarlarkApiProvider.NAME, javaSkylarkApiProvider)
.addNativeDeclaredProvider(javaInfo.build())
.addProvider(
new JavaProtoLibraryAspectProvider(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractObjcRuleSet.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractObjcRuleSet.java
index 0a2f147..3bc1bd1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractObjcRuleSet.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractObjcRuleSet.java
@@ -74,6 +74,6 @@
builder.addRuleDefinition(new AvailableXcodesRule());
builder.addRuleDefinition(new XcodeVersionRule());
- builder.addSkylarkBootstrap(new AppleBootstrap(new AppleSkylarkCommon(objcProtoAspect)));
+ builder.addSkylarkBootstrap(new AppleBootstrap(new AppleStarlarkCommon(objcProtoAspect)));
}
}
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 51ef2fa..d99be8b 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
@@ -287,7 +287,7 @@
ruleContext.getPrerequisite(
BUNDLE_LOADER_ATTR_NAME,
TransitionMode.TARGET,
- AppleExecutableBinaryInfo.SKYLARK_CONSTRUCTOR);
+ AppleExecutableBinaryInfo.STARLARK_CONSTRUCTOR);
extraLinkArgs.add(
"-bundle_loader", executableProvider.getAppleExecutableBinary().getExecPathString());
}
@@ -315,7 +315,7 @@
ruleContext.getPrerequisite(
BUNDLE_LOADER_ATTR_NAME,
TransitionMode.TARGET,
- AppleExecutableBinaryInfo.SKYLARK_CONSTRUCTOR);
+ AppleExecutableBinaryInfo.STARLARK_CONSTRUCTOR);
if (executableProvider != null) {
return ImmutableSet.<Artifact>of(executableProvider.getAppleExecutableBinary());
}
@@ -367,7 +367,7 @@
if (appleConfiguration.shouldLinkingRulesPropagateObjc() && objcProvider != null) {
targetBuilder.addNativeDeclaredProvider(objcProvider);
- targetBuilder.addStarlarkTransitiveInfo(ObjcProvider.SKYLARK_NAME, objcProvider);
+ targetBuilder.addStarlarkTransitiveInfo(ObjcProvider.STARLARK_NAME, objcProvider);
}
InstrumentedFilesInfo instrumentedFilesProvider =
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinaryRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinaryRule.java
index 8561279..ffd8b21 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinaryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleBinaryRule.java
@@ -129,7 +129,7 @@
.mandatoryProviders(
ImmutableList.of(
StarlarkProviderIdentifier.forKey(
- AppleExecutableBinaryInfo.SKYLARK_CONSTRUCTOR.getKey())))
+ AppleExecutableBinaryInfo.STARLARK_CONSTRUCTOR.getKey())))
.allowedFileTypes()
.singleArtifact()
.aspect(objcProtoAspect))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDebugOutputsInfo.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDebugOutputsInfo.java
index b40ce3d..41ccebc 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDebugOutputsInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDebugOutputsInfo.java
@@ -60,11 +60,11 @@
}
/** Starlark name for the AppleDebugOutputsInfo. */
- public static final String SKYLARK_NAME = "AppleDebugOutputs";
+ public static final String STARLARK_NAME = "AppleDebugOutputs";
/** Starlark constructor and identifier for AppleDebugOutputsInfo. */
- public static final NativeProvider<AppleDebugOutputsInfo> SKYLARK_CONSTRUCTOR =
- new NativeProvider<AppleDebugOutputsInfo>(AppleDebugOutputsInfo.class, SKYLARK_NAME) {};
+ public static final NativeProvider<AppleDebugOutputsInfo> STARLARK_CONSTRUCTOR =
+ new NativeProvider<AppleDebugOutputsInfo>(AppleDebugOutputsInfo.class, STARLARK_NAME) {};
private final ImmutableMap<String, ImmutableMap<String, Artifact>> outputsMap;
@@ -84,7 +84,7 @@
* </ul>
*/
private AppleDebugOutputsInfo(ImmutableMap<String, ImmutableMap<String, Artifact>> map) {
- super(SKYLARK_CONSTRUCTOR);
+ super(STARLARK_CONSTRUCTOR);
this.outputsMap = map;
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDylibBinaryInfo.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDylibBinaryInfo.java
index ce8f592..35d5c6e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDylibBinaryInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDylibBinaryInfo.java
@@ -35,18 +35,18 @@
public final class AppleDylibBinaryInfo extends NativeInfo implements AppleDylibBinaryApi {
/** Starlark name for the AppleDylibBinaryInfo. */
- public static final String SKYLARK_NAME = "AppleDylibBinary";
+ public static final String STARLARK_NAME = "AppleDylibBinary";
/** Starlark constructor and identifier for AppleDylibBinaryInfo. */
- public static final NativeProvider<AppleDylibBinaryInfo> SKYLARK_CONSTRUCTOR =
- new NativeProvider<AppleDylibBinaryInfo>(AppleDylibBinaryInfo.class, SKYLARK_NAME) {};
+ public static final NativeProvider<AppleDylibBinaryInfo> STARLARK_CONSTRUCTOR =
+ new NativeProvider<AppleDylibBinaryInfo>(AppleDylibBinaryInfo.class, STARLARK_NAME) {};
private final Artifact dylibBinary;
private final ObjcProvider depsObjcProvider;
public AppleDylibBinaryInfo(Artifact dylibBinary,
ObjcProvider depsObjcProvider) {
- super(SKYLARK_CONSTRUCTOR);
+ super(STARLARK_CONSTRUCTOR);
this.dylibBinary = dylibBinary;
this.depsObjcProvider = depsObjcProvider;
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDynamicFrameworkInfo.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDynamicFrameworkInfo.java
index 438f108..cfaae70 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDynamicFrameworkInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleDynamicFrameworkInfo.java
@@ -42,12 +42,12 @@
implements AppleDynamicFrameworkInfoApi<Artifact> {
/** Starlark name for the AppleDynamicFrameworkInfo. */
- public static final String SKYLARK_NAME = "AppleDynamicFramework";
+ public static final String STARLARK_NAME = "AppleDynamicFramework";
/** Starlark constructor and identifier for AppleDynamicFrameworkInfo. */
- public static final NativeProvider<AppleDynamicFrameworkInfo> SKYLARK_CONSTRUCTOR =
+ public static final NativeProvider<AppleDynamicFrameworkInfo> STARLARK_CONSTRUCTOR =
new NativeProvider<AppleDynamicFrameworkInfo>(
- AppleDynamicFrameworkInfo.class, SKYLARK_NAME) {};
+ AppleDynamicFrameworkInfo.class, STARLARK_NAME) {};
/** Field name for the dylib binary artifact of the dynamic framework. */
public static final String DYLIB_BINARY_FIELD_NAME = "binary";
@@ -68,7 +68,7 @@
ObjcProvider depsObjcProvider,
NestedSet<String> dynamicFrameworkDirs,
NestedSet<Artifact> dynamicFrameworkFiles) {
- super(SKYLARK_CONSTRUCTOR);
+ super(STARLARK_CONSTRUCTOR);
this.dylibBinary = dylibBinary;
this.depsObjcProvider = depsObjcProvider;
this.dynamicFrameworkDirs = dynamicFrameworkDirs;
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleExecutableBinaryInfo.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleExecutableBinaryInfo.java
index c258479..90adc59 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleExecutableBinaryInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleExecutableBinaryInfo.java
@@ -36,12 +36,12 @@
implements AppleExecutableBinaryApi {
/** Starlark name for the AppleExecutableBinaryInfo. */
- public static final String SKYLARK_NAME = "AppleExecutableBinary";
+ public static final String STARLARK_NAME = "AppleExecutableBinary";
/** Starlark constructor and identifier for AppleExecutableBinaryInfo. */
- public static final NativeProvider<AppleExecutableBinaryInfo> SKYLARK_CONSTRUCTOR =
+ public static final NativeProvider<AppleExecutableBinaryInfo> STARLARK_CONSTRUCTOR =
new NativeProvider<AppleExecutableBinaryInfo>(
- AppleExecutableBinaryInfo.class, SKYLARK_NAME) {};
+ AppleExecutableBinaryInfo.class, STARLARK_NAME) {};
private final Artifact appleExecutableBinary;
private final ObjcProvider depsObjcProvider;
@@ -52,7 +52,7 @@
*/
public AppleExecutableBinaryInfo(Artifact appleExecutableBinary,
ObjcProvider depsObjcProvider) {
- super(SKYLARK_CONSTRUCTOR);
+ super(STARLARK_CONSTRUCTOR);
this.appleExecutableBinary = appleExecutableBinary;
this.depsObjcProvider = depsObjcProvider;
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleLoadableBundleBinaryInfo.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleLoadableBundleBinaryInfo.java
index 89a9324..7ef2c24 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleLoadableBundleBinaryInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleLoadableBundleBinaryInfo.java
@@ -35,12 +35,12 @@
implements AppleLoadableBundleBinaryApi {
/** Starlark name for the AppleLoadableBundleBinary. */
- public static final String SKYLARK_NAME = "AppleLoadableBundleBinary";
+ public static final String STARLARK_NAME = "AppleLoadableBundleBinary";
/** Starlark constructor and identifier for AppleLoadableBundleBinary. */
- public static final NativeProvider<AppleLoadableBundleBinaryInfo> SKYLARK_CONSTRUCTOR =
+ public static final NativeProvider<AppleLoadableBundleBinaryInfo> STARLARK_CONSTRUCTOR =
new NativeProvider<AppleLoadableBundleBinaryInfo>(
- AppleLoadableBundleBinaryInfo.class, SKYLARK_NAME) {};
+ AppleLoadableBundleBinaryInfo.class, STARLARK_NAME) {};
private final Artifact appleLoadableBundleBinary;
private final ObjcProvider depsObjcProvider;
@@ -51,7 +51,7 @@
*/
public AppleLoadableBundleBinaryInfo(Artifact appleLoadableBundleBinary,
ObjcProvider depsObjcProvider) {
- super(SKYLARK_CONSTRUCTOR);
+ super(STARLARK_CONSTRUCTOR);
this.appleLoadableBundleBinary = appleLoadableBundleBinary;
this.depsObjcProvider = depsObjcProvider;
}
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/AppleStarlarkCommon.java
similarity index 89%
rename from src/main/java/com/google/devtools/build/lib/rules/objc/AppleSkylarkCommon.java
rename to src/main/java/com/google/devtools/build/lib/rules/objc/AppleStarlarkCommon.java
index e6a4bba..ff7e964 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/AppleStarlarkCommon.java
@@ -53,7 +53,7 @@
import javax.annotation.Nullable;
/** A class that exposes apple rule implementation internals to Starlark. */
-public class AppleSkylarkCommon
+public class AppleStarlarkCommon
implements AppleCommonApi<
Artifact,
ConstraintValueInfo,
@@ -95,7 +95,7 @@
private ObjcProtoAspect objcProtoAspect;
- public AppleSkylarkCommon(ObjcProtoAspect objcProtoAspect) {
+ public AppleStarlarkCommon(ObjcProtoAspect objcProtoAspect) {
this.objcProtoAspect = objcProtoAspect;
}
@@ -107,7 +107,7 @@
@Override
public StructImpl getPlatformTypeStruct() {
if (platformType == null) {
- platformType = PlatformType.getSkylarkStruct();
+ platformType = PlatformType.getStarlarkStruct();
}
return platformType;
}
@@ -115,14 +115,14 @@
@Override
public StructImpl getPlatformStruct() {
if (platform == null) {
- platform = ApplePlatform.getSkylarkStruct();
+ platform = ApplePlatform.getStarlarkStruct();
}
return platform;
}
@Override
public Provider getXcodeVersionPropertiesConstructor() {
- return XcodeVersionProperties.SKYLARK_CONSTRUCTOR;
+ return XcodeVersionProperties.STARLARK_CONSTRUCTOR;
}
@Override
@@ -132,37 +132,37 @@
@Override
public Provider getObjcProviderConstructor() {
- return ObjcProvider.SKYLARK_CONSTRUCTOR;
+ return ObjcProvider.STARLARK_CONSTRUCTOR;
}
@Override
public Provider getAppleDynamicFrameworkConstructor() {
- return AppleDynamicFrameworkInfo.SKYLARK_CONSTRUCTOR;
+ return AppleDynamicFrameworkInfo.STARLARK_CONSTRUCTOR;
}
@Override
public Provider getAppleDylibBinaryConstructor() {
- return AppleDylibBinaryInfo.SKYLARK_CONSTRUCTOR;
+ return AppleDylibBinaryInfo.STARLARK_CONSTRUCTOR;
}
@Override
public Provider getAppleExecutableBinaryConstructor() {
- return AppleExecutableBinaryInfo.SKYLARK_CONSTRUCTOR;
+ return AppleExecutableBinaryInfo.STARLARK_CONSTRUCTOR;
}
@Override
public AppleStaticLibraryInfo.Provider getAppleStaticLibraryProvider() {
- return AppleStaticLibraryInfo.SKYLARK_CONSTRUCTOR;
+ return AppleStaticLibraryInfo.STARLARK_CONSTRUCTOR;
}
@Override
public Provider getAppleDebugOutputsConstructor() {
- return AppleDebugOutputsInfo.SKYLARK_CONSTRUCTOR;
+ return AppleDebugOutputsInfo.STARLARK_CONSTRUCTOR;
}
@Override
public Provider getAppleLoadableBundleBinaryConstructor() {
- return AppleLoadableBundleBinaryInfo.SKYLARK_CONSTRUCTOR;
+ return AppleLoadableBundleBinaryInfo.STARLARK_CONSTRUCTOR;
}
@Override
@@ -194,15 +194,15 @@
resultBuilder.add(ObjcProvider.FLAG, ObjcProvider.Flag.USES_SWIFT);
}
for (Map.Entry<?, ?> entry : kwargs.entrySet()) {
- Key<?> key = ObjcProvider.getSkylarkKeyForString((String) entry.getKey());
+ Key<?> key = ObjcProvider.getStarlarkKeyForString((String) entry.getKey());
if (key != null) {
- resultBuilder.addElementsFromSkylark(key, entry.getValue());
+ resultBuilder.addElementsFromStarlark(key, entry.getValue());
} else if (entry.getKey().equals("strict_include")) {
- resultBuilder.addStrictIncludeFromSkylark(entry.getValue());
+ resultBuilder.addStrictIncludeFromStarlark(entry.getValue());
} else if (entry.getKey().equals("providers")) {
- resultBuilder.addProvidersFromSkylark(entry.getValue());
+ resultBuilder.addProvidersFromStarlark(entry.getValue());
} else if (entry.getKey().equals("direct_dep_providers")) {
- resultBuilder.addDirectDepProvidersFromSkylark(entry.getValue());
+ resultBuilder.addDirectDepProvidersFromStarlark(entry.getValue());
} else {
throw new EvalException(null, String.format(BAD_KEY_ERROR, entry.getKey()));
}
@@ -241,7 +241,7 @@
ruleContext,
ImmutableList.copyOf(Sequence.cast(extraLinkopts, String.class, "extra_linkopts")),
Sequence.cast(extraLinkInputs, Artifact.class, "extra_link_inputs"));
- return createAppleBinaryOutputSkylarkStruct(appleBinaryOutput, thread);
+ return createAppleBinaryOutputStarlarkStruct(appleBinaryOutput, thread);
} catch (RuleErrorException | ActionConflictException exception) {
throw new EvalException(null, exception);
}
@@ -265,7 +265,7 @@
* Creates a Starlark struct that contains the results of the {@code link_multi_arch_binary}
* function.
*/
- private StructImpl createAppleBinaryOutputSkylarkStruct(
+ private StructImpl createAppleBinaryOutputStarlarkStruct(
AppleBinaryOutput output, StarlarkThread thread) {
Provider constructor =
new NativeProvider<StructImpl>(StructImpl.class, "apple_binary_output") {};
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 8ce28e6..9649b48 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
@@ -76,7 +76,7 @@
ruleContext.getPrerequisitesByConfiguration(
AppleStaticLibraryRule.AVOID_DEPS_ATTR_NAME,
TransitionMode.SPLIT,
- ObjcProvider.SKYLARK_CONSTRUCTOR));
+ ObjcProvider.STARLARK_CONSTRUCTOR));
ImmutableListMultimap<String, CcInfo> cpuToCcAvoidDepsMap =
MultiArchBinarySupport.transformMap(
@@ -197,7 +197,7 @@
if (appleConfiguration.shouldLinkingRulesPropagateObjc()) {
targetBuilder.addNativeDeclaredProvider(objcProvider);
- targetBuilder.addStarlarkTransitiveInfo(ObjcProvider.SKYLARK_NAME, objcProvider);
+ targetBuilder.addStarlarkTransitiveInfo(ObjcProvider.STARLARK_NAME, objcProvider);
}
targetBuilder
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryInfo.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryInfo.java
index 454b3d1..f8bce5d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryInfo.java
@@ -36,7 +36,7 @@
public final class AppleStaticLibraryInfo extends NativeInfo implements AppleStaticLibraryInfoApi {
/** Starlark constructor and identifier for AppleStaticLibraryInfo. */
- public static final Provider SKYLARK_CONSTRUCTOR = new Provider();
+ public static final Provider STARLARK_CONSTRUCTOR = new Provider();
private final Artifact multiArchArchive;
private final ObjcProvider depsObjcProvider;
@@ -47,7 +47,7 @@
*/
public AppleStaticLibraryInfo(Artifact multiArchArchive,
ObjcProvider depsObjcProvider) {
- super(SKYLARK_CONSTRUCTOR);
+ super(STARLARK_CONSTRUCTOR);
this.multiArchArchive = multiArchArchive;
this.depsObjcProvider = depsObjcProvider;
}
@@ -68,7 +68,7 @@
public static class Provider extends BuiltinProvider<AppleStaticLibraryInfo>
implements AppleStaticLibraryInfoApi.AppleStaticLibraryInfoProvider<Artifact, ObjcProvider> {
private Provider() {
- super(SKYLARK_NAME, AppleStaticLibraryInfo.class);
+ super(STARLARK_NAME, AppleStaticLibraryInfo.class);
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryRule.java
index fc3ea65..e026a7c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStaticLibraryRule.java
@@ -87,7 +87,7 @@
attr(AVOID_DEPS_ATTR_NAME, LABEL_LIST)
.direct_compile_time_input()
.allowedRuleClasses(ObjcRuleClasses.CompilingRule.ALLOWED_CC_DEPS_RULE_CLASSES)
- .mandatoryProviders(ObjcProvider.SKYLARK_CONSTRUCTOR.id())
+ .mandatoryProviders(ObjcProvider.STARLARK_CONSTRUCTOR.id())
.cfg(splitTransitionProvider)
.allowedFileTypes()
.aspect(objcProtoAspect))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java
index 1a1fd4c..cfa96be 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationAttributes.java
@@ -281,7 +281,7 @@
if (ruleContext.attributes().has("deps", BuildType.LABEL_LIST)) {
List<ObjcProvider> providers =
ruleContext.getPrerequisites(
- "deps", TransitionMode.TARGET, ObjcProvider.SKYLARK_CONSTRUCTOR);
+ "deps", TransitionMode.TARGET, ObjcProvider.STARLARK_CONSTRUCTOR);
for (ObjcProvider provider : providers) {
moduleMaps.addTransitive(provider.get(TOP_LEVEL_MODULE_MAP));
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
index 837d318..c3ca52b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java
@@ -1426,7 +1426,7 @@
Artifact dummyArchive =
ruleContext
.getPrerequisite(
- "$dummy_lib", TransitionMode.TARGET, ObjcProvider.SKYLARK_CONSTRUCTOR)
+ "$dummy_lib", TransitionMode.TARGET, ObjcProvider.STARLARK_CONSTRUCTOR)
.get(LIBRARY)
.getSingleton();
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 169d08c..975669c 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
@@ -146,7 +146,7 @@
.propagateAlongAttribute("runtime_deps")
.requireSkylarkProviders(StarlarkProviderIdentifier.forKey(JavaInfo.PROVIDER.getKey()))
.requireSkylarkProviders(ProtoInfo.PROVIDER.id())
- .advertiseProvider(ImmutableList.of(ObjcProvider.SKYLARK_CONSTRUCTOR.id()))
+ .advertiseProvider(ImmutableList.of(ObjcProvider.STARLARK_CONSTRUCTOR.id()))
.requiresConfigurationFragments(
AppleConfiguration.class,
CppConfiguration.class,
@@ -886,14 +886,14 @@
}
builder.addDepCcHeaderProviders(ccInfoList.build());
builder.addDepObjcProviders(
- ruleContext.getPrerequisites(attrName, attrMode, ObjcProvider.SKYLARK_CONSTRUCTOR));
+ ruleContext.getPrerequisites(attrName, attrMode, ObjcProvider.STARLARK_CONSTRUCTOR));
}
}
// We can't just use addDeps since that now takes ConfiguredTargetAndData and we only have
// TransitiveInfoCollections
builder.addDepObjcProviders(
- otherDeps.stream().map(d -> d.get(ObjcProvider.SKYLARK_CONSTRUCTOR)).collect(toList()));
+ otherDeps.stream().map(d -> d.get(ObjcProvider.STARLARK_CONSTRUCTOR)).collect(toList()));
builder.addDepCcHeaderProviders(
otherDeps.stream().map(d -> d.get(CcInfo.PROVIDER)).collect(toList()));
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java
index 3f4c82a..e9d722a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java
@@ -113,7 +113,7 @@
CcInfo.builder()
.setCcCompilationContext(objcProvider.getCcCompilationContext())
.build())
- .addStarlarkTransitiveInfo(ObjcProvider.SKYLARK_NAME, objcProvider)
+ .addStarlarkTransitiveInfo(ObjcProvider.STARLARK_NAME, objcProvider)
.build();
}
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 7a741f1..d63633b 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
@@ -275,13 +275,13 @@
ImmutableList<TransitiveInfoCollection> transitiveInfoCollections) {
// Dylibs.
ImmutableList<ObjcProvider> frameworkObjcProviders =
- getTypedProviders(transitiveInfoCollections, AppleDynamicFrameworkInfo.SKYLARK_CONSTRUCTOR)
+ getTypedProviders(transitiveInfoCollections, AppleDynamicFrameworkInfo.STARLARK_CONSTRUCTOR)
.stream()
.map(frameworkProvider -> frameworkProvider.getDepsObjcProvider())
.collect(ImmutableList.toImmutableList());
// Bundle Loaders.
ImmutableList<ObjcProvider> executableObjcProviders =
- getTypedProviders(transitiveInfoCollections, AppleExecutableBinaryInfo.SKYLARK_CONSTRUCTOR)
+ getTypedProviders(transitiveInfoCollections, AppleExecutableBinaryInfo.STARLARK_CONSTRUCTOR)
.stream()
.map(frameworkProvider -> frameworkProvider.getDepsObjcProvider())
.collect(ImmutableList.toImmutableList());
@@ -289,7 +289,7 @@
return Iterables.concat(
frameworkObjcProviders,
executableObjcProviders,
- getTypedProviders(transitiveInfoCollections, ObjcProvider.SKYLARK_CONSTRUCTOR));
+ getTypedProviders(transitiveInfoCollections, ObjcProvider.STARLARK_CONSTRUCTOR));
}
private ObjcCommon common(
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 c496cf1..f403ad2 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
@@ -190,8 +190,8 @@
ConfiguredTarget depCT = dep.getConfiguredTarget();
// It is redundant to process both ObjcProvider and CcInfo; doing so causes direct header
// field to include indirect headers from deps.
- if (depCT.get(ObjcProvider.SKYLARK_CONSTRUCTOR) != null) {
- addAnyProviders(propagatedObjcDeps, depCT, ObjcProvider.SKYLARK_CONSTRUCTOR);
+ if (depCT.get(ObjcProvider.STARLARK_CONSTRUCTOR) != null) {
+ addAnyProviders(propagatedObjcDeps, depCT, ObjcProvider.STARLARK_CONSTRUCTOR);
} else {
addAnyProviders(cppDeps, depCT, CcInfo.PROVIDER);
if (isCcLibrary(dep)) {
@@ -216,8 +216,8 @@
for (ConfiguredTargetAndData dep : deps) {
ConfiguredTarget depCT = dep.getConfiguredTarget();
- if (depCT.get(ObjcProvider.SKYLARK_CONSTRUCTOR) != null) {
- addAnyProviders(propagatedObjcDeps, depCT, ObjcProvider.SKYLARK_CONSTRUCTOR);
+ if (depCT.get(ObjcProvider.STARLARK_CONSTRUCTOR) != null) {
+ addAnyProviders(propagatedObjcDeps, depCT, ObjcProvider.STARLARK_CONSTRUCTOR);
} else {
// This is the way we inject cc_library attributes into direct fields.
addAnyProviders(directCppDeps, depCT, CcInfo.PROVIDER);
@@ -248,7 +248,7 @@
ImmutableList.Builder<ObjcProvider> propagatedDeps = ImmutableList.builder();
for (TransitiveInfoCollection dep : runtimeDeps) {
- addAnyProviders(propagatedDeps, dep, ObjcProvider.SKYLARK_CONSTRUCTOR);
+ addAnyProviders(propagatedDeps, dep, ObjcProvider.STARLARK_CONSTRUCTOR);
}
this.runtimeDepObjcProviders =
Iterables.concat(this.runtimeDepObjcProviders, propagatedDeps.build());
@@ -261,7 +261,7 @@
ImmutableList.Builder<CcInfo> cppDeps = ImmutableList.builder();
for (TransitiveInfoCollection dep : runtimeDeps) {
- addAnyProviders(propagatedObjcDeps, dep, ObjcProvider.SKYLARK_CONSTRUCTOR);
+ addAnyProviders(propagatedObjcDeps, dep, ObjcProvider.STARLARK_CONSTRUCTOR);
addAnyProviders(cppDeps, dep, CcInfo.PROVIDER);
}
this.runtimeDepObjcProviders =
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcImport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcImport.java
index 205785f..90c27f9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcImport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcImport.java
@@ -72,7 +72,7 @@
CcInfo.builder()
.setCcCompilationContext(objcProvider.getCcCompilationContext())
.build())
- .addStarlarkTransitiveInfo(ObjcProvider.SKYLARK_NAME, objcProvider)
+ .addStarlarkTransitiveInfo(ObjcProvider.STARLARK_NAME, objcProvider)
.build();
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibrary.java
index c5438f6..bfa2456 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcLibrary.java
@@ -104,7 +104,7 @@
return ObjcRuleClasses.ruleConfiguredTarget(ruleContext, filesToBuild.build())
.addNativeDeclaredProvider(objcProvider)
- .addStarlarkTransitiveInfo(ObjcProvider.SKYLARK_NAME, objcProvider)
+ .addStarlarkTransitiveInfo(ObjcProvider.STARLARK_NAME, objcProvider)
.addProvider(J2ObjcEntryClassProvider.class, j2ObjcEntryClassProvider)
.addProvider(J2ObjcMappingFileProvider.class, j2ObjcMappingFileProvider)
.addNativeDeclaredProvider(
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 c6969e3..b6cb14a 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
@@ -113,7 +113,7 @@
ruleContext.getPrerequisite(
ObjcRuleClasses.PROTO_LIB_ATTR,
TransitionMode.TARGET,
- ObjcProvider.SKYLARK_CONSTRUCTOR);
+ ObjcProvider.STARLARK_CONSTRUCTOR);
protobufCcCompilationContext = protobufObjcProvider.getCcCompilationContext();
}
aspectObjcProtoProvider.addProtobufHeaders(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
index 27abe35..6f2052f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProvider.java
@@ -78,7 +78,7 @@
public final class ObjcProvider implements Info, ObjcProviderApi<Artifact> {
/** Starlark name for the ObjcProvider. */
- public static final String SKYLARK_NAME = "objc";
+ public static final String STARLARK_NAME = "objc";
/** Expected suffix for a framework-containing directory. */
public static final String FRAMEWORK_SUFFIX = ".framework";
@@ -90,18 +90,18 @@
@Immutable
public static class Key<E> {
private final Order order;
- private final String skylarkKeyName;
+ private final String starlarkKeyName;
private final Class<E> type;
- private Key(Order order, String skylarkKeyName, Class<E> type) {
+ private Key(Order order, String starlarkKeyName, Class<E> type) {
this.order = Preconditions.checkNotNull(order);
- this.skylarkKeyName = skylarkKeyName;
+ this.starlarkKeyName = starlarkKeyName;
this.type = type;
}
/** Returns the name of the collection represented by this key in the Starlark provider. */
- public String getSkylarkKeyName() {
- return skylarkKeyName;
+ public String getStarlarkKeyName() {
+ return starlarkKeyName;
}
/**
@@ -324,7 +324,7 @@
DEFINE, FRAMEWORK_SEARCH_PATHS, HEADER, INCLUDE, INCLUDE_SYSTEM, IQUOTE);
/** All keys in ObjcProvider that will be passed in the corresponding Starlark provider. */
- static final ImmutableList<Key<?>> KEYS_FOR_SKYLARK =
+ static final ImmutableList<Key<?>> KEYS_FOR_STARLARK =
ImmutableList.<Key<?>>of(
DEFINE,
DYNAMIC_FRAMEWORK_FILE,
@@ -377,7 +377,7 @@
@Override
public Depset /*<String>*/ defineForStarlark() {
- return getCcCompilationContext().getSkylarkDefines();
+ return getCcCompilationContext().getStarlarkDefines();
}
public NestedSet<String> define() {
@@ -473,7 +473,7 @@
@Override
public Depset systemIncludeForStarlark() {
- return getCcCompilationContext().getSkylarkSystemIncludeDirs();
+ return getCcCompilationContext().getStarlarkSystemIncludeDirs();
}
public ImmutableList<PathFragment> systemInclude() {
@@ -482,7 +482,7 @@
@Override
public Depset quoteIncludeForStarlark() {
- return getCcCompilationContext().getSkylarkQuoteIncludeDirs();
+ return getCcCompilationContext().getStarlarkQuoteIncludeDirs();
}
public ImmutableList<PathFragment> quoteInclude() {
@@ -562,7 +562,7 @@
@Override
public Depset sdkFramework() {
return (Depset)
- ObjcProviderSkylarkConverters.convertToSkylark(SDK_FRAMEWORK, get(SDK_FRAMEWORK));
+ ObjcProviderStarlarkConverters.convertToStarlark(SDK_FRAMEWORK, get(SDK_FRAMEWORK));
}
@Override
@@ -596,7 +596,8 @@
@Override
public Depset weakSdkFramework() {
return (Depset)
- ObjcProviderSkylarkConverters.convertToSkylark(WEAK_SDK_FRAMEWORK, get(WEAK_SDK_FRAMEWORK));
+ ObjcProviderStarlarkConverters.convertToStarlark(
+ WEAK_SDK_FRAMEWORK, get(WEAK_SDK_FRAMEWORK));
}
@Override
@@ -611,7 +612,7 @@
* should follow each such case.
*/
@VisibleForTesting
- static final ImmutableList<Key<?>> KEYS_NOT_IN_SKYLARK =
+ static final ImmutableList<Key<?>> KEYS_NOT_IN_STARLARK =
ImmutableList.<Key<?>>of(
// LibraryToLink not exposed to Starlark.
CC_LIBRARY,
@@ -650,9 +651,9 @@
* Returns the Starlark key for the given string, or null if no such key exists or is available to
* Starlark.
*/
- static Key<?> getSkylarkKeyForString(String keyName) {
- for (Key<?> candidateKey : KEYS_FOR_SKYLARK) {
- if (candidateKey.getSkylarkKeyName().equals(keyName)) {
+ static Key<?> getStarlarkKeyForString(String keyName) {
+ for (Key<?> candidateKey : KEYS_FOR_STARLARK) {
+ if (candidateKey.getStarlarkKeyName().equals(keyName)) {
return candidateKey;
}
}
@@ -660,7 +661,7 @@
}
/** Starlark constructor and identifier for ObjcProvider. */
- public static final BuiltinProvider<ObjcProvider> SKYLARK_CONSTRUCTOR = new Constructor();
+ public static final BuiltinProvider<ObjcProvider> STARLARK_CONSTRUCTOR = new Constructor();
private ObjcProvider(
StarlarkSemantics semantics,
@@ -677,7 +678,7 @@
@Override
public BuiltinProvider<ObjcProvider> getProvider() {
- return SKYLARK_CONSTRUCTOR;
+ return STARLARK_CONSTRUCTOR;
}
/**
@@ -1052,7 +1053,7 @@
return new EvalException(
null,
String.format(
- AppleSkylarkCommon.BAD_DIRECT_DEPENDENCY_KEY_ERROR, key.getSkylarkKeyName()));
+ AppleStarlarkCommon.BAD_DIRECT_DEPENDENCY_KEY_ERROR, key.getStarlarkKeyName()));
}
/**
@@ -1177,14 +1178,14 @@
* Add elements in toAdd with the given key from Starlark. An error is thrown if toAdd is not an
* appropriate Depset.
*/
- void addElementsFromSkylark(Key<?> key, Object skylarkToAdd) throws EvalException {
- NestedSet<?> toAdd = ObjcProviderSkylarkConverters.convertToJava(key, skylarkToAdd);
+ void addElementsFromStarlark(Key<?> key, Object starlarkToAdd) throws EvalException {
+ NestedSet<?> toAdd = ObjcProviderStarlarkConverters.convertToJava(key, starlarkToAdd);
if (KEYS_FOR_COMPILE_INFO.contains(key)) {
- String keyName = key.getSkylarkKeyName();
+ String keyName = key.getStarlarkKeyName();
if (key == DEFINE) {
ccCompilationContextBuilder.addDefines(
- Depset.noneableCast(skylarkToAdd, String.class, keyName));
+ Depset.noneableCast(starlarkToAdd, String.class, keyName));
} else if (key == FRAMEWORK_SEARCH_PATHS) {
// Due to legacy reasons, There is a mismatch between the starlark interface for the
// framework search path, and the internal representation. The interface specifies that
@@ -1193,7 +1194,7 @@
// this ugly conversion.
ImmutableList<PathFragment> frameworks =
- Depset.noneableCast(skylarkToAdd, String.class, keyName).toList().stream()
+ Depset.noneableCast(starlarkToAdd, String.class, keyName).toList().stream()
.map(x -> PathFragment.create(x))
.collect(ImmutableList.toImmutableList());
@@ -1201,29 +1202,29 @@
for (PathFragment framework : frameworks) {
if (!framework.getSafePathString().endsWith(FRAMEWORK_SUFFIX)) {
throw new EvalException(
- null, String.format(AppleSkylarkCommon.BAD_FRAMEWORK_PATH_ERROR, framework));
+ null, String.format(AppleStarlarkCommon.BAD_FRAMEWORK_PATH_ERROR, framework));
}
frameworkSearchPaths.add(framework.getParentDirectory());
}
ccCompilationContextBuilder.addFrameworkIncludeDirs(frameworkSearchPaths.build());
} else if (key == HEADER) {
ImmutableList<Artifact> hdrs =
- Depset.noneableCast(skylarkToAdd, Artifact.class, keyName).toList();
+ Depset.noneableCast(starlarkToAdd, Artifact.class, keyName).toList();
ccCompilationContextBuilder.addDeclaredIncludeSrcs(hdrs);
ccCompilationContextBuilder.addTextualHdrs(hdrs);
} else if (key == INCLUDE) {
ccCompilationContextBuilder.addIncludeDirs(
- Depset.noneableCast(skylarkToAdd, String.class, keyName).toList().stream()
+ Depset.noneableCast(starlarkToAdd, String.class, keyName).toList().stream()
.map(x -> PathFragment.create(x))
.collect(ImmutableList.toImmutableList()));
} else if (key == INCLUDE_SYSTEM) {
ccCompilationContextBuilder.addSystemIncludeDirs(
- Depset.noneableCast(skylarkToAdd, String.class, keyName).toList().stream()
+ Depset.noneableCast(starlarkToAdd, String.class, keyName).toList().stream()
.map(x -> PathFragment.create(x))
.collect(ImmutableList.toImmutableList()));
} else if (key == IQUOTE) {
ccCompilationContextBuilder.addQuoteIncludeDirs(
- Depset.noneableCast(skylarkToAdd, String.class, keyName).toList().stream()
+ Depset.noneableCast(starlarkToAdd, String.class, keyName).toList().stream()
.map(x -> PathFragment.create(x))
.collect(ImmutableList.toImmutableList()));
}
@@ -1241,10 +1242,11 @@
* ObjcProvider instances.
*/
@SuppressWarnings("unchecked")
- void addProvidersFromSkylark(Object toAdd) throws EvalException {
+ void addProvidersFromStarlark(Object toAdd) throws EvalException {
if (!(toAdd instanceof Iterable)) {
throw new EvalException(
- null, String.format(AppleSkylarkCommon.BAD_PROVIDERS_ITER_ERROR, Starlark.type(toAdd)));
+ null,
+ String.format(AppleStarlarkCommon.BAD_PROVIDERS_ITER_ERROR, Starlark.type(toAdd)));
} else {
Iterable<Object> toAddIterable = (Iterable<Object>) toAdd;
for (Object toAddObject : toAddIterable) {
@@ -1252,7 +1254,7 @@
throw new EvalException(
null,
String.format(
- AppleSkylarkCommon.BAD_PROVIDERS_ELEM_ERROR, Starlark.type(toAddObject)));
+ AppleStarlarkCommon.BAD_PROVIDERS_ELEM_ERROR, Starlark.type(toAddObject)));
} else {
ObjcProvider objcProvider = (ObjcProvider) toAddObject;
this.addTransitiveAndPropagate(objcProvider);
@@ -1268,10 +1270,11 @@
* direct dependers. An error is thrown if toAdd is not an iterable of ObjcProvider instances.
*/
@SuppressWarnings("unchecked")
- void addDirectDepProvidersFromSkylark(Object toAdd) throws EvalException {
+ void addDirectDepProvidersFromStarlark(Object toAdd) throws EvalException {
if (!(toAdd instanceof Iterable)) {
throw new EvalException(
- null, String.format(AppleSkylarkCommon.BAD_PROVIDERS_ITER_ERROR, Starlark.type(toAdd)));
+ null,
+ String.format(AppleStarlarkCommon.BAD_PROVIDERS_ITER_ERROR, Starlark.type(toAdd)));
} else {
Iterable<Object> toAddIterable = (Iterable<Object>) toAdd;
for (Object toAddObject : toAddIterable) {
@@ -1279,7 +1282,7 @@
throw new EvalException(
null,
String.format(
- AppleSkylarkCommon.BAD_PROVIDERS_ELEM_ERROR, Starlark.type(toAddObject)));
+ AppleStarlarkCommon.BAD_PROVIDERS_ELEM_ERROR, Starlark.type(toAddObject)));
} else {
this.addAsDirectDeps((ObjcProvider) toAddObject);
}
@@ -1288,14 +1291,14 @@
}
/**
- * Adds the given strict include paths from Starlark. An error is thrown if skylarkToAdd is not
+ * Adds the given strict include paths from Starlark. An error is thrown if starlarkToAdd is not
* an appropriate Depset.
*/
@SuppressWarnings("unchecked")
- void addStrictIncludeFromSkylark(Object skylarkToAdd) throws EvalException {
+ void addStrictIncludeFromStarlark(Object starlarkToAdd) throws EvalException {
NestedSet<PathFragment> toAdd =
(NestedSet<PathFragment>)
- ObjcProviderSkylarkConverters.convertToJava(INCLUDE, skylarkToAdd);
+ ObjcProviderStarlarkConverters.convertToJava(INCLUDE, starlarkToAdd);
addStrictDependencyIncludes(toAdd.toList());
}
@@ -1309,12 +1312,12 @@
private static class Constructor extends BuiltinProvider<ObjcProvider>
implements WithLegacyStarlarkName {
public Constructor() {
- super(ObjcProvider.SKYLARK_NAME, ObjcProvider.class);
+ super(ObjcProvider.STARLARK_NAME, ObjcProvider.class);
}
@Override
public String getStarlarkName() {
- return SKYLARK_NAME;
+ return STARLARK_NAME;
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProviderSkylarkConverters.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProviderStarlarkConverters.java
similarity index 76%
rename from src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProviderSkylarkConverters.java
rename to src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProviderStarlarkConverters.java
index 7c42fed..04560e8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProviderSkylarkConverters.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcProviderStarlarkConverters.java
@@ -14,7 +14,7 @@
package com.google.devtools.build.lib.rules.objc;
-import static com.google.devtools.build.lib.rules.objc.AppleSkylarkCommon.NOT_SET_ERROR;
+import static com.google.devtools.build.lib.rules.objc.AppleStarlarkCommon.NOT_SET_ERROR;
import com.google.common.collect.ImmutableMap;
import com.google.devtools.build.lib.actions.Artifact;
@@ -27,7 +27,7 @@
import com.google.devtools.build.lib.vfs.PathFragment;
/** A utility class for converting ObjcProvider values between java and Starlark representation. */
-public class ObjcProviderSkylarkConverters {
+public class ObjcProviderStarlarkConverters {
/**
* A map of possible NestedSet types to the converters that should define their treatment in
@@ -42,18 +42,18 @@
.build();
/** Returns a value for a Starlark attribute given a java ObjcProvider key and value. */
- public static Object convertToSkylark(Key<?> javaKey, NestedSet<?> javaValue) {
- return CONVERTERS.get(javaKey.getType()).valueForSkylark(javaKey, javaValue);
+ public static Object convertToStarlark(Key<?> javaKey, NestedSet<?> javaValue) {
+ return CONVERTERS.get(javaKey.getType()).valueForStarlark(javaKey, javaValue);
}
/** Returns a value for a java ObjcProvider given a key and a corresponding Starlark value. */
- public static NestedSet<?> convertToJava(Key<?> javaKey, Object skylarkValue)
+ public static NestedSet<?> convertToJava(Key<?> javaKey, Object starlarkValue)
throws EvalException {
- return CONVERTERS.get(javaKey.getType()).valueForJava(javaKey, skylarkValue);
+ return CONVERTERS.get(javaKey.getType()).valueForJava(javaKey, starlarkValue);
}
/** Converts {@link PathFragment}s into a Starlark-compatible nested set of path strings. */
- public static Depset convertPathFragmentsToSkylark(NestedSet<PathFragment> pathFragments) {
+ public static Depset convertPathFragmentsToStarlark(NestedSet<PathFragment> pathFragments) {
NestedSetBuilder<String> result = NestedSetBuilder.stableOrder();
for (PathFragment path : pathFragments.toList()) {
result.add(path.getSafePathString());
@@ -64,24 +64,24 @@
/** A converter for ObjcProvider values. */
private interface Converter {
/** Translates a java ObjcProvider value to a Starlark ObjcProvider value. */
- Object valueForSkylark(Key<?> javaKey, NestedSet<?> javaValue);
+ Object valueForStarlark(Key<?> javaKey, NestedSet<?> javaValue);
/** Translates a Starlark ObjcProvider value to a java ObjcProvider value. */
- NestedSet<?> valueForJava(Key<?> javaKey, Object skylarkValue) throws EvalException;
+ NestedSet<?> valueForJava(Key<?> javaKey, Object starlarkValue) throws EvalException;
}
/** A converter that uses the same value for java and Starlark. */
private static class DirectConverter implements Converter {
@Override
- public Object valueForSkylark(Key<?> javaKey, NestedSet<?> javaValue) {
+ public Object valueForStarlark(Key<?> javaKey, NestedSet<?> javaValue) {
Depset.ElementType type = Depset.ElementType.of(javaKey.getType());
return Depset.of(type, javaValue);
}
@Override
- public NestedSet<?> valueForJava(Key<?> javaKey, Object skylarkValue) throws EvalException {
- return nestedSetWithType(skylarkValue, javaKey.getType(), javaKey.getSkylarkKeyName());
+ public NestedSet<?> valueForJava(Key<?> javaKey, Object starlarkValue) throws EvalException {
+ return nestedSetWithType(starlarkValue, javaKey.getType(), javaKey.getStarlarkKeyName());
}
}
@@ -90,14 +90,14 @@
@SuppressWarnings("unchecked")
@Override
- public Object valueForSkylark(Key<?> javaKey, NestedSet<?> javaValue) {
- return convertPathFragmentsToSkylark((NestedSet<PathFragment>) javaValue);
+ public Object valueForStarlark(Key<?> javaKey, NestedSet<?> javaValue) {
+ return convertPathFragmentsToStarlark((NestedSet<PathFragment>) javaValue);
}
@Override
- public NestedSet<?> valueForJava(Key<?> javaKey, Object skylarkValue) throws EvalException {
+ public NestedSet<?> valueForJava(Key<?> javaKey, Object starlarkValue) throws EvalException {
NestedSet<String> nestedSet =
- nestedSetWithType(skylarkValue, String.class, javaKey.getSkylarkKeyName());
+ nestedSetWithType(starlarkValue, String.class, javaKey.getStarlarkKeyName());
NestedSetBuilder<PathFragment> result = NestedSetBuilder.stableOrder();
for (String path : nestedSet.toList()) {
result.add(PathFragment.create(path));
@@ -111,7 +111,7 @@
@SuppressWarnings("unchecked")
@Override
- public Object valueForSkylark(Key<?> javaKey, NestedSet<?> javaValue) {
+ public Object valueForStarlark(Key<?> javaKey, NestedSet<?> javaValue) {
NestedSetBuilder<String> result = NestedSetBuilder.stableOrder();
for (SdkFramework framework : ((NestedSet<SdkFramework>) javaValue).toList()) {
result.add(framework.getName());
@@ -120,9 +120,9 @@
}
@Override
- public NestedSet<?> valueForJava(Key<?> javaKey, Object skylarkValue) throws EvalException {
+ public NestedSet<?> valueForJava(Key<?> javaKey, Object starlarkValue) throws EvalException {
NestedSet<String> nestedSet =
- nestedSetWithType(skylarkValue, String.class, javaKey.getSkylarkKeyName());
+ nestedSetWithType(starlarkValue, String.class, javaKey.getStarlarkKeyName());
NestedSetBuilder<SdkFramework> result = NestedSetBuilder.stableOrder();
for (String path : nestedSet.toList()) {
result.add(new SdkFramework(path));
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
index ed39b02..77dc666 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
@@ -459,7 +459,7 @@
attr("deps", LABEL_LIST)
.direct_compile_time_input()
.allowedRuleClasses(ALLOWED_CC_DEPS_RULE_CLASSES)
- .mandatoryProviders(ObjcProvider.SKYLARK_CONSTRUCTOR.id())
+ .mandatoryProviders(ObjcProvider.STARLARK_CONSTRUCTOR.id())
.allowedFileTypes())
/* <!-- #BLAZE_RULE($objc_compiling_rule).ATTRIBUTE(runtime_deps) -->
The list of framework targets that are late loaded at runtime. They are included in the
@@ -468,7 +468,7 @@
.add(
attr("runtime_deps", LABEL_LIST)
.direct_compile_time_input()
- .mandatoryProviders(AppleDynamicFrameworkInfo.SKYLARK_CONSTRUCTOR.id())
+ .mandatoryProviders(AppleDynamicFrameworkInfo.STARLARK_CONSTRUCTOR.id())
.allowedFileTypes())
/* <!-- #BLAZE_RULE($objc_compiling_rule).ATTRIBUTE(defines) -->
Extra <code>-D</code> flags to pass to the compiler. They should be in
@@ -740,7 +740,7 @@
attr("deps", LABEL_LIST)
.direct_compile_time_input()
.allowedRuleClasses(ALLOWED_CC_DEPS_RULE_CLASSES)
- .mandatoryProviders(ObjcProvider.SKYLARK_CONSTRUCTOR.id())
+ .mandatoryProviders(ObjcProvider.STARLARK_CONSTRUCTOR.id())
.cfg(splitTransitionProvider)
.aspect(objcProtoAspect)
.allowedFileTypes())
@@ -822,7 +822,7 @@
.mandatoryProviders(
ImmutableList.of(
StarlarkProviderIdentifier.forKey(
- AppleDynamicFrameworkInfo.SKYLARK_CONSTRUCTOR.getKey())))
+ AppleDynamicFrameworkInfo.STARLARK_CONSTRUCTOR.getKey())))
.allowedFileTypes()
.aspect(objcProtoAspect))
.build();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/SkylarkTestingModule.java b/src/main/java/com/google/devtools/build/lib/rules/test/StarlarkTestingModule.java
similarity index 95%
rename from src/main/java/com/google/devtools/build/lib/rules/test/SkylarkTestingModule.java
rename to src/main/java/com/google/devtools/build/lib/rules/test/StarlarkTestingModule.java
index f2b9703..6d148be 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/SkylarkTestingModule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/StarlarkTestingModule.java
@@ -20,7 +20,7 @@
import com.google.devtools.build.lib.syntax.EvalException;
/** A class that exposes testing infrastructure to Starlark. */
-public class SkylarkTestingModule implements TestingModuleApi {
+public class StarlarkTestingModule implements TestingModuleApi {
@Override
public ExecutionInfo executionInfo(Dict<?, ?> requirements /* <String, String> */)
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/TestingSupportRules.java b/src/main/java/com/google/devtools/build/lib/rules/test/TestingSupportRules.java
index 55f42b2..f1fb8fd 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/TestingSupportRules.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/TestingSupportRules.java
@@ -34,7 +34,7 @@
public void init(ConfiguredRuleClassProvider.Builder builder) {
builder.addSkylarkBootstrap(
new TestingBootstrap(
- new SkylarkTestingModule(),
+ new StarlarkTestingModule(),
new CoverageCommon(),
AnalysisFailureInfo.SKYLARK_CONSTRUCTOR,
AnalysisTestResultInfo.SKYLARK_CONSTRUCTOR));
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java
index 5b45bda..1b1c7a2 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ASTFileLookupFunction.java
@@ -63,7 +63,7 @@
InterruptedException {
try {
return computeInline(skyKey, env, ruleClassProvider, digestHashFunction);
- } catch (ErrorReadingSkylarkExtensionException e) {
+ } catch (ErrorReadingStarlarkExtensionException e) {
throw new ASTLookupFunctionException(e, e.getTransience());
} catch (InconsistentFilesystemException e) {
throw new ASTLookupFunctionException(e, Transience.PERSISTENT);
@@ -75,7 +75,7 @@
Environment env,
RuleClassProvider ruleClassProvider,
DigestHashFunction digestHashFunction)
- throws ErrorReadingSkylarkExtensionException, InconsistentFilesystemException,
+ throws ErrorReadingStarlarkExtensionException, InconsistentFilesystemException,
InterruptedException {
Label fileLabel = (Label) skyKey.argument();
@@ -89,7 +89,7 @@
pkgLookupValue = (PackageLookupValue) env.getValueOrThrow(
pkgSkyKey, BuildFileNotFoundException.class, InconsistentFilesystemException.class);
} catch (BuildFileNotFoundException e) {
- throw new ErrorReadingSkylarkExtensionException(e);
+ throw new ErrorReadingStarlarkExtensionException(e);
}
if (pkgLookupValue == null) {
return null;
@@ -107,7 +107,7 @@
try {
fileValue = (FileValue) env.getValueOrThrow(fileSkyKey, IOException.class);
} catch (IOException e) {
- throw new ErrorReadingSkylarkExtensionException(e, Transience.PERSISTENT);
+ throw new ErrorReadingStarlarkExtensionException(e, Transience.PERSISTENT);
}
if (fileValue == null) {
return null;
@@ -145,7 +145,7 @@
ParserInput input = ParserInput.create(bytes, path.toString());
file = StarlarkFile.parse(input, options);
} catch (IOException e) {
- throw new ErrorReadingSkylarkExtensionException(e, Transience.TRANSIENT);
+ throw new ErrorReadingStarlarkExtensionException(e, Transience.TRANSIENT);
}
// resolve (and soon, compile)
@@ -171,8 +171,8 @@
}
private static final class ASTLookupFunctionException extends SkyFunctionException {
- private ASTLookupFunctionException(ErrorReadingSkylarkExtensionException e,
- Transience transience) {
+ private ASTLookupFunctionException(
+ ErrorReadingStarlarkExtensionException e, Transience transience) {
super(e, transience);
}
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 5e1d4a9..b41cfb2 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
@@ -208,7 +208,7 @@
return null;
}
- aspectFactory = new SkylarkAspectFactory(starlarkAspect);
+ aspectFactory = new StarlarkAspectFactory(starlarkAspect);
aspect =
Aspect.forStarlark(
starlarkAspect.getAspectClass(),
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectValueKey.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectValueKey.java
index bfd5266..5bb3fe8 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectValueKey.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectValueKey.java
@@ -33,7 +33,7 @@
public abstract class AspectValueKey extends ActionLookupKey {
private static final Interner<AspectKey> aspectKeyInterner = BlazeInterners.newWeakInterner();
- private static final Interner<SkylarkAspectLoadingKey> skylarkAspectKeyInterner =
+ private static final Interner<StarlarkAspectLoadingKey> starlarkAspectKeyInterner =
BlazeInterners.newWeakInterner();
public abstract String getDescription();
@@ -72,29 +72,29 @@
aspectKeyAndHost.isHost);
}
- public static SkylarkAspectLoadingKey createSkylarkAspectKey(
+ public static StarlarkAspectLoadingKey createStarlarkAspectKey(
Label targetLabel,
BuildConfiguration aspectConfiguration,
BuildConfiguration targetConfiguration,
- Label skylarkFileLabel,
- String skylarkExportName) {
+ Label starlarkFileLabel,
+ String starlarkExportName) {
KeyAndHost keyAndHost = ConfiguredTargetKey.keyFromConfiguration(aspectConfiguration);
- SkylarkAspectLoadingKey key =
+ StarlarkAspectLoadingKey key =
keyAndHost.isHost
- ? new HostSkylarkAspectLoadingKey(
+ ? new HostStarlarkAspectLoadingKey(
targetLabel,
keyAndHost.key,
ConfiguredTargetKey.of(targetLabel, targetConfiguration),
- skylarkFileLabel,
- skylarkExportName)
- : new SkylarkAspectLoadingKey(
+ starlarkFileLabel,
+ starlarkExportName)
+ : new StarlarkAspectLoadingKey(
targetLabel,
keyAndHost.key,
ConfiguredTargetKey.of(targetLabel, targetConfiguration),
- skylarkFileLabel,
- skylarkExportName);
+ starlarkFileLabel,
+ starlarkExportName);
- return skylarkAspectKeyInterner.intern(key);
+ return starlarkAspectKeyInterner.intern(key);
}
// Specific subtypes of aspect keys.
@@ -321,26 +321,26 @@
}
/** The key for a Starlark aspect. */
- public static class SkylarkAspectLoadingKey extends AspectValueKey {
+ public static class StarlarkAspectLoadingKey extends AspectValueKey {
private final Label targetLabel;
private final BuildConfigurationValue.Key aspectConfigurationKey;
private final ConfiguredTargetKey baseConfiguredTargetKey;
- private final Label skylarkFileLabel;
- private final String skylarkValueName;
+ private final Label starlarkFileLabel;
+ private final String starlarkValueName;
private int hashCode;
- private SkylarkAspectLoadingKey(
+ private StarlarkAspectLoadingKey(
Label targetLabel,
BuildConfigurationValue.Key aspectConfigurationKey,
ConfiguredTargetKey baseConfiguredTargetKey,
- Label skylarkFileLabel,
- String skylarkFunctionName) {
+ Label starlarkFileLabel,
+ String starlarkFunctionName) {
this.targetLabel = targetLabel;
this.aspectConfigurationKey = aspectConfigurationKey;
this.baseConfiguredTargetKey = baseConfiguredTargetKey;
- this.skylarkFileLabel = skylarkFileLabel;
- this.skylarkValueName = skylarkFunctionName;
+ this.starlarkFileLabel = starlarkFileLabel;
+ this.starlarkValueName = starlarkFunctionName;
}
@Override
@@ -348,12 +348,12 @@
return SkyFunctions.LOAD_STARLARK_ASPECT;
}
- String getSkylarkValueName() {
- return skylarkValueName;
+ String getStarlarkValueName() {
+ return starlarkValueName;
}
- Label getSkylarkFileLabel() {
- return skylarkFileLabel;
+ Label getStarlarkFileLabel() {
+ return starlarkFileLabel;
}
protected boolean isAspectConfigurationHost() {
@@ -368,7 +368,7 @@
@Override
public String getDescription() {
// Starlark aspects are referred to on command line with <file>%<value ame>
- return String.format("%s%%%s of %s", skylarkFileLabel, skylarkValueName, targetLabel);
+ return String.format("%s%%%s of %s", starlarkFileLabel, starlarkValueName, targetLabel);
}
@Override
@@ -402,8 +402,8 @@
targetLabel,
aspectConfigurationKey,
baseConfiguredTargetKey,
- skylarkFileLabel,
- skylarkValueName);
+ starlarkFileLabel,
+ starlarkValueName);
}
@Override
@@ -412,15 +412,15 @@
return true;
}
- if (!(o instanceof SkylarkAspectLoadingKey)) {
+ if (!(o instanceof StarlarkAspectLoadingKey)) {
return false;
}
- SkylarkAspectLoadingKey that = (SkylarkAspectLoadingKey) o;
+ StarlarkAspectLoadingKey that = (StarlarkAspectLoadingKey) o;
return Objects.equal(targetLabel, that.targetLabel)
&& Objects.equal(aspectConfigurationKey, that.aspectConfigurationKey)
&& Objects.equal(baseConfiguredTargetKey, that.baseConfiguredTargetKey)
- && Objects.equal(skylarkFileLabel, that.skylarkFileLabel)
- && Objects.equal(skylarkValueName, that.skylarkValueName);
+ && Objects.equal(starlarkFileLabel, that.starlarkFileLabel)
+ && Objects.equal(starlarkValueName, that.starlarkValueName);
}
@Override
@@ -429,8 +429,8 @@
.add("targetLabel", targetLabel)
.add("aspectConfigurationKey", aspectConfigurationKey)
.add("baseConfiguredTargetKey", baseConfiguredTargetKey)
- .add("skylarkFileLabel", skylarkFileLabel)
- .add("skylarkValueName", skylarkValueName)
+ .add("starlarkFileLabel", starlarkFileLabel)
+ .add("starlarkValueName", starlarkValueName)
.toString();
}
@@ -444,21 +444,21 @@
}
}
- /** A {@link SkylarkAspectLoadingKey} for an aspect in the host configuration. */
- private static class HostSkylarkAspectLoadingKey extends SkylarkAspectLoadingKey {
+ /** A {@link StarlarkAspectLoadingKey} for an aspect in the host configuration. */
+ private static class HostStarlarkAspectLoadingKey extends StarlarkAspectLoadingKey {
- private HostSkylarkAspectLoadingKey(
+ private HostStarlarkAspectLoadingKey(
Label targetLabel,
BuildConfigurationValue.Key aspectConfigurationKey,
ConfiguredTargetKey baseConfiguredTargetKey,
- Label skylarkFileLabel,
- String skylarkFunctionName) {
+ Label starlarkFileLabel,
+ String starlarkFunctionName) {
super(
targetLabel,
aspectConfigurationKey,
baseConfiguredTargetKey,
- skylarkFileLabel,
- skylarkFunctionName);
+ starlarkFileLabel,
+ starlarkFunctionName);
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BUILD b/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
index c456dde..e27d90c 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BUILD
@@ -69,7 +69,7 @@
"SkyframePackageManager.java",
"SkyframeTargetPatternEvaluator.java",
"SkyframeTransitivePackageLoader.java",
- "SkylarkAspectFactory.java",
+ "StarlarkAspectFactory.java",
"StarlarkImportLookupFunction.java",
"TargetCompletionValue.java",
"TargetCompletor.java",
@@ -80,7 +80,7 @@
"ToolchainResolutionFunction.java",
"ToolchainTypeLookupUtil.java",
"TopLevelActionLookupConflictFindingFunction.java",
- "ToplevelSkylarkAspectFunction.java",
+ "ToplevelStarlarkAspectFunction.java",
"TransitiveTargetFunction.java",
"TrimmedConfigurationProgressReceiver.java",
"UnloadedToolchainContextImpl.java",
@@ -1284,7 +1284,7 @@
java_library(
name = "error_reading_skylark_extension_exception",
- srcs = ["ErrorReadingSkylarkExtensionException.java"],
+ srcs = ["ErrorReadingStarlarkExtensionException.java"],
deps = [
"//src/main/java/com/google/devtools/build/lib/packages",
"//src/main/java/com/google/devtools/build/skyframe",
@@ -2264,7 +2264,7 @@
java_library(
name = "skylark_module_cycle_reporter",
- srcs = ["SkylarkModuleCycleReporter.java"],
+ srcs = ["StarlarkModuleCycleReporter.java"],
deps = [
":abstract_label_cycle_reporter",
":repository_value",
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ErrorReadingSkylarkExtensionException.java b/src/main/java/com/google/devtools/build/lib/skyframe/ErrorReadingStarlarkExtensionException.java
similarity index 82%
rename from src/main/java/com/google/devtools/build/lib/skyframe/ErrorReadingSkylarkExtensionException.java
rename to src/main/java/com/google/devtools/build/lib/skyframe/ErrorReadingStarlarkExtensionException.java
index d29031a..b26b2e4 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ErrorReadingSkylarkExtensionException.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ErrorReadingStarlarkExtensionException.java
@@ -18,15 +18,15 @@
import java.io.IOException;
/** Indicates some sort of IO error while dealing with a Starlark extension. */
-public class ErrorReadingSkylarkExtensionException extends Exception {
+public class ErrorReadingStarlarkExtensionException extends Exception {
private final Transience transience;
- public ErrorReadingSkylarkExtensionException(BuildFileNotFoundException e) {
+ public ErrorReadingStarlarkExtensionException(BuildFileNotFoundException e) {
super(e.getMessage(), e);
this.transience = Transience.PERSISTENT;
}
- public ErrorReadingSkylarkExtensionException(IOException e, Transience transience) {
+ public ErrorReadingStarlarkExtensionException(IOException e, Transience transience) {
super(e.getMessage(), e);
this.transience = transience;
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
index b22f58a..c1df5df 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
@@ -436,9 +436,9 @@
(ASTFileLookupValue)
env.getValueOrThrow(
astLookupKey,
- ErrorReadingSkylarkExtensionException.class,
+ ErrorReadingStarlarkExtensionException.class,
InconsistentFilesystemException.class);
- } catch (ErrorReadingSkylarkExtensionException | InconsistentFilesystemException e) {
+ } catch (ErrorReadingStarlarkExtensionException | InconsistentFilesystemException e) {
throw new PackageFunctionException(
new NoSuchPackageException(
packageId, "Error encountered while reading the prelude file: " + e.getMessage()),
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 604874d..d820675 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
@@ -569,7 +569,7 @@
ruleClassProvider,
shouldStoreTransitivePackagesInLoadingAndAnalysis(),
defaultBuildOptions));
- map.put(SkyFunctions.LOAD_STARLARK_ASPECT, new ToplevelSkylarkAspectFunction());
+ map.put(SkyFunctions.LOAD_STARLARK_ASPECT, new ToplevelStarlarkAspectFunction());
map.put(SkyFunctions.ACTION_LOOKUP_CONFLICT_FINDING, new ActionLookupConflictFindingFunction());
map.put(
SkyFunctions.TOP_LEVEL_ACTION_LOOKUP_CONFLICT_FINDING,
@@ -2801,7 +2801,7 @@
new RegisteredToolchainsCycleReporter(),
// TODO(ulfjack): The SkylarkModuleCycleReporter swallows previously reported cycles
// unconditionally! Is that intentional?
- new SkylarkModuleCycleReporter());
+ new StarlarkModuleCycleReporter());
}
CyclesReporter getCyclesReporter() {
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java b/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkAspectFactory.java
similarity index 83%
rename from src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java
rename to src/main/java/com/google/devtools/build/lib/skyframe/StarlarkAspectFactory.java
index a34938a..bd39fb1 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkAspectFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkAspectFactory.java
@@ -43,11 +43,11 @@
import java.util.Map;
/** A factory for aspects that are defined in Starlark. */
-public class SkylarkAspectFactory implements ConfiguredAspectFactory {
- private final StarlarkDefinedAspect skylarkAspect;
+public class StarlarkAspectFactory implements ConfiguredAspectFactory {
+ private final StarlarkDefinedAspect starlarkAspect;
- SkylarkAspectFactory(StarlarkDefinedAspect skylarkAspect) {
- this.skylarkAspect = skylarkAspect;
+ StarlarkAspectFactory(StarlarkDefinedAspect starlarkAspect) {
+ this.starlarkAspect = starlarkAspect;
}
@Override
@@ -60,7 +60,7 @@
StarlarkRuleContext starlarkRuleContext = null;
try (Mutability mutability = Mutability.create("aspect")) {
AspectDescriptor aspectDescriptor =
- new AspectDescriptor(skylarkAspect.getAspectClass(), parameters);
+ new AspectDescriptor(starlarkAspect.getAspectClass(), parameters);
AnalysisEnvironment analysisEnv = ruleContext.getAnalysisEnvironment();
try {
starlarkRuleContext =
@@ -86,10 +86,10 @@
.storeInThread(thread);
try {
- Object aspectSkylarkObject =
+ Object aspectStarlarkObject =
Starlark.call(
thread,
- skylarkAspect.getImplementation(),
+ starlarkAspect.getImplementation(),
/*args=*/ ImmutableList.of(ctadBase.getConfiguredTarget(), starlarkRuleContext),
/*kwargs=*/ ImmutableMap.of());
@@ -99,17 +99,17 @@
if (ruleContext.hasErrors() && !allowAnalysisFailures) {
return null;
- } else if (!(aspectSkylarkObject instanceof StructImpl)
- && !(aspectSkylarkObject instanceof Iterable)
- && !(aspectSkylarkObject instanceof Info)) {
+ } else if (!(aspectStarlarkObject instanceof StructImpl)
+ && !(aspectStarlarkObject instanceof Iterable)
+ && !(aspectStarlarkObject instanceof Info)) {
ruleContext.ruleError(
String.format(
"Aspect implementation should return a struct, a list, or a provider "
+ "instance, but got %s",
- Starlark.type(aspectSkylarkObject)));
+ Starlark.type(aspectStarlarkObject)));
return null;
}
- return createAspect(aspectSkylarkObject, ruleContext);
+ return createAspect(aspectStarlarkObject, ruleContext);
} catch (EvalException e) {
addAspectToStackTrace(ctadBase.getTarget(), e);
ruleContext.ruleError("\n" + e.print());
@@ -122,19 +122,19 @@
}
}
- private static ConfiguredAspect createAspect(Object aspectSkylarkObject, RuleContext ruleContext)
+ private static ConfiguredAspect createAspect(Object aspectStarlarkObject, RuleContext ruleContext)
throws EvalException, ActionConflictException {
ConfiguredAspect.Builder builder = new ConfiguredAspect.Builder(ruleContext);
- if (aspectSkylarkObject instanceof Iterable) {
- addDeclaredProviders(builder, (Iterable) aspectSkylarkObject);
+ if (aspectStarlarkObject instanceof Iterable) {
+ addDeclaredProviders(builder, (Iterable) aspectStarlarkObject);
} else {
// Either an old-style struct or a single declared provider (not in a list)
- Info info = (Info) aspectSkylarkObject;
+ Info info = (Info) aspectStarlarkObject;
if (info.getProvider().getKey().equals(StructProvider.STRUCT.getKey())) {
// Old-style struct, that may contain declared providers.
- StructImpl struct = (StructImpl) aspectSkylarkObject;
+ StructImpl struct = (StructImpl) aspectStarlarkObject;
for (String field : struct.getFieldNames()) {
if (field.equals("output_groups")) {
addOutputGroups(struct.getValue(field), builder);
@@ -149,11 +149,11 @@
}
addDeclaredProviders(builder, (Iterable<?>) providers);
} else {
- builder.addSkylarkTransitiveInfo(field, struct.getValue(field));
+ builder.addStarlarkTransitiveInfo(field, struct.getValue(field));
}
}
} else {
- builder.addSkylarkDeclaredProvider(info);
+ builder.addStarlarkDeclaredProvider(info);
}
}
@@ -163,16 +163,16 @@
}
private static void addDeclaredProviders(
- ConfiguredAspect.Builder builder, Iterable<?> aspectSkylarkObject) throws EvalException {
+ ConfiguredAspect.Builder builder, Iterable<?> aspectStarlarkObject) throws EvalException {
int i = 0;
- for (Object o : aspectSkylarkObject) {
+ for (Object o : aspectStarlarkObject) {
if (!(o instanceof Info)) {
throw Starlark.errorf(
"A return value of an aspect implementation function should be "
+ "a sequence of declared providers, instead got a %s at index %d",
Starlark.type(o), i);
}
- builder.addSkylarkDeclaredProvider((Info) o);
+ builder.addStarlarkDeclaredProvider((Info) o);
i++;
}
}
@@ -192,9 +192,9 @@
if (e instanceof EvalExceptionWithStackTrace) {
((EvalExceptionWithStackTrace) e)
.registerPhantomCall(
- String.format("%s(...)", skylarkAspect.getName()),
+ String.format("%s(...)", starlarkAspect.getName()),
base.getAssociatedRule().getLocation(),
- skylarkAspect.getImplementation());
+ starlarkAspect.getImplementation());
}
}
}
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 ea0075a..4f20769 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
@@ -297,7 +297,7 @@
InconsistentFilesystemException.class);
} catch (BuildFileNotFoundException e) {
throw StarlarkImportFailedException.errorReadingFile(
- fileLabel.toPathFragment(), new ErrorReadingSkylarkExtensionException(e));
+ fileLabel.toPathFragment(), new ErrorReadingStarlarkExtensionException(e));
}
if (containingPackageLookupValue == null) {
return null;
@@ -360,7 +360,7 @@
ASTFileLookupValue astLookupValue;
try {
astLookupValue = astFileLookupValueManager.getASTFileLookupValue(fileLabel, env);
- } catch (ErrorReadingSkylarkExtensionException e) {
+ } catch (ErrorReadingStarlarkExtensionException e) {
throw StarlarkImportFailedException.errorReadingFile(filePath, e);
}
if (astLookupValue == null) {
@@ -764,7 +764,7 @@
}
static StarlarkImportFailedException errorReadingFile(
- PathFragment file, ErrorReadingSkylarkExtensionException cause) {
+ PathFragment file, ErrorReadingStarlarkExtensionException cause) {
return new StarlarkImportFailedException(
String.format(
"Encountered error while reading extension file '%s': %s", file, cause.getMessage()),
@@ -807,7 +807,7 @@
@Nullable
ASTFileLookupValue getASTFileLookupValue(Label fileLabel, Environment env)
throws InconsistentFilesystemException, InterruptedException,
- ErrorReadingSkylarkExtensionException;
+ ErrorReadingStarlarkExtensionException;
void doneWithASTFileLookupValue(Label fileLabel);
}
@@ -821,11 +821,11 @@
@Override
public ASTFileLookupValue getASTFileLookupValue(Label fileLabel, Environment env)
throws InconsistentFilesystemException, InterruptedException,
- ErrorReadingSkylarkExtensionException {
+ ErrorReadingStarlarkExtensionException {
return (ASTFileLookupValue)
env.getValueOrThrow(
ASTFileLookupValue.key(fileLabel),
- ErrorReadingSkylarkExtensionException.class,
+ ErrorReadingStarlarkExtensionException.class,
InconsistentFilesystemException.class);
}
@@ -856,7 +856,7 @@
@Override
public ASTFileLookupValue getASTFileLookupValue(Label fileLabel, Environment env)
throws InconsistentFilesystemException, InterruptedException,
- ErrorReadingSkylarkExtensionException {
+ ErrorReadingStarlarkExtensionException {
ASTFileLookupValue value = astFileLookupValueCache.getIfPresent(fileLabel);
if (value == null) {
value =
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkModuleCycleReporter.java b/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkModuleCycleReporter.java
similarity index 99%
rename from src/main/java/com/google/devtools/build/lib/skyframe/SkylarkModuleCycleReporter.java
rename to src/main/java/com/google/devtools/build/lib/skyframe/StarlarkModuleCycleReporter.java
index d264a76..7a20ef4 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkModuleCycleReporter.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/StarlarkModuleCycleReporter.java
@@ -30,7 +30,7 @@
import com.google.devtools.build.skyframe.SkyKey;
/** Reports cycles of recursive import of Starlark files. */
-public class SkylarkModuleCycleReporter implements CyclesReporter.SingleCycleReporter {
+public class StarlarkModuleCycleReporter implements CyclesReporter.SingleCycleReporter {
private static final Predicate<SkyKey> IS_STARLARK_MODULE_SKY_KEY =
SkyFunctions.isSkyFunction(SkyFunctions.STARLARK_IMPORTS_LOOKUP);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelSkylarkAspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelStarlarkAspectFunction.java
similarity index 61%
rename from src/main/java/com/google/devtools/build/lib/skyframe/ToplevelSkylarkAspectFunction.java
rename to src/main/java/com/google/devtools/build/lib/skyframe/ToplevelStarlarkAspectFunction.java
index bfe5c2e..cdd49a5 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelSkylarkAspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ToplevelStarlarkAspectFunction.java
@@ -17,7 +17,7 @@
import com.google.devtools.build.lib.causes.LabelCause;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.packages.StarlarkAspect;
-import com.google.devtools.build.lib.skyframe.AspectValueKey.SkylarkAspectLoadingKey;
+import com.google.devtools.build.lib.skyframe.AspectValueKey.StarlarkAspectLoadingKey;
import com.google.devtools.build.skyframe.SkyFunction;
import com.google.devtools.build.skyframe.SkyFunctionException;
import com.google.devtools.build.skyframe.SkyKey;
@@ -31,32 +31,32 @@
* com.google.devtools.build.lib.analysis.BuildView}, we cannot invoke two SkyFunctions one after
* another, so BuildView calls this function to do the work.
*/
-public class ToplevelSkylarkAspectFunction implements SkyFunction {
- ToplevelSkylarkAspectFunction() {}
+public class ToplevelStarlarkAspectFunction implements SkyFunction {
+ ToplevelStarlarkAspectFunction() {}
@Nullable
@Override
public SkyValue compute(SkyKey skyKey, Environment env)
- throws LoadSkylarkAspectFunctionException, InterruptedException {
- SkylarkAspectLoadingKey aspectLoadingKey = (SkylarkAspectLoadingKey) skyKey.argument();
- String skylarkValueName = aspectLoadingKey.getSkylarkValueName();
- Label skylarkFileLabel = aspectLoadingKey.getSkylarkFileLabel();
+ throws LoadStarlarkAspectFunctionException, InterruptedException {
+ StarlarkAspectLoadingKey aspectLoadingKey = (StarlarkAspectLoadingKey) skyKey.argument();
+ String starlarkValueName = aspectLoadingKey.getStarlarkValueName();
+ Label starlarkFileLabel = aspectLoadingKey.getStarlarkFileLabel();
- StarlarkAspect skylarkAspect;
+ StarlarkAspect starlarkAspect;
try {
- skylarkAspect = AspectFunction.loadStarlarkAspect(env, skylarkFileLabel, skylarkValueName);
- if (skylarkAspect == null) {
+ starlarkAspect = AspectFunction.loadStarlarkAspect(env, starlarkFileLabel, starlarkValueName);
+ if (starlarkAspect == null) {
return null;
}
- if (!skylarkAspect.getParamAttributes().isEmpty()) {
- String msg = "Cannot instantiate parameterized aspect " + skylarkAspect.getName()
+ if (!starlarkAspect.getParamAttributes().isEmpty()) {
+ String msg = "Cannot instantiate parameterized aspect " + starlarkAspect.getName()
+ " at the top level.";
- throw new AspectCreationException(msg, new LabelCause(skylarkFileLabel, msg));
+ throw new AspectCreationException(msg, new LabelCause(starlarkFileLabel, msg));
}
} catch (AspectCreationException e) {
- throw new LoadSkylarkAspectFunctionException(e);
+ throw new LoadStarlarkAspectFunctionException(e);
}
- SkyKey aspectKey = aspectLoadingKey.toAspectKey(skylarkAspect.getAspectClass());
+ SkyKey aspectKey = aspectLoadingKey.toAspectKey(starlarkAspect.getAspectClass());
return env.getValue(aspectKey);
}
@@ -68,10 +68,10 @@
}
/**
- * Exceptions thrown from ToplevelSkylarkAspectFunction.
+ * Exceptions thrown from ToplevelStarlarkAspectFunction.
*/
- public class LoadSkylarkAspectFunctionException extends SkyFunctionException {
- public LoadSkylarkAspectFunctionException(AspectCreationException cause) {
+ public class LoadStarlarkAspectFunctionException extends SkyFunctionException {
+ public LoadStarlarkAspectFunctionException(AspectCreationException cause) {
super(cause, Transience.PERSISTENT);
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkBuildApiGlobals.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkBuildApiGlobals.java
similarity index 97%
rename from src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkBuildApiGlobals.java
rename to src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkBuildApiGlobals.java
index 849ed4b..47150e0 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/SkylarkBuildApiGlobals.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/StarlarkBuildApiGlobals.java
@@ -22,11 +22,11 @@
/** A collection of global Starlark build API functions that belong in the global namespace. */
@SkylarkGlobalLibrary
-public interface SkylarkBuildApiGlobals {
+public interface StarlarkBuildApiGlobals {
@SkylarkCallable(
name = "configuration_field",
- // TODO(cparsons): Provide a link to documentation for available SkylarkConfigurationFields.
+ // TODO(cparsons): Provide a link to documentation for available StarlarkConfigurationFields.
doc =
"References a late-bound default value for an attribute of type "
+ "<a href=\"attr.html#label\">label</a>. A value is 'late-bound' if it requires "
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 1e05a51..d6924c2 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
@@ -25,7 +25,7 @@
* A {@link Bootstrap} for top-level libraries of the build API.
*/
public class TopLevelBootstrap implements Bootstrap {
- private final SkylarkBuildApiGlobals skylarkBuildApiGlobals;
+ private final StarlarkBuildApiGlobals starlarkBuildApiGlobals;
private final StarlarkAttrModuleApi starlarkAttrModuleApi;
private final StarlarkCommandLineApi starlarkCommandLineApi;
private final StarlarkNativeModuleApi starlarkNativeModuleApi;
@@ -36,7 +36,7 @@
private final DefaultInfoApiProvider<?, ?> defaultInfoProvider;
public TopLevelBootstrap(
- SkylarkBuildApiGlobals skylarkBuildApiGlobals,
+ StarlarkBuildApiGlobals starlarkBuildApiGlobals,
StarlarkAttrModuleApi starlarkAttrModuleApi,
StarlarkCommandLineApi starlarkCommandLineApi,
StarlarkNativeModuleApi starlarkNativeModuleApi,
@@ -46,7 +46,7 @@
ActionsInfoProviderApi actionsInfoProviderApi,
DefaultInfoApiProvider<?, ?> defaultInfoProvider) {
this.starlarkAttrModuleApi = starlarkAttrModuleApi;
- this.skylarkBuildApiGlobals = skylarkBuildApiGlobals;
+ this.starlarkBuildApiGlobals = starlarkBuildApiGlobals;
this.starlarkCommandLineApi = starlarkCommandLineApi;
this.starlarkNativeModuleApi = starlarkNativeModuleApi;
this.starlarkRuleFunctionsApi = starlarkRuleFunctionsApi;
@@ -58,7 +58,7 @@
@Override
public void addBindingsToBuilder(ImmutableMap.Builder<String, Object> builder) {
- Starlark.addMethods(builder, skylarkBuildApiGlobals);
+ Starlark.addMethods(builder, starlarkBuildApiGlobals);
Starlark.addMethods(builder, starlarkRuleFunctionsApi);
Starlark.addModule(builder, starlarkAttrModuleApi); // "attr"
Starlark.addModule(builder, starlarkCommandLineApi); // "cmd_helper"
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSkylarkApiProviderApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidStarlarkApiProviderApi.java
similarity index 98%
rename from src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSkylarkApiProviderApi.java
rename to src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidStarlarkApiProviderApi.java
index 57b55a3..023066c 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidSkylarkApiProviderApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android/AndroidStarlarkApiProviderApi.java
@@ -39,7 +39,7 @@
+ "provides this struct, accessible as a <code>android</code> field on a "
+ "<a href=\"Target.html\">target</a>.",
documented = false)
-public interface AndroidSkylarkApiProviderApi<FileT extends FileApi> extends StarlarkValue {
+public interface AndroidStarlarkApiProviderApi<FileT extends FileApi> extends StarlarkValue {
@SkylarkCallable(
name = "apk",
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleStaticLibraryInfoApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleStaticLibraryInfoApi.java
index 20cedfa..54bf1ad 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleStaticLibraryInfoApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/apple/AppleStaticLibraryInfoApi.java
@@ -37,7 +37,7 @@
public interface AppleStaticLibraryInfoApi extends StructApi {
/** Starlark name for this interface. */
- String SKYLARK_NAME = "AppleStaticLibrary";
+ String STARLARK_NAME = "AppleStaticLibrary";
@SkylarkCallable(
name = "archive",
@@ -59,7 +59,7 @@
extends ProviderApi {
@SkylarkCallable(
- name = SKYLARK_NAME,
+ name = STARLARK_NAME,
doc = "The <code>AppleStaticLibrary</code> constructor.",
parameters = {
@Param(
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcCompilationContextApi.java b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcCompilationContextApi.java
index 7a791c1..7824720 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcCompilationContextApi.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkbuildapi/cpp/CcCompilationContextApi.java
@@ -38,7 +38,7 @@
"Returns the set of defines needed to compile this target. Each define is a string."
+ " These values are propagated to the target's transitive dependencies.",
structField = true)
- Depset getSkylarkDefines();
+ Depset getStarlarkDefines();
@SkylarkCallable(
name = "local_defines",
@@ -46,13 +46,13 @@
"Returns the set of defines needed to compile this target. Each define is a string."
+ " These values are not propagated to the target's transitive dependencies.",
structField = true)
- Depset getSkylarkNonTransitiveDefines();
+ Depset getStarlarkNonTransitiveDefines();
@SkylarkCallable(
name = "headers",
doc = "Returns the set of headers needed to compile this target.",
structField = true)
- Depset getSkylarkHeaders();
+ Depset getStarlarkHeaders();
@SkylarkCallable(
name = "system_includes",
@@ -61,7 +61,7 @@
+ " brackets, e.g. #include <foo/bar/header.h>. They can be either relative to"
+ " the exec root or absolute. Usually passed with -isystem.",
structField = true)
- Depset getSkylarkSystemIncludeDirs();
+ Depset getStarlarkSystemIncludeDirs();
@SkylarkCallable(
name = "framework_includes",
@@ -69,7 +69,7 @@
"Returns the set of search paths (as strings) for framework header files. Usually passed"
+ " with -F.",
structField = true)
- Depset getSkylarkFrameworkIncludeDirs();
+ Depset getStarlarkFrameworkIncludeDirs();
@SkylarkCallable(
name = "includes",
@@ -77,7 +77,7 @@
"Returns the set of search paths (as strings) for header files referenced both by angle"
+ " bracket and quotes. Usually passed with -I.",
structField = true)
- Depset getSkylarkIncludeDirs();
+ Depset getStarlarkIncludeDirs();
@SkylarkCallable(
name = "quote_includes",
@@ -86,7 +86,7 @@
+ " e.g. #include \"foo/bar/header.h\". They can be either relative to the exec root"
+ " or absolute. Usually passed with -iquote.",
structField = true)
- Depset getSkylarkQuoteIncludeDirs();
+ Depset getStarlarkQuoteIncludeDirs();
@SkylarkCallable(
name = "direct_headers",
@@ -95,11 +95,11 @@
+ " public headers (such as those listed in \"hdrs\") and private headers (such as"
+ " those listed in \"srcs\").",
structField = true)
- StarlarkList<FileT> getSkylarkDirectModularHeaders();
+ StarlarkList<FileT> getStarlarkDirectModularHeaders();
@SkylarkCallable(
name = "direct_textual_headers",
doc = "Returns the list of textual headers that are declared by this target.",
structField = true)
- StarlarkList<FileT> getSkylarkDirectTextualHeaders();
+ StarlarkList<FileT> getStarlarkDirectTextualHeaders();
}
diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeBuildApiGlobals.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeBuildApiGlobals.java
index d05ff68..f640c67 100644
--- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeBuildApiGlobals.java
+++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeBuildApiGlobals.java
@@ -15,14 +15,12 @@
package com.google.devtools.build.skydoc.fakebuildapi;
import com.google.devtools.build.lib.skylarkbuildapi.LateBoundDefaultApi;
-import com.google.devtools.build.lib.skylarkbuildapi.SkylarkBuildApiGlobals;
+import com.google.devtools.build.lib.skylarkbuildapi.StarlarkBuildApiGlobals;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.StarlarkThread;
-/**
- * Fake implementation of {@link SkylarkBuildApiGlobals}.
- */
-public class FakeBuildApiGlobals implements SkylarkBuildApiGlobals {
+/** Fake implementation of {@link StarlarkBuildApiGlobals}. */
+public class FakeBuildApiGlobals implements StarlarkBuildApiGlobals {
@Override
public LateBoundDefaultApi configurationField(String fragment, String name, StarlarkThread thread)
