bazel syntax: rename SkylarkList to Sequence
This is a breaking change for copybara.
PiperOrigin-RevId: 280090855
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/BaseFunctionTest.java b/src/test/java/com/google/devtools/build/lib/syntax/BaseFunctionTest.java
index 79eeaa7..4b5edb5 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/BaseFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/BaseFunctionTest.java
@@ -33,8 +33,8 @@
public class BaseFunctionTest extends EvaluationTestCase {
/**
- * Handy implementation of {@link BaseFunction} that returns all its args as a list.
- * (We'd use SkylarkList.tuple, but it can't handle null.)
+ * Handy implementation of {@link BaseFunction} that returns all its args as a list. (We'd use
+ * Sequence.tuple, but it can't handle null.)
*/
private static class TestingBaseFunction extends BaseFunction {
TestingBaseFunction(FunctionSignature signature) {
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 de86116..ff07322 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
@@ -227,55 +227,49 @@
}
@SkylarkCallable(
- name = "with_params",
- 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
- )
- }
- )
+ name = "with_params",
+ 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 = Sequence.class, generic1 = Integer.class),
+ },
+ defaultValue = "None",
+ noneable = true,
+ positional = false,
+ named = true)
+ })
public String withParams(
Integer pos1,
boolean pos2,
@@ -359,7 +353,7 @@
allowedTypes = {
@ParamType(type = String.class),
@ParamType(type = Integer.class),
- @ParamType(type = SkylarkList.class, generic1 = Integer.class),
+ @ParamType(type = Sequence.class, generic1 = Integer.class),
},
defaultValue = "None",
noneable = true,
@@ -428,7 +422,7 @@
extraPositionals = @Param(name = "args"),
useStarlarkThread = true)
public String withArgsAndThread(
- Integer pos1, boolean pos2, boolean named, SkylarkList<?> args, StarlarkThread thread) {
+ Integer pos1, boolean pos2, boolean named, Sequence<?> args, StarlarkThread thread) {
String argsString =
"args(" + args.stream().map(Printer::debugPrint).collect(joining(", ")) + ")";
return "with_args_and_thread("
@@ -468,15 +462,14 @@
}
@SkylarkCallable(
- name = "with_args_and_kwargs",
- documented = false,
- parameters = {
- @Param(name = "foo", named = true, positional = true, type = String.class),
- },
- extraPositionals = @Param(name = "args"),
- extraKeywords = @Param(name = "kwargs")
- )
- public String withArgsAndKwargs(String foo, SkylarkList<?> args, SkylarkDict<?, ?> kwargs)
+ name = "with_args_and_kwargs",
+ documented = false,
+ parameters = {
+ @Param(name = "foo", named = true, positional = true, type = String.class),
+ },
+ extraPositionals = @Param(name = "args"),
+ extraKeywords = @Param(name = "kwargs"))
+ public String withArgsAndKwargs(String foo, Sequence<?> args, SkylarkDict<?, ?> kwargs)
throws EvalException {
String argsString =
"args(" + args.stream().map(Printer::debugPrint).collect(joining(", ")) + ")";
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkListTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkListTest.java
index d31a7e0..f7eeb0b 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkListTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkListTest.java
@@ -24,9 +24,7 @@
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
-/**
- * Tests for SkylarkList.
- */
+/** Tests for Sequence. */
@RunWith(JUnit4.class)
public class SkylarkListTest extends EvaluationTestCase {
@@ -64,8 +62,8 @@
}
@SuppressWarnings("unchecked")
- private SkylarkList<Object> listEval(String... input) throws Exception {
- return (SkylarkList<Object>) eval(input);
+ private Sequence<Object> listEval(String... input) throws Exception {
+ return (Sequence<Object>) eval(input);
}
@Test
@@ -156,8 +154,7 @@
@Test
public void testListConcat() throws Exception {
- assertThat(eval("[1, 2] + [3, 4]"))
- .isEqualTo(SkylarkList.createImmutable(Tuple.of(1, 2, 3, 4)));
+ assertThat(eval("[1, 2] + [3, 4]")).isEqualTo(Sequence.createImmutable(Tuple.of(1, 2, 3, 4)));
}
@Test
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/StarlarkFileTest.java b/src/test/java/com/google/devtools/build/lib/syntax/StarlarkFileTest.java
index feb49ae..0d1fafe 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/StarlarkFileTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/StarlarkFileTest.java
@@ -58,7 +58,7 @@
// input1.BUILD contains:
// x = [1,2,'foo',4] + [1,2, "%s%d" % ('foo', 1)]
assertThat(thread.moduleLookup("x"))
- .isEqualTo(SkylarkList.createImmutable(Tuple.of(1, 2, "foo", 4, 1, 2, "foo1")));
+ .isEqualTo(Sequence.createImmutable(Tuple.of(1, 2, "foo", 4, 1, 2, "foo1")));
}
@Test
