Rename Skylark to Starlark
RELNOTES: None.
PiperOrigin-RevId: 234493768
diff --git a/src/BUILD b/src/BUILD
index 5cb5990..8a51909 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -453,7 +453,7 @@
"//src/main/java/com/google/devtools/build/skydoc:srcs",
"//src/main/java/com/google/devtools/build/skyframe:srcs",
"//src/main/java/com/google/devtools/common/options:srcs",
- "//src/main/java/com/google/devtools/skylark:srcs",
+ "//src/main/java/com/google/devtools/starlark:srcs",
"//src/main/native:srcs",
"//src/main/protobuf:srcs",
"//src/main/tools:srcs",
@@ -462,7 +462,7 @@
"//src/test/cpp:srcs",
"//src/test/gen:srcs",
"//src/test/native:srcs",
- "//src/test/skylark:srcs",
+ "//src/test/starlark:srcs",
"//src/test/java/com/google/devtools/build/android:srcs",
"//src/test/java/com/google/devtools/build/docgen:srcs",
"//src/test/java/com/google/devtools/build/lib:srcs",
diff --git a/src/main/java/com/google/devtools/skylark/BUILD b/src/main/java/com/google/devtools/starlark/BUILD
similarity index 83%
rename from src/main/java/com/google/devtools/skylark/BUILD
rename to src/main/java/com/google/devtools/starlark/BUILD
index 006f9aa..da44f76 100644
--- a/src/main/java/com/google/devtools/skylark/BUILD
+++ b/src/main/java/com/google/devtools/starlark/BUILD
@@ -1,11 +1,11 @@
-# The Skylark interpreter
+# The Starlark interpreter
# Open-sourced as part of Bazel.
package(default_visibility = ["//src:__subpackages__"])
java_binary(
- name = "Skylark",
- srcs = ["Skylark.java"],
+ name = "Starlark",
+ srcs = ["Starlark.java"],
jvm_flags = [
# quiet warnings from com.google.protobuf.UnsafeUtil,
# see: https://github.com/google/protobuf/issues/3781
@@ -15,7 +15,7 @@
# ... but only on JDK >= 9
"-XX:+IgnoreUnrecognizedVMOptions",
],
- main_class = "com.google.devtools.skylark.Skylark",
+ main_class = "com.google.devtools.starlark.Starlark",
deps = [
"//src/main/java/com/google/devtools/build/lib:events",
"//src/main/java/com/google/devtools/build/lib:packages-internal",
diff --git a/src/main/java/com/google/devtools/skylark/Skylark.java b/src/main/java/com/google/devtools/starlark/Starlark.java
similarity index 92%
rename from src/main/java/com/google/devtools/skylark/Skylark.java
rename to src/main/java/com/google/devtools/starlark/Starlark.java
index cfa4d6f..4ff32d9 100644
--- a/src/main/java/com/google/devtools/skylark/Skylark.java
+++ b/src/main/java/com/google/devtools/starlark/Starlark.java
@@ -11,7 +11,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.google.devtools.skylark;
+package com.google.devtools.starlark;
import com.google.devtools.build.lib.events.Event;
import com.google.devtools.build.lib.events.EventHandler;
@@ -30,11 +30,11 @@
import java.nio.file.Paths;
/**
- * Skylark is a standalone skylark intepreter. The environment doesn't
+ * Starlark is a standalone starlark intepreter. The environment doesn't
* contain Bazel-specific functions and variables. Load statements are
* forbidden for the moment.
*/
-class Skylark {
+class Starlark {
private static final String START_PROMPT = ">> ";
private static final String CONTINUATION_PROMPT = ".. ";
@@ -84,7 +84,7 @@
}
}
- /** Provide a REPL evaluating Skylark code. */
+ /** Provide a REPL evaluating Starlark code. */
public void readEvalPrintLoop() {
String input;
while ((input = prompt()) != null) {
@@ -99,7 +99,7 @@
}
}
- /** Execute a Skylark file. */
+ /** Execute a Starlark file. */
public int execute(String path) {
String content;
try {
@@ -118,9 +118,9 @@
public static void main(String[] args) {
int ret = 0;
if (args.length == 0) {
- new Skylark().readEvalPrintLoop();
+ new Starlark().readEvalPrintLoop();
} else if (args.length == 1) {
- ret = new Skylark().execute(args[0]);
+ ret = new Starlark().execute(args[0]);
} else {
System.err.println("too many arguments");
ret = 1;
diff --git a/src/test/skylark/BUILD b/src/test/starlark/BUILD
similarity index 81%
rename from src/test/skylark/BUILD
rename to src/test/starlark/BUILD
index a3e1c5a..6694c73 100644
--- a/src/test/skylark/BUILD
+++ b/src/test/starlark/BUILD
@@ -8,22 +8,22 @@
filegroup(
name = "srcs",
- srcs = glob(["**"]) + ["//src/test/skylark/skylint:srcs"],
+ srcs = glob(["**"]) + ["//src/test/starlark/skylint:srcs"],
)
[
py_test(
- name = "skylark_test_" + test_file.replace(".", "_"),
+ name = "starlark_test_" + test_file.replace(".", "_"),
srcs = [
- "skylark_test.py",
+ "starlark_test.py",
"testenv.py",
],
args = [test_file],
data = [
- "//src/main/java/com/google/devtools/skylark:Skylark",
+ "//src/main/java/com/google/devtools/starlark:Starlark",
test_file,
],
- main = "skylark_test.py",
+ main = "starlark_test.py",
)
for test_file in glob(["testdata/*"])
]
diff --git a/src/test/skylark/question.text b/src/test/starlark/question.text
similarity index 100%
rename from src/test/skylark/question.text
rename to src/test/starlark/question.text
diff --git a/src/test/skylark/skylint/BUILD b/src/test/starlark/skylint/BUILD
similarity index 100%
rename from src/test/skylark/skylint/BUILD
rename to src/test/starlark/skylint/BUILD
diff --git a/src/test/skylark/skylint/skylint_test.py b/src/test/starlark/skylint/skylint_test.py
similarity index 98%
rename from src/test/skylark/skylint/skylint_test.py
rename to src/test/starlark/skylint/skylint_test.py
index 26dba1d..0d429dd 100644
--- a/src/test/skylark/skylint/skylint_test.py
+++ b/src/test/starlark/skylint/skylint_test.py
@@ -18,7 +18,7 @@
import tempfile
import unittest
-from src.test.skylark.skylint import testenv
+from src.test.starlark.skylint import testenv
class SkylintTest(unittest.TestCase):
diff --git a/src/test/skylark/skylint/testdata/bad.bzl.test b/src/test/starlark/skylint/testdata/bad.bzl.test
similarity index 100%
rename from src/test/skylark/skylint/testdata/bad.bzl.test
rename to src/test/starlark/skylint/testdata/bad.bzl.test
diff --git a/src/test/skylark/skylint/testdata/good.bzl.test b/src/test/starlark/skylint/testdata/good.bzl.test
similarity index 100%
rename from src/test/skylark/skylint/testdata/good.bzl.test
rename to src/test/starlark/skylint/testdata/good.bzl.test
diff --git a/src/test/skylark/skylint/testenv.py b/src/test/starlark/skylint/testenv.py
similarity index 92%
rename from src/test/skylark/skylint/testenv.py
rename to src/test/starlark/skylint/testenv.py
index 5e23a0e..a5c087a 100644
--- a/src/test/skylark/skylint/testenv.py
+++ b/src/test/starlark/skylint/testenv.py
@@ -14,4 +14,4 @@
"""Test constants for src/test/skylark/skylint."""
SKYLINT_BINARY_PATH = "src/tools/skylark/java/com/google/devtools/skylark/skylint/Skylint"
-SKYLINT_TESTDATA_PATH = "src/test/skylark/skylint/testdata/"
+SKYLINT_TESTDATA_PATH = "src/test/starlark/skylint/testdata/"
diff --git a/src/test/skylark/skylark_test.py b/src/test/starlark/starlark_test.py
similarity index 91%
rename from src/test/skylark/skylark_test.py
rename to src/test/starlark/starlark_test.py
index 0e7bcf5..15893dc 100644
--- a/src/test/skylark/skylark_test.py
+++ b/src/test/starlark/starlark_test.py
@@ -21,11 +21,11 @@
import tempfile
import unittest
-from src.test.skylark import testenv
+from src.test.starlark import testenv
-class SkylarkTest(unittest.TestCase):
- """Tests for Skylark.
+class StarlarkTest(unittest.TestCase):
+ """Tests for Starlark.
In a test file, chunks are separated by "---". Each chunk is evaluated
separately. Use "###" to specify the expected error. If there is no "###",
@@ -54,9 +54,9 @@
yield code, expected_errors
def evaluate(self, f):
- """Execute Skylark file, return stderr."""
+ """Execute Starlark file, return stderr."""
proc = subprocess.Popen(
- [testenv.SKYLARK_BINARY_PATH, f], stderr=subprocess.PIPE)
+ [testenv.STARLARK_BINARY_PATH, f], stderr=subprocess.PIPE)
_, stderr = proc.communicate()
return stderr
@@ -88,7 +88,7 @@
def testFile(self):
t = test_file
print("===", t, "===")
- f = os.path.join(testenv.SKYLARK_TESTDATA_PATH, t)
+ f = os.path.join(testenv.STARLARK_TESTDATA_PATH, t)
for chunk, expected in self.chunks(f):
with tempfile.NamedTemporaryFile(
mode="wb", suffix=".sky", delete=False) as tmp:
diff --git a/src/test/skylark/testdata/all_any.sky b/src/test/starlark/testdata/all_any.sky
similarity index 100%
rename from src/test/skylark/testdata/all_any.sky
rename to src/test/starlark/testdata/all_any.sky
diff --git a/src/test/skylark/testdata/and_or_not.sky b/src/test/starlark/testdata/and_or_not.sky
similarity index 100%
rename from src/test/skylark/testdata/and_or_not.sky
rename to src/test/starlark/testdata/and_or_not.sky
diff --git a/src/test/skylark/testdata/equality.sky b/src/test/starlark/testdata/equality.sky
similarity index 100%
rename from src/test/skylark/testdata/equality.sky
rename to src/test/starlark/testdata/equality.sky
diff --git a/src/test/skylark/testdata/int.sky b/src/test/starlark/testdata/int.sky
similarity index 100%
rename from src/test/skylark/testdata/int.sky
rename to src/test/starlark/testdata/int.sky
diff --git a/src/test/skylark/testdata/int_constructor.sky b/src/test/starlark/testdata/int_constructor.sky
similarity index 100%
rename from src/test/skylark/testdata/int_constructor.sky
rename to src/test/starlark/testdata/int_constructor.sky
diff --git a/src/test/skylark/testdata/int_function.sky b/src/test/starlark/testdata/int_function.sky
similarity index 100%
rename from src/test/skylark/testdata/int_function.sky
rename to src/test/starlark/testdata/int_function.sky
diff --git a/src/test/skylark/testdata/list_mutation.sky b/src/test/starlark/testdata/list_mutation.sky
similarity index 100%
rename from src/test/skylark/testdata/list_mutation.sky
rename to src/test/starlark/testdata/list_mutation.sky
diff --git a/src/test/skylark/testdata/list_slices.sky b/src/test/starlark/testdata/list_slices.sky
similarity index 100%
rename from src/test/skylark/testdata/list_slices.sky
rename to src/test/starlark/testdata/list_slices.sky
diff --git a/src/test/skylark/testdata/min_max.sky b/src/test/starlark/testdata/min_max.sky
similarity index 100%
rename from src/test/skylark/testdata/min_max.sky
rename to src/test/starlark/testdata/min_max.sky
diff --git a/src/test/skylark/testdata/range.sky b/src/test/starlark/testdata/range.sky
similarity index 100%
rename from src/test/skylark/testdata/range.sky
rename to src/test/starlark/testdata/range.sky
diff --git a/src/test/skylark/testdata/reversed.sky b/src/test/starlark/testdata/reversed.sky
similarity index 100%
rename from src/test/skylark/testdata/reversed.sky
rename to src/test/starlark/testdata/reversed.sky
diff --git a/src/test/skylark/testdata/string_elems.sky b/src/test/starlark/testdata/string_elems.sky
similarity index 100%
rename from src/test/skylark/testdata/string_elems.sky
rename to src/test/starlark/testdata/string_elems.sky
diff --git a/src/test/skylark/testdata/string_find.sky b/src/test/starlark/testdata/string_find.sky
similarity index 100%
rename from src/test/skylark/testdata/string_find.sky
rename to src/test/starlark/testdata/string_find.sky
diff --git a/src/test/skylark/testdata/string_format.sky b/src/test/starlark/testdata/string_format.sky
similarity index 100%
rename from src/test/skylark/testdata/string_format.sky
rename to src/test/starlark/testdata/string_format.sky
diff --git a/src/test/skylark/testdata/string_misc.sky b/src/test/starlark/testdata/string_misc.sky
similarity index 100%
rename from src/test/skylark/testdata/string_misc.sky
rename to src/test/starlark/testdata/string_misc.sky
diff --git a/src/test/skylark/testdata/string_partition.sky b/src/test/starlark/testdata/string_partition.sky
similarity index 100%
rename from src/test/skylark/testdata/string_partition.sky
rename to src/test/starlark/testdata/string_partition.sky
diff --git a/src/test/skylark/testdata/string_slice_index.sky b/src/test/starlark/testdata/string_slice_index.sky
similarity index 100%
rename from src/test/skylark/testdata/string_slice_index.sky
rename to src/test/starlark/testdata/string_slice_index.sky
diff --git a/src/test/skylark/testdata/string_split.sky b/src/test/starlark/testdata/string_split.sky
similarity index 100%
rename from src/test/skylark/testdata/string_split.sky
rename to src/test/starlark/testdata/string_split.sky
diff --git a/src/test/skylark/testdata/string_splitlines.sky b/src/test/starlark/testdata/string_splitlines.sky
similarity index 100%
rename from src/test/skylark/testdata/string_splitlines.sky
rename to src/test/starlark/testdata/string_splitlines.sky
diff --git a/src/test/skylark/testdata/string_test_characters.sky b/src/test/starlark/testdata/string_test_characters.sky
similarity index 100%
rename from src/test/skylark/testdata/string_test_characters.sky
rename to src/test/starlark/testdata/string_test_characters.sky
diff --git a/src/test/skylark/testenv.py b/src/test/starlark/testenv.py
similarity index 78%
rename from src/test/skylark/testenv.py
rename to src/test/starlark/testenv.py
index e18d611..b88be8c 100644
--- a/src/test/skylark/testenv.py
+++ b/src/test/starlark/testenv.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-"""Test constants for src/test/skylark."""
+"""Test constants for src/test/starlark."""
-SKYLARK_BINARY_PATH = "src/main/java/com/google/devtools/skylark/Skylark"
-SKYLARK_TESTDATA_PATH = "src/test/skylark/"
+STARLARK_BINARY_PATH = "src/main/java/com/google/devtools/starlark/Starlark"
+STARLARK_TESTDATA_PATH = "src/test/starlark/"
diff --git a/src/tools/skylark/java/com/google/devtools/skylark/skylint/BUILD b/src/tools/skylark/java/com/google/devtools/skylark/skylint/BUILD
index d50b745..baff9ba 100644
--- a/src/tools/skylark/java/com/google/devtools/skylark/skylint/BUILD
+++ b/src/tools/skylark/java/com/google/devtools/skylark/skylint/BUILD
@@ -5,7 +5,7 @@
name = "Skylint",
srcs = [],
main_class = "com.google.devtools.skylark.skylint.Skylint",
- visibility = ["//src/test/skylark/skylint:__pkg__"],
+ visibility = ["//src/test/starlark/skylint:__pkg__"],
runtime_deps = [
":skylint_lib",
],
