Rename SkylarkSemantics to StarlarkSemantics
RELNOTES: None.
PiperOrigin-RevId: 234478524
diff --git a/src/test/java/com/google/devtools/build/docgen/SkylarkDocumentationFailuresTest.java b/src/test/java/com/google/devtools/build/docgen/SkylarkDocumentationFailuresTest.java
index cb80731..2427d07 100644
--- a/src/test/java/com/google/devtools/build/docgen/SkylarkDocumentationFailuresTest.java
+++ b/src/test/java/com/google/devtools/build/docgen/SkylarkDocumentationFailuresTest.java
@@ -21,7 +21,7 @@
import com.google.devtools.build.lib.skylark.util.SkylarkTestCase;
import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.syntax.util.EvaluationTestCase;
import java.util.Map;
import org.junit.Before;
@@ -48,7 +48,7 @@
}
@Override
- protected EvaluationTestCase createEvaluationTestCase(SkylarkSemantics semantics) {
+ protected EvaluationTestCase createEvaluationTestCase(StarlarkSemantics semantics) {
return new EvaluationTestCase();
}
diff --git a/src/test/java/com/google/devtools/build/docgen/SkylarkDocumentationTest.java b/src/test/java/com/google/devtools/build/docgen/SkylarkDocumentationTest.java
index 35a3929..07c684f 100644
--- a/src/test/java/com/google/devtools/build/docgen/SkylarkDocumentationTest.java
+++ b/src/test/java/com/google/devtools/build/docgen/SkylarkDocumentationTest.java
@@ -31,7 +31,7 @@
import com.google.devtools.build.lib.syntax.SkylarkList;
import com.google.devtools.build.lib.syntax.SkylarkList.MutableList;
import com.google.devtools.build.lib.syntax.SkylarkList.Tuple;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.syntax.util.EvaluationTestCase;
import com.google.devtools.build.lib.util.Classpath;
import java.util.ArrayList;
@@ -65,7 +65,7 @@
}
@Override
- protected EvaluationTestCase createEvaluationTestCase(SkylarkSemantics semantics) {
+ protected EvaluationTestCase createEvaluationTestCase(StarlarkSemantics semantics) {
return new EvaluationTestCase();
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
index e34978b..de4f6de 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
@@ -48,7 +48,7 @@
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
import com.google.devtools.build.lib.events.ExtendedEventHandler;
import com.google.devtools.build.lib.shell.Command;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.util.Fingerprint;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
@@ -160,7 +160,7 @@
}
@Override
- public SkylarkSemantics getSkylarkSemantics() throws InterruptedException {
+ public StarlarkSemantics getSkylarkSemantics() throws InterruptedException {
return original.getSkylarkSemantics();
}
@@ -347,7 +347,7 @@
}
@Override
- public SkylarkSemantics getSkylarkSemantics() throws InterruptedException {
+ public StarlarkSemantics getSkylarkSemantics() throws InterruptedException {
return null;
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index d0e53e8..25dafac 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -143,7 +143,7 @@
import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker;
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
import com.google.devtools.build.lib.skyframe.TargetPatternPhaseValue;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.testutil.BlazeTestUtils;
import com.google.devtools.build.lib.testutil.FoundationTestCase;
import com.google.devtools.build.lib.testutil.TestConstants;
@@ -333,7 +333,7 @@
return ImmutableList.<EnvironmentExtension>of();
}
- protected SkylarkSemantics getSkylarkSemantics() {
+ protected StarlarkSemantics getSkylarkSemantics() {
return skylarkSemanticsOptions.toSkylarkSemantics();
}
@@ -1979,7 +1979,7 @@
}
@Override
- public SkylarkSemantics getSkylarkSemantics() {
+ public StarlarkSemantics getSkylarkSemantics() {
throw new UnsupportedOperationException();
}
diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
index d2333d1..d73007d 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
@@ -22,7 +22,7 @@
import com.google.devtools.build.lib.skyframe.serialization.DynamicCodec;
import com.google.devtools.build.lib.skyframe.serialization.SerializationContext;
import com.google.devtools.build.lib.skyframe.serialization.testutils.TestUtils;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.common.options.Options;
import com.google.devtools.common.options.OptionsParser;
import java.util.Arrays;
@@ -32,20 +32,20 @@
import org.junit.runners.JUnit4;
/**
- * Tests for the flow of flags from {@link SkylarkSemanticsOptions} to {@link SkylarkSemantics}, and
- * to and from {@code SkylarkSemantics}' serialized representation.
+ * Tests for the flow of flags from {@link SkylarkSemanticsOptions} to {@link StarlarkSemantics},
+ * and to and from {@code StarlarkSemantics}' serialized representation.
*
* <p>When adding a new option, it is trivial to make a transposition error or a copy/paste error.
* These tests guard against such errors. The following possible bugs are considered:
*
* <ul>
- * <li>If a new option is added to {@code SkylarkSemantics} but not to {@code
+ * <li>If a new option is added to {@code StarlarkSemantics} but not to {@code
* SkylarkSemanticsOptions}, or vice versa, then the programmer will either be unable to
* implement its behavior, or unable to test it from the command line and add user
* documentation. We hope that the programmer notices this on their own.
* <li>If {@link SkylarkSemanticsOptions#toSkylarkSemantics} is not updated to set all fields of
- * {@code SkylarkSemantics}, then it will fail immediately because all fields of {@link
- * SkylarkSemantics.Builder} are mandatory.
+ * {@code StarlarkSemantics}, then it will fail immediately because all fields of {@link
+ * StarlarkSemantics.Builder} are mandatory.
* <li>To catch a copy/paste error where the wrong field's data is threaded through {@code
* toSkylarkSemantics()} or {@code deserialize(...)}, we repeatedly generate matching random
* instances of the input and expected output objects.
@@ -62,34 +62,34 @@
/**
* Checks that a randomly generated {@link SkylarkSemanticsOptions} object can be converted to a
- * {@link SkylarkSemantics} object with the same field values.
+ * {@link StarlarkSemantics} object with the same field values.
*/
@Test
public void optionsToSemantics() throws Exception {
for (int i = 0; i < NUM_RANDOM_TRIALS; i++) {
long seed = i;
SkylarkSemanticsOptions options = buildRandomOptions(new Random(seed));
- SkylarkSemantics semantics = buildRandomSemantics(new Random(seed));
- SkylarkSemantics semanticsFromOptions = options.toSkylarkSemantics();
+ StarlarkSemantics semantics = buildRandomSemantics(new Random(seed));
+ StarlarkSemantics semanticsFromOptions = options.toSkylarkSemantics();
assertThat(semanticsFromOptions).isEqualTo(semantics);
}
}
/**
- * Checks that a randomly generated {@link SkylarkSemantics} object can be serialized and
+ * Checks that a randomly generated {@link StarlarkSemantics} object can be serialized and
* deserialized to an equivalent object.
*/
@Test
public void serializationRoundTrip() throws Exception {
DynamicCodec codec = new DynamicCodec(buildRandomSemantics(new Random(2)).getClass());
for (int i = 0; i < NUM_RANDOM_TRIALS; i++) {
- SkylarkSemantics semantics = buildRandomSemantics(new Random(i));
- SkylarkSemantics deserialized =
- (SkylarkSemantics)
- TestUtils.fromBytes(
- new DeserializationContext(ImmutableMap.of()),
- codec,
- TestUtils.toBytes(new SerializationContext(ImmutableMap.of()), codec, semantics));
+ StarlarkSemantics semantics = buildRandomSemantics(new Random(i));
+ StarlarkSemantics deserialized =
+ (StarlarkSemantics)
+ TestUtils.fromBytes(
+ new DeserializationContext(ImmutableMap.of()),
+ codec,
+ TestUtils.toBytes(new SerializationContext(ImmutableMap.of()), codec, semantics));
assertThat(deserialized).isEqualTo(semantics);
}
}
@@ -97,16 +97,16 @@
@Test
public void checkDefaultsMatch() {
SkylarkSemanticsOptions defaultOptions = Options.getDefaults(SkylarkSemanticsOptions.class);
- SkylarkSemantics defaultSemantics = SkylarkSemantics.DEFAULT_SEMANTICS;
- SkylarkSemantics semanticsFromOptions = defaultOptions.toSkylarkSemantics();
+ StarlarkSemantics defaultSemantics = StarlarkSemantics.DEFAULT_SEMANTICS;
+ StarlarkSemantics semanticsFromOptions = defaultOptions.toSkylarkSemantics();
assertThat(semanticsFromOptions).isEqualTo(defaultSemantics);
}
@Test
public void canGetBuilderFromInstance() {
- SkylarkSemantics original = SkylarkSemantics.DEFAULT_SEMANTICS;
+ StarlarkSemantics original = StarlarkSemantics.DEFAULT_SEMANTICS;
assertThat(original.internalSkylarkFlagTestCanary()).isFalse();
- SkylarkSemantics modified = original.toBuilder().internalSkylarkFlagTestCanary(true).build();
+ StarlarkSemantics modified = original.toBuilder().internalSkylarkFlagTestCanary(true).build();
assertThat(modified.internalSkylarkFlagTestCanary()).isTrue();
}
@@ -164,11 +164,11 @@
}
/**
- * Constructs a {@link SkylarkSemantics} object with random fields. Must access {@code rand} using
- * the same sequence of operations (for the same fields) as {@link #buildRandomOptions}.
+ * Constructs a {@link StarlarkSemantics} object with random fields. Must access {@code rand}
+ * using the same sequence of operations (for the same fields) as {@link #buildRandomOptions}.
*/
- private static SkylarkSemantics buildRandomSemantics(Random rand) {
- return SkylarkSemantics.builder()
+ private static StarlarkSemantics buildRandomSemantics(Random rand) {
+ return StarlarkSemantics.builder()
// <== Add new options here in alphabetic order ==>
.checkThirdPartyTargetsHaveLicenses(rand.nextBoolean())
.experimentalBuildSettingApi(rand.nextBoolean())
diff --git a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java
index 79123dd..a8ecff3 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/WorkspaceFactoryTestHelper.java
@@ -22,7 +22,7 @@
import com.google.devtools.build.lib.events.StoredEventHandler;
import com.google.devtools.build.lib.syntax.Mutability;
import com.google.devtools.build.lib.syntax.ParserInputSource;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
import com.google.devtools.build.lib.vfs.Path;
@@ -38,7 +38,7 @@
private Package.Builder builder;
private Exception exception;
private ImmutableList<Event> events;
- private SkylarkSemantics skylarkSemantics;
+ private StarlarkSemantics starlarkSemantics;
private final boolean allowOverride;
@@ -51,7 +51,7 @@
this.exception = null;
this.events = null;
this.allowOverride = allowOverride;
- this.skylarkSemantics = SkylarkSemantics.DEFAULT_SEMANTICS;
+ this.starlarkSemantics = StarlarkSemantics.DEFAULT_SEMANTICS;
}
void parse(String... args) {
@@ -83,7 +83,7 @@
FileSystemUtils.readWithKnownFileSize(workspaceFilePath, workspaceFilePath.getFileSize());
factory.parseForTesting(
ParserInputSource.create(bytes, workspaceFilePath.asFragment()),
- skylarkSemantics,
+ starlarkSemantics,
eventHandler);
} catch (BuildFileContainsErrorsException e) {
exception = e;
@@ -115,10 +115,10 @@
}
protected void setSkylarkSemantics(String... options) throws Exception {
- skylarkSemantics = parseSkylarkSemanticsOptions(options);
+ starlarkSemantics = parseSkylarkSemanticsOptions(options);
}
- private static SkylarkSemantics parseSkylarkSemanticsOptions(String... options)
+ private static StarlarkSemantics parseSkylarkSemanticsOptions(String... options)
throws Exception {
OptionsParser parser = OptionsParser.newOptionsParser(SkylarkSemanticsOptions.class);
parser.parse(options);
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
index 5223f91..f1e1f8d 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
@@ -34,7 +34,7 @@
import com.google.devtools.build.lib.syntax.BuildFileAST;
import com.google.devtools.build.lib.syntax.Environment.Extension;
import com.google.devtools.build.lib.syntax.ParserInputSource;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.testutil.TestUtils;
import com.google.devtools.build.lib.util.Pair;
@@ -106,7 +106,7 @@
skylarkOption == null
? ImmutableList.<String>of()
: ImmutableList.<String>of(skylarkOption));
- SkylarkSemantics semantics =
+ StarlarkSemantics semantics =
parser.getOptions(SkylarkSemanticsOptions.class).toSkylarkSemantics();
try {
@@ -176,7 +176,7 @@
ImmutableList.<Event>of(),
ImmutableList.<Postable>of(),
ConstantRuleVisibility.PUBLIC,
- SkylarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT_SEMANTICS,
ImmutableMap.<String, Extension>of(),
ImmutableList.<Label>of(),
/*repositoryMapping=*/ ImmutableMap.of());
diff --git a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java
index ce79b08..8c4c89d 100644
--- a/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java
+++ b/src/test/java/com/google/devtools/build/lib/repository/ExternalPackageUtilTest.java
@@ -53,7 +53,7 @@
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
import com.google.devtools.build.lib.skyframe.WorkspaceASTFunction;
import com.google.devtools.build.lib.skyframe.WorkspaceFileFunction;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
import com.google.devtools.build.lib.vfs.Root;
import com.google.devtools.build.lib.vfs.RootedPath;
@@ -156,7 +156,7 @@
MemoizingEvaluator evaluator = new InMemoryMemoizingEvaluator(skyFunctions, differencer);
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, SkylarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE.set(
differencer, Optional.<RootedPath>absent());
}
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
index 34a2989..b9c2ebd 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/BazelJ2ObjcLibraryTest.java
@@ -47,7 +47,7 @@
import com.google.devtools.build.lib.rules.cpp.CppCompileActionTemplate;
import com.google.devtools.build.lib.rules.cpp.CppModuleMapAction;
import com.google.devtools.build.lib.rules.cpp.UmbrellaHeaderAction;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
import com.google.devtools.build.lib.vfs.PathFragment;
@@ -1315,7 +1315,7 @@
// building a transitive provider from the target-to-build's deps. We duplicate that behavior
// here to make sure we're testing the provider set that the eventual target library would see.
ObjcProvider newProvider =
- new ObjcProvider.Builder(SkylarkSemantics.DEFAULT_SEMANTICS)
+ new ObjcProvider.Builder(StarlarkSemantics.DEFAULT_SEMANTICS)
.addTransitiveAndPropagate(ImmutableList.of(provider))
.build();
return getFirstArtifactEndingWith(newProvider.get(ObjcProvider.MODULE_MAP), nameSuffix);
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProviderTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProviderTest.java
index 0689b78..3f27277 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProviderTest.java
@@ -20,7 +20,7 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.devtools.build.lib.rules.objc.ObjcProvider.Key;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.vfs.PathFragment;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@@ -35,7 +35,7 @@
public class ObjcProviderTest {
private static ObjcProvider.Builder objcProviderBuilder() {
- return new ObjcProvider.Builder(SkylarkSemantics.DEFAULT_SEMANTICS);
+ return new ObjcProvider.Builder(StarlarkSemantics.DEFAULT_SEMANTICS);
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java
index e1db675..790973e 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcSkylarkTest.java
@@ -30,7 +30,7 @@
import com.google.devtools.build.lib.rules.apple.DottedVersion;
import com.google.devtools.build.lib.syntax.SkylarkDict;
import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.vfs.PathFragment;
import java.util.List;
import org.junit.Test;
@@ -43,7 +43,7 @@
@RunWith(JUnit4.class)
public class ObjcSkylarkTest extends ObjcRuleTestCase {
private static ObjcProvider.Builder objcProviderBuilder() {
- return new ObjcProvider.Builder(SkylarkSemantics.DEFAULT_SEMANTICS);
+ return new ObjcProvider.Builder(StarlarkSemantics.DEFAULT_SEMANTICS);
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
index 07bf1af..fd6d902 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
@@ -41,7 +41,7 @@
import com.google.devtools.build.lib.skyframe.SkyFunctions;
import com.google.devtools.build.lib.skyframe.WorkspaceASTFunction;
import com.google.devtools.build.lib.skyframe.WorkspaceFileFunction;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.testutil.FoundationTestCase;
import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
@@ -145,7 +145,7 @@
RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING.set(
differencer, RepositoryDelegatorFunction.DONT_FETCH_UNCONDITIONALLY);
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, SkylarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE.set(
differencer, Optional.<RootedPath>absent());
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
index 7ec3715..3a1e5ab 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
@@ -40,7 +40,7 @@
import com.google.devtools.build.lib.rules.repository.RepositoryLoaderFunction;
import com.google.devtools.build.lib.skyframe.ExternalFilesHelper.ExternalFileAction;
import com.google.devtools.build.lib.skyframe.PackageLookupFunction.CrossRepositoryLabelViolationStrategy;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.testutil.FoundationTestCase;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
import com.google.devtools.build.lib.vfs.PathFragment;
@@ -157,7 +157,7 @@
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID());
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, SkylarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
RepositoryDelegatorFunction.REPOSITORY_OVERRIDES.set(
differencer, ImmutableMap.<RepositoryName, PathFragment>of());
RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING.set(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java
index 22835e9..a32532f 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FileFunctionTest.java
@@ -47,7 +47,7 @@
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
import com.google.devtools.build.lib.skyframe.ExternalFilesHelper.ExternalFileAction;
import com.google.devtools.build.lib.skyframe.PackageLookupFunction.CrossRepositoryLabelViolationStrategy;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.testutil.ManualClock;
import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
@@ -192,7 +192,7 @@
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator);
RepositoryDelegatorFunction.REPOSITORY_OVERRIDES.set(
differencer, ImmutableMap.<RepositoryName, PathFragment>of());
- PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, SkylarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE.set(
differencer, Optional.<RootedPath>absent());
return new SequentialBuildDriver(evaluator);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
index fc9a625..037153b 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
@@ -42,7 +42,7 @@
import com.google.devtools.build.lib.skyframe.ExternalFilesHelper.ExternalFileAction;
import com.google.devtools.build.lib.skyframe.GlobValue.InvalidGlobPatternException;
import com.google.devtools.build.lib.skyframe.PackageLookupFunction.CrossRepositoryLabelViolationStrategy;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.testutil.ManualClock;
import com.google.devtools.build.lib.testutil.TestConstants;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
@@ -137,7 +137,7 @@
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID());
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, SkylarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE.set(
differencer, Optional.<RootedPath>absent());
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
index af487b3..7d17bbc 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunctionTest.java
@@ -35,7 +35,7 @@
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
import com.google.devtools.build.lib.skyframe.ExternalFilesHelper.ExternalFileAction;
import com.google.devtools.build.lib.skyframe.PackageLookupFunction.CrossRepositoryLabelViolationStrategy;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.testutil.FoundationTestCase;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
@@ -129,7 +129,7 @@
evaluator = new InMemoryMemoizingEvaluator(skyFunctions, differencer);
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, SkylarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE.set(
differencer, Optional.<RootedPath>absent());
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
index 216d6c8..2dffe43 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
@@ -46,7 +46,7 @@
import com.google.devtools.build.lib.skyframe.PackageLookupFunction.CrossRepositoryLabelViolationStrategy;
import com.google.devtools.build.lib.skyframe.PackageLookupValue.ErrorReason;
import com.google.devtools.build.lib.skyframe.PackageLookupValue.IncorrectRepositoryReferencePackageLookupValue;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.testutil.FoundationTestCase;
import com.google.devtools.build.lib.util.io.TimestampGranularityMonitor;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
@@ -170,7 +170,7 @@
driver = new SequentialBuildDriver(evaluator);
PrecomputedValue.BUILD_ID.set(differencer, UUID.randomUUID());
PrecomputedValue.PATH_PACKAGE_LOCATOR.set(differencer, pkgLocator.get());
- PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, SkylarkSemantics.DEFAULT_SEMANTICS);
+ PrecomputedValue.SKYLARK_SEMANTICS.set(differencer, StarlarkSemantics.DEFAULT_SEMANTICS);
RepositoryDelegatorFunction.REPOSITORY_OVERRIDES.set(
differencer, ImmutableMap.<RepositoryName, PathFragment>of());
RepositoryDelegatorFunction.DEPENDENCY_FOR_UNCONDITIONAL_FETCHING.set(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunctionTest.java
index 22a9cc2..0fa3e05 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TransitiveTraversalFunctionTest.java
@@ -24,7 +24,7 @@
import com.google.devtools.build.lib.packages.NoSuchTargetException;
import com.google.devtools.build.lib.packages.Package;
import com.google.devtools.build.lib.skyframe.TransitiveBaseTraversalFunction.TargetAndErrorIfAnyImpl;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.util.GroupedList;
import com.google.devtools.build.lib.util.GroupedList.GroupedListHelper;
import com.google.devtools.build.lib.vfs.Path;
@@ -113,6 +113,6 @@
RootedPath.toRootedPath(root, buildFile),
packageIdentifier -> buildFile,
reporter,
- SkylarkSemantics.DEFAULT_SEMANTICS);
+ StarlarkSemantics.DEFAULT_SEMANTICS);
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
index 58cc969..c1c3c43 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunctionTest.java
@@ -33,7 +33,7 @@
import com.google.devtools.build.lib.packages.WorkspaceFileValue;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
import com.google.devtools.build.lib.skyframe.util.SkyframeExecutorTestUtils;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.testutil.MoreAsserts;
import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
import com.google.devtools.build.lib.vfs.ModifiedFileSet;
@@ -188,7 +188,7 @@
public SkyValue answer(InvocationOnMock invocation) throws Throwable {
SkyKey key = (SkyKey) invocation.getArguments()[0];
if (key.equals(PrecomputedValue.SKYLARK_SEMANTICS.getKeyForTesting())) {
- return new PrecomputedValue(SkylarkSemantics.DEFAULT_SEMANTICS);
+ return new PrecomputedValue(StarlarkSemantics.DEFAULT_SEMANTICS);
} else if (key.equals(
RepositoryDelegatorFunction.RESOLVED_FILE_INSTEAD_OF_WORKSPACE
.getKeyForTesting())) {
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
index 9fe3d20..01b0497 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java
@@ -56,7 +56,7 @@
import com.google.devtools.build.lib.syntax.SkylarkList.MutableList;
import com.google.devtools.build.lib.syntax.SkylarkList.Tuple;
import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.syntax.Type;
import com.google.devtools.build.lib.testutil.MoreAsserts;
import com.google.devtools.build.lib.util.FileTypeSet;
@@ -199,11 +199,12 @@
@Test
public void testDisableDeprecatedParams() throws Exception {
- ev = createEvaluationTestCase(
- SkylarkSemantics.DEFAULT_SEMANTICS
- .toBuilder()
- .incompatibleDisableDeprecatedAttrParams(true)
- .build());
+ ev =
+ createEvaluationTestCase(
+ StarlarkSemantics.DEFAULT_SEMANTICS
+ .toBuilder()
+ .incompatibleDisableDeprecatedAttrParams(true)
+ .build());
ev.initialize();
// Verify 'single_file' deprecation.
@@ -591,11 +592,12 @@
@Test
public void incompatibleDataTransition() throws Exception {
- ev = createEvaluationTestCase(
- SkylarkSemantics.DEFAULT_SEMANTICS
- .toBuilder()
- .incompatibleDisallowDataTransition(true)
- .build());
+ ev =
+ createEvaluationTestCase(
+ StarlarkSemantics.DEFAULT_SEMANTICS
+ .toBuilder()
+ .incompatibleDisallowDataTransition(true)
+ .build());
ev.initialize();
EvalException expected =
assertThrows(EvalException.class, () -> eval("attr.label(cfg = 'data')"));
@@ -643,7 +645,10 @@
public void testNoAttrLicense() throws Exception {
ev =
createEvaluationTestCase(
- SkylarkSemantics.DEFAULT_SEMANTICS.toBuilder().incompatibleNoAttrLicense(true).build());
+ StarlarkSemantics.DEFAULT_SEMANTICS
+ .toBuilder()
+ .incompatibleNoAttrLicense(true)
+ .build());
ev.initialize();
EvalException expected = assertThrows(EvalException.class, () -> eval("attr.license()"));
@@ -853,8 +858,8 @@
@Test
public void testFileTypeIsDisabled() throws Exception {
- SkylarkSemantics semantics =
- SkylarkSemantics.DEFAULT_SEMANTICS.toBuilder().incompatibleDisallowFileType(true).build();
+ StarlarkSemantics semantics =
+ StarlarkSemantics.DEFAULT_SEMANTICS.toBuilder().incompatibleDisallowFileType(true).build();
EvalException expected =
assertThrows(EvalException.class, () -> evalRuleClassCode(semantics, "FileType(['.css'])"));
assertThat(expected).hasMessageThat().contains("FileType function is not available.");
diff --git a/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java b/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java
index 67b6d6b..5340aa0 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java
@@ -35,9 +35,9 @@
import com.google.devtools.build.lib.syntax.Environment.GlobalFrame;
import com.google.devtools.build.lib.syntax.EvalException;
import com.google.devtools.build.lib.syntax.Runtime;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
import com.google.devtools.build.lib.syntax.SkylarkUtils;
import com.google.devtools.build.lib.syntax.SkylarkUtils.Phase;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.syntax.util.EvaluationTestCase;
import com.google.devtools.build.lib.testutil.TestConstants;
import org.junit.Before;
@@ -52,7 +52,7 @@
@Before
public final void setUpEvaluator() throws Exception {
- ev = createEvaluationTestCase(SkylarkSemantics.DEFAULT_SEMANTICS);
+ ev = createEvaluationTestCase(StarlarkSemantics.DEFAULT_SEMANTICS);
ev.initialize();
}
@@ -65,7 +65,7 @@
return GlobalFrame.createForBuiltins(envBuilder.build());
}
- protected EvaluationTestCase createEvaluationTestCase(SkylarkSemantics semantics) {
+ protected EvaluationTestCase createEvaluationTestCase(StarlarkSemantics semantics) {
return new EvaluationTestCase() {
@Override
public Environment newEnvironment() throws Exception {
@@ -155,7 +155,8 @@
return eval("def impl(ctx): return None\n" + Joiner.on("\n").join(lines));
}
- protected Object evalRuleClassCode(SkylarkSemantics semantics, String... lines) throws Exception {
+ protected Object evalRuleClassCode(StarlarkSemantics semantics, String... lines)
+ throws Exception {
ev = createEvaluationTestCase(semantics);
ev.initialize();
return eval("def impl(ctx): return None\n" + Joiner.on("\n").join(lines));
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/EnablingAndDisablingFlag.java b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/EnablingAndDisablingFlag.java
index a11536d..f115acf 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/EnablingAndDisablingFlag.java
+++ b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/EnablingAndDisablingFlag.java
@@ -16,7 +16,7 @@
import com.google.devtools.build.lib.skylarkinterface.Param;
import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics.FlagIdentifier;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
/**
* Test case for a SkylarkCallable method which has both enablingFlag and disablingFlag specified.
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/EnablingAndDisablingFlagParam.java b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/EnablingAndDisablingFlagParam.java
index 83274df..43db843 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/EnablingAndDisablingFlagParam.java
+++ b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/EnablingAndDisablingFlagParam.java
@@ -16,7 +16,7 @@
import com.google.devtools.build.lib.skylarkinterface.Param;
import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics.FlagIdentifier;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
/**
* Test case for a SkylarkCallable method which has a parameter with both enableOnlyWithFlag and
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/GoldenCase.java b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/GoldenCase.java
index 05ce965..6f41aab 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/GoldenCase.java
+++ b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/GoldenCase.java
@@ -23,7 +23,7 @@
import com.google.devtools.build.lib.syntax.FuncallExpression;
import com.google.devtools.build.lib.syntax.SkylarkDict;
import com.google.devtools.build.lib.syntax.SkylarkList;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
/**
* Test source file verifying various proper uses of SkylarkCallable.
@@ -39,12 +39,11 @@
}
@SkylarkCallable(
- name = "struct_field_method_with_info",
- documented = false,
- structField = true,
- useSkylarkSemantics = true
- )
- public String structFieldMethodWithInfo(SkylarkSemantics semantics) {
+ name = "struct_field_method_with_info",
+ documented = false,
+ structField = true,
+ useSkylarkSemantics = true)
+ public String structFieldMethodWithInfo(StarlarkSemantics semantics) {
return "foo";
}
@@ -62,18 +61,17 @@
}
@SkylarkCallable(
- name = "zero_arg_method_with_skylark_info",
- documented = false,
- useAst = true,
- useLocation = true,
- useEnvironment = true,
- useSkylarkSemantics = true
- )
+ name = "zero_arg_method_with_skylark_info",
+ documented = false,
+ useAst = true,
+ useLocation = true,
+ useEnvironment = true,
+ useSkylarkSemantics = true)
public Integer zeroArgMethod(
Location location,
FuncallExpression ast,
Environment environment,
- SkylarkSemantics semantics) {
+ StarlarkSemantics semantics) {
return 0;
}
@@ -108,18 +106,17 @@
}
@SkylarkCallable(
- name = "three_arg_method_with_params_and_info",
- documented = false,
- parameters = {
- @Param(name = "one", type = String.class, named = true),
- @Param(name = "two", type = Integer.class, named = true),
- @Param(name = "three", type = String.class, named = true),
- },
- useAst = true,
- useLocation = true,
- useEnvironment = true,
- useSkylarkSemantics = true
- )
+ name = "three_arg_method_with_params_and_info",
+ documented = false,
+ parameters = {
+ @Param(name = "one", type = String.class, named = true),
+ @Param(name = "two", type = Integer.class, named = true),
+ @Param(name = "three", type = String.class, named = true),
+ },
+ useAst = true,
+ useLocation = true,
+ useEnvironment = true,
+ useSkylarkSemantics = true)
public String threeArgMethodWithParams(
String one,
Integer two,
@@ -127,7 +124,7 @@
Location location,
FuncallExpression ast,
Environment environment,
- SkylarkSemantics skylarkSemantics) {
+ StarlarkSemantics starlarkSemantics) {
return "baz";
}
@@ -177,7 +174,7 @@
Location location,
FuncallExpression ast,
Environment environment,
- SkylarkSemantics skylarkSemantics,
+ StarlarkSemantics starlarkSemantics,
StarlarkContext context) {
return "blep";
}
@@ -221,11 +218,9 @@
structField = true,
useLocation = true,
useEnvironment = true,
- useSkylarkSemantics = true
- )
- public String structFieldMethodWithInfo(Location location,
- Environment environment,
- SkylarkSemantics skylarkSemantics) {
+ useSkylarkSemantics = true)
+ public String structFieldMethodWithInfo(
+ Location location, Environment environment, StarlarkSemantics starlarkSemantics) {
return "dragon";
}
}
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ToggledKwargsParam.java b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ToggledKwargsParam.java
index 243b15a..c2f4a7e 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ToggledKwargsParam.java
+++ b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ToggledKwargsParam.java
@@ -19,7 +19,7 @@
import com.google.devtools.build.lib.syntax.Environment;
import com.google.devtools.build.lib.syntax.SkylarkDict;
import com.google.devtools.build.lib.syntax.SkylarkList;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics.FlagIdentifier;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
/**
* Test case for a SkylarkCallable method which has a "extraKeywords" parameter which has
diff --git a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ToggledParamNoDisabledValue.java b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ToggledParamNoDisabledValue.java
index eebbd28..ed2d8d3 100644
--- a/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ToggledParamNoDisabledValue.java
+++ b/src/test/java/com/google/devtools/build/lib/skylarkinterface/processor/testsources/ToggledParamNoDisabledValue.java
@@ -16,7 +16,7 @@
import com.google.devtools.build.lib.skylarkinterface.Param;
import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics.FlagIdentifier;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
/**
* Test case for a SkylarkCallable method which has a parameter which may be disabled with semantic
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
index 4777550..3d89729 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java
@@ -37,7 +37,7 @@
import com.google.devtools.build.lib.skylarkinterface.SkylarkValue;
import com.google.devtools.build.lib.skylarkinterface.StarlarkContext;
import com.google.devtools.build.lib.syntax.SkylarkList.MutableList;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics.FlagIdentifier;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
import com.google.devtools.build.lib.testutil.TestMode;
import java.util.List;
import java.util.Map;
@@ -161,11 +161,13 @@
public String structField() {
return "a";
}
- @SkylarkCallable(name = "struct_field_with_extra",
+
+ @SkylarkCallable(
+ name = "struct_field_with_extra",
documented = false,
structField = true,
useSkylarkSemantics = true)
- public String structFieldWithExtra(SkylarkSemantics sem) {
+ public String structFieldWithExtra(StarlarkSemantics sem) {
return "struct_field_with_extra("
+ (sem != null)
+ ")";
@@ -320,7 +322,7 @@
Location location,
FuncallExpression func,
Environment env,
- SkylarkSemantics sem,
+ StarlarkSemantics sem,
StarlarkContext context) {
return "with_extra("
+ location.getStartLine()
@@ -336,59 +338,53 @@
}
@SkylarkCallable(
- name = "with_params_and_extra",
- documented = false,
- parameters = {
- @Param(name = "pos1"),
- @Param(name = "pos2", defaultValue = "False", type = Boolean.class),
- @Param(
- name = "posOrNamed",
- defaultValue = "False",
- type = Boolean.class,
- positional = true,
- named = true
- ),
- @Param(name = "named", type = Boolean.class, positional = false, named = true),
- @Param(
- name = "optionalNamed",
- type = Boolean.class,
- defaultValue = "False",
- positional = false,
- named = true
- ),
- @Param(
- name = "nonNoneable",
- type = Object.class,
- defaultValue = "\"a\"",
- positional = false,
- named = true
- ),
- @Param(
- name = "noneable",
- type = Integer.class,
- defaultValue = "None",
- noneable = true,
- positional = false,
- named = true
- ),
- @Param(
- name = "multi",
- allowedTypes = {
- @ParamType(type = String.class),
- @ParamType(type = Integer.class),
- @ParamType(type = SkylarkList.class, generic1 = Integer.class),
- },
- defaultValue = "None",
- noneable = true,
- positional = false,
- named = true
- )
- },
- useAst = true,
- useLocation = true,
- useEnvironment = true,
- useSkylarkSemantics = true
- )
+ name = "with_params_and_extra",
+ documented = false,
+ parameters = {
+ @Param(name = "pos1"),
+ @Param(name = "pos2", defaultValue = "False", type = Boolean.class),
+ @Param(
+ name = "posOrNamed",
+ defaultValue = "False",
+ type = Boolean.class,
+ positional = true,
+ named = true),
+ @Param(name = "named", type = Boolean.class, positional = false, named = true),
+ @Param(
+ name = "optionalNamed",
+ type = Boolean.class,
+ defaultValue = "False",
+ positional = false,
+ named = true),
+ @Param(
+ name = "nonNoneable",
+ type = Object.class,
+ defaultValue = "\"a\"",
+ positional = false,
+ named = true),
+ @Param(
+ name = "noneable",
+ type = Integer.class,
+ defaultValue = "None",
+ noneable = true,
+ positional = false,
+ named = true),
+ @Param(
+ name = "multi",
+ allowedTypes = {
+ @ParamType(type = String.class),
+ @ParamType(type = Integer.class),
+ @ParamType(type = SkylarkList.class, generic1 = Integer.class),
+ },
+ defaultValue = "None",
+ noneable = true,
+ positional = false,
+ named = true)
+ },
+ useAst = true,
+ useLocation = true,
+ useEnvironment = true,
+ useSkylarkSemantics = true)
public String withParamsAndExtraInterpreterParams(
Integer pos1,
boolean pos2,
@@ -401,7 +397,7 @@
Location location,
FuncallExpression func,
Environment env,
- SkylarkSemantics sem) {
+ StarlarkSemantics sem) {
return "with_params_and_extra("
+ pos1
+ ", "
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/StarlarkFlagGuardingTest.java b/src/test/java/com/google/devtools/build/lib/syntax/StarlarkFlagGuardingTest.java
index eb083ef..24c4cd7 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/StarlarkFlagGuardingTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/StarlarkFlagGuardingTest.java
@@ -16,7 +16,7 @@
import com.google.devtools.build.lib.skylarkinterface.Param;
import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics.FlagIdentifier;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics.FlagIdentifier;
import com.google.devtools.build.lib.syntax.util.EvaluationTestCase;
import com.google.devtools.build.lib.testutil.TestMode;
import org.junit.Before;
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/BazelPackageBuilderHelperForTesting.java b/src/test/java/com/google/devtools/build/lib/testutil/BazelPackageBuilderHelperForTesting.java
index c56170a..908c713 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/BazelPackageBuilderHelperForTesting.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/BazelPackageBuilderHelperForTesting.java
@@ -26,7 +26,7 @@
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.skyframe.packages.BazelPackageLoader;
import com.google.devtools.build.lib.skyframe.packages.PackageLoader;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.vfs.Root;
/**
@@ -50,8 +50,8 @@
@Override
public void onLoadingComplete(
- Package pkg, SkylarkSemantics skylarkSemantics, long loadTimeNanos) {
- sanityCheckBazelPackageLoader(pkg, ruleClassProvider, skylarkSemantics);
+ Package pkg, StarlarkSemantics starlarkSemantics, long loadTimeNanos) {
+ sanityCheckBazelPackageLoader(pkg, ruleClassProvider, starlarkSemantics);
}
private static final Function<Target, Label> TARGET_TO_LABEL =
@@ -65,14 +65,14 @@
private void sanityCheckBazelPackageLoader(
Package pkg,
ConfiguredRuleClassProvider ruleClassProvider,
- SkylarkSemantics skylarkSemantics) {
+ StarlarkSemantics starlarkSemantics) {
PackageIdentifier pkgId = pkg.getPackageIdentifier();
PackageLoader packageLoader =
BazelPackageLoader.builder(
- Root.fromPath(directories.getWorkspace()),
- directories.getInstallBase(),
- directories.getOutputBase())
- .setSkylarkSemantics(skylarkSemantics)
+ Root.fromPath(directories.getWorkspace()),
+ directories.getInstallBase(),
+ directories.getOutputBase())
+ .setSkylarkSemantics(starlarkSemantics)
.setRuleClassProvider(ruleClassProvider)
.build();
Package newlyLoadedPkg;
diff --git a/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java b/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java
index e850ac6..cbd33fe 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/TestMode.java
@@ -20,7 +20,7 @@
import com.google.devtools.build.lib.syntax.Environment;
import com.google.devtools.build.lib.syntax.Environment.GlobalFrame;
import com.google.devtools.build.lib.syntax.Mutability;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.common.options.OptionsParser;
import java.util.Map;
@@ -29,7 +29,7 @@
* appropriate {@code Environment} has to be created
*/
public abstract class TestMode {
- private static SkylarkSemantics parseSkylarkSemantics(String... skylarkOptions)
+ private static StarlarkSemantics parseSkylarkSemantics(String... skylarkOptions)
throws Exception {
OptionsParser parser = OptionsParser.newOptionsParser(SkylarkSemanticsOptions.class);
parser.parse(skylarkOptions);
diff --git a/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java b/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java
index 5ab2830..8d80485 100644
--- a/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java
+++ b/src/test/java/com/google/devtools/build/skydoc/SkydocTest.java
@@ -23,7 +23,7 @@
import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.skylark.util.SkylarkTestCase;
import com.google.devtools.build.lib.syntax.ParserInputSource;
-import com.google.devtools.build.lib.syntax.SkylarkSemantics;
+import com.google.devtools.build.lib.syntax.StarlarkSemantics;
import com.google.devtools.build.lib.syntax.UserDefinedFunction;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
import com.google.devtools.build.lib.vfs.Path;
@@ -91,7 +91,7 @@
ImmutableList.Builder<RuleInfo> unexportedRuleInfos = ImmutableList.builder();
skydocMain.eval(
- SkylarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT_SEMANTICS,
Label.parseAbsoluteUnchecked("//test:test.bzl"),
ruleInfoMap,
unexportedRuleInfos,
@@ -155,7 +155,7 @@
ImmutableList.Builder<RuleInfo> unexportedRuleInfos = ImmutableList.builder();
skydocMain.eval(
- SkylarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT_SEMANTICS,
Label.parseAbsoluteUnchecked("//test:test.bzl"),
ruleInfoMap,
unexportedRuleInfos,
@@ -207,7 +207,7 @@
ImmutableMap.Builder<String, RuleInfo> ruleInfoMapBuilder = ImmutableMap.builder();
skydocMain.eval(
- SkylarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT_SEMANTICS,
Label.parseAbsoluteUnchecked("//test:main.bzl"),
ruleInfoMapBuilder,
ImmutableList.builder(),
@@ -259,7 +259,7 @@
ImmutableMap.Builder<String, RuleInfo> ruleInfoMapBuilder = ImmutableMap.builder();
skydocMain.eval(
- SkylarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT_SEMANTICS,
Label.parseAbsoluteUnchecked("//test:main.bzl"),
ruleInfoMapBuilder,
ImmutableList.builder(),
@@ -298,7 +298,7 @@
IllegalStateException.class,
() ->
skydocMain.eval(
- SkylarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT_SEMANTICS,
Label.parseAbsoluteUnchecked("//test:main.bzl"),
ruleInfoMapBuilder,
ImmutableList.builder(),
@@ -331,7 +331,7 @@
ImmutableMap.Builder<String, UserDefinedFunction> functionInfoBuilder = ImmutableMap.builder();
skydocMain.eval(
- SkylarkSemantics.DEFAULT_SEMANTICS,
+ StarlarkSemantics.DEFAULT_SEMANTICS,
Label.parseAbsoluteUnchecked("//test:main.bzl"),
ImmutableMap.builder(),
ImmutableList.builder(),
