Rename SkylarkSemanticsOptions to StarlarkSemanticsOptions
RELNOTES: None.
PiperOrigin-RevId: 234484830
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index 00a0f4b..b4dc6e1 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -421,7 +421,7 @@
java_library(
name = "skylark_semantics_options",
srcs = [
- "packages/SkylarkSemanticsOptions.java",
+ "packages/StarlarkSemanticsOptions.java",
],
deps = [
":skylark_semantics",
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java
index 54b5b6f..87cf21a 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequest.java
@@ -26,7 +26,7 @@
import com.google.devtools.build.lib.analysis.config.BuildOptions;
import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
import com.google.devtools.build.lib.exec.ExecutionOptions;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.runtime.BlazeCommandEventHandler;
@@ -76,7 +76,7 @@
ImmutableList.of(
BuildRequestOptions.class,
PackageCacheOptions.class,
- SkylarkSemanticsOptions.class,
+ StarlarkSemanticsOptions.class,
LoadingOptions.class,
AnalysisOptions.class,
ExecutionOptions.class,
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
similarity index 98%
rename from src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
rename to src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
index 1348c53e..3a6b50d 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/SkylarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -25,11 +25,11 @@
import java.util.List;
/**
- * Contains options that affect Skylark's semantics.
+ * Contains options that affect Starlark's semantics.
*
* <p>These are injected into Skyframe (as an instance of {@link StarlarkSemantics}) when a new
* build invocation occurs. Changing these options between builds will therefore trigger a
- * reevaluation of everything that depends on the Skylark interpreter — in particular,
+ * reevaluation of everything that depends on the Starlark interpreter — in particular,
* evaluation of all BUILD and .bzl files.
*
* <p><em>To add a new option, update the following:</em>
@@ -56,7 +56,7 @@
* must be kept consistent; to make it easy we use alphabetic order. The parts that need updating
* are marked with the comment "<== Add new options here in alphabetic order ==>".
*/
-public class SkylarkSemanticsOptions extends OptionsBase implements Serializable {
+public class StarlarkSemanticsOptions extends OptionsBase implements Serializable {
// <== Add new options here in alphabetic order ==>
@@ -112,7 +112,7 @@
+ "is enabled by default.")
public boolean experimentalEnableRepoMapping;
- // This flag is declared in SkylarkSemanticsOptions instead of JavaOptions because there is no
+ // This flag is declared in StarlarkSemanticsOptions instead of JavaOptions because there is no
// way to retrieve the java configuration from the Java implementation of
// java_common.create_provider.
@Option(
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
index 6522674..4982415 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
@@ -17,7 +17,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.util.ResourceFileLoader;
import com.google.devtools.common.options.OptionsBase;
import com.google.devtools.common.options.OptionsParser;
@@ -47,7 +47,7 @@
ClientOptions.class,
// Skylark options aren't applicable to all commands, but making them a common option
// allows users to put them in the common section of the bazelrc. See issue #3538.
- SkylarkSemanticsOptions.class);
+ StarlarkSemanticsOptions.class);
private BlazeCommandUtils() {}
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
index 87daa27..40874f3 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
@@ -25,7 +25,7 @@
import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.events.Reporter;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PackageManager;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
@@ -575,7 +575,7 @@
reporter,
options.getOptions(PackageCacheOptions.class),
packageLocator,
- options.getOptions(SkylarkSemanticsOptions.class),
+ options.getOptions(StarlarkSemanticsOptions.class),
getCommandId(),
clientEnv,
timestampGranularityMonitor,
@@ -583,13 +583,13 @@
}
public void syncPackageLoading(
- PackageCacheOptions packageCacheOptions, SkylarkSemanticsOptions skylarkSemanticsOptions)
+ PackageCacheOptions packageCacheOptions, StarlarkSemanticsOptions starlarkSemanticsOptions)
throws AbruptExitException {
getSkyframeExecutor()
.syncPackageLoading(
packageCacheOptions,
packageLocator,
- skylarkSemanticsOptions,
+ starlarkSemanticsOptions,
getCommandId(),
clientEnv,
timestampGranularityMonitor);
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/StarlarkOptionsParser.java b/src/main/java/com/google/devtools/build/lib/runtime/StarlarkOptionsParser.java
index 8e68bf5..9202955 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/StarlarkOptionsParser.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/StarlarkOptionsParser.java
@@ -33,7 +33,7 @@
import com.google.devtools.build.lib.events.Reporter;
import com.google.devtools.build.lib.packages.BuildSetting;
import com.google.devtools.build.lib.packages.Rule;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
@@ -93,7 +93,7 @@
try {
env.syncPackageLoading(
optionsParser.getOptions(PackageCacheOptions.class),
- optionsParser.getOptions(SkylarkSemanticsOptions.class));
+ optionsParser.getOptions(StarlarkSemanticsOptions.class));
} catch (AbruptExitException e) {
throw new OptionsParsingException(e.getMessage());
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
index 1c051f3..cfdd260 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java
@@ -51,7 +51,7 @@
import com.google.devtools.build.lib.packages.PackageFactory;
import com.google.devtools.build.lib.packages.Rule;
import com.google.devtools.build.lib.packages.RuleClass;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
import com.google.devtools.build.lib.pkgcache.PathPackageLocator;
import com.google.devtools.build.lib.profiler.Profiler;
@@ -296,7 +296,7 @@
ExtendedEventHandler eventHandler,
PackageCacheOptions packageCacheOptions,
PathPackageLocator packageLocator,
- SkylarkSemanticsOptions skylarkSemanticsOptions,
+ StarlarkSemanticsOptions starlarkSemanticsOptions,
UUID commandId,
Map<String, String> clientEnv,
TimestampGranularityMonitor tsgm,
@@ -312,7 +312,7 @@
eventHandler,
packageCacheOptions,
packageLocator,
- skylarkSemanticsOptions,
+ starlarkSemanticsOptions,
commandId,
clientEnv,
tsgm,
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 7fd6e4f..47c9c20 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
@@ -110,7 +110,7 @@
import com.google.devtools.build.lib.packages.PackageFactory;
import com.google.devtools.build.lib.packages.RuleClassProvider;
import com.google.devtools.build.lib.packages.RuleVisibility;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.packages.WorkspaceFileValue;
import com.google.devtools.build.lib.pkgcache.LoadingOptions;
import com.google.devtools.build.lib.pkgcache.PackageCacheOptions;
@@ -1296,7 +1296,7 @@
public void preparePackageLoading(
PathPackageLocator pkgLocator,
PackageCacheOptions packageCacheOptions,
- SkylarkSemanticsOptions skylarkSemanticsOptions,
+ StarlarkSemanticsOptions starlarkSemanticsOptions,
UUID commandId,
Map<String, String> clientEnv,
TimestampGranularityMonitor tsgm) {
@@ -1309,7 +1309,7 @@
this.clientEnv.set(clientEnv);
setShowLoadingProgress(packageCacheOptions.showLoadingProgress);
setDefaultVisibility(packageCacheOptions.defaultVisibility);
- setSkylarkSemantics(skylarkSemanticsOptions.toSkylarkSemantics());
+ setSkylarkSemantics(starlarkSemanticsOptions.toSkylarkSemantics());
setPackageLocator(pkgLocator);
syscalls.set(getPerBuildSyscallCache(packageCacheOptions.globbingThreads));
@@ -2398,7 +2398,7 @@
ExtendedEventHandler eventHandler,
PackageCacheOptions packageCacheOptions,
PathPackageLocator pathPackageLocator,
- SkylarkSemanticsOptions skylarkSemanticsOptions,
+ StarlarkSemanticsOptions starlarkSemanticsOptions,
UUID commandId,
Map<String, String> clientEnv,
TimestampGranularityMonitor tsgm,
@@ -2408,7 +2408,7 @@
syncPackageLoading(
packageCacheOptions,
pathPackageLocator,
- skylarkSemanticsOptions,
+ starlarkSemanticsOptions,
commandId,
clientEnv,
tsgm);
@@ -2421,7 +2421,7 @@
public void syncPackageLoading(
PackageCacheOptions packageCacheOptions,
PathPackageLocator pathPackageLocator,
- SkylarkSemanticsOptions skylarkSemanticsOptions,
+ StarlarkSemanticsOptions starlarkSemanticsOptions,
UUID commandId,
Map<String, String> clientEnv,
TimestampGranularityMonitor tsgm)
@@ -2430,7 +2430,7 @@
preparePackageLoading(
pathPackageLocator,
packageCacheOptions,
- skylarkSemanticsOptions,
+ starlarkSemanticsOptions,
commandId,
clientEnv,
tsgm);
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
index 75e67cb..4c45d63 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -24,11 +24,11 @@
/**
* Options that affect Starlark semantics.
*
- * <p>For descriptions of what these options do, see {@link SkylarkSemanticsOptions}.
+ * <p>For descriptions of what these options do, see {@link StarlarkSemanticsOptions}.
*/
// TODO(brandjon): User error messages that reference options should maybe be substituted with the
// option name outside of the core Starlark interpreter?
-// TODO(brandjon): Eventually these should be documented in full here, and SkylarkSemanticsOptions
+// TODO(brandjon): Eventually these should be documented in full here, and StarlarkSemanticsOptions
// should refer to this class for documentation. But this doesn't play nice with the options
// parser's annotation mechanism.
@AutoValue
diff --git a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
index aec67e8..e3da545 100644
--- a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
+++ b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
@@ -24,7 +24,7 @@
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
import com.google.devtools.build.lib.events.EventHandler;
-import com.google.devtools.build.lib.packages.SkylarkSemanticsOptions;
+import com.google.devtools.build.lib.packages.StarlarkSemanticsOptions;
import com.google.devtools.build.lib.skylarkbuildapi.TopLevelBootstrap;
import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidAssetsInfoApi;
import com.google.devtools.build.lib.skylarkbuildapi.android.AndroidBinaryDataInfoApi;
@@ -158,9 +158,9 @@
public static void main(String[] args)
throws IOException, InterruptedException, LabelSyntaxException {
OptionsParser parser =
- OptionsParser.newOptionsParser(SkylarkSemanticsOptions.class, SkydocOptions.class);
+ OptionsParser.newOptionsParser(StarlarkSemanticsOptions.class, SkydocOptions.class);
parser.parseAndExitUponError(args);
- SkylarkSemanticsOptions semanticsOptions = parser.getOptions(SkylarkSemanticsOptions.class);
+ StarlarkSemanticsOptions semanticsOptions = parser.getOptions(StarlarkSemanticsOptions.class);
SkydocOptions skydocOptions = parser.getOptions(SkydocOptions.class);
String targetFileLabelString;
