commit 6659b4ce61b5146e5d88617893df9686ec9c8b03
author laurentlb <laurentlb@google.com> Mon Feb 18 07:23:36 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Feb 18 07:24:49 2019 -0800
tree a5b68a3bf6f608bea9fc288303eedc145ff38c90
parent aca1e8793f66b6501baafa730940833ecb37c26b

Rename SkylarkSemantics to StarlarkSemantics

RELNOTES: None.
PiperOrigin-RevId: 234478524

src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleClassFunctionsTest.java

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.");

src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java

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));