java.starlark.net: rename com.google.devtools.starlark This change renames the Java packages of the Starlark interpreter and REPL command. The Bazel team owns the domain starlark.net, and the Go implementation lives at go.starlark.net; the Java packages should use java.starlark.net. There are no immediate plans to publish the interpreter as a public API or to run a web server at that domain, but it will save pain later if we rename the classes only once. Now that the Starlark interpreter's production code no longer depends on any Bazel packages (except serialization, which cannot be broken until we implement byte compilation), we will soon make the following moves: lib.syntax (frontend) -> net.starlark.java.syntax lib.syntax (evaluator) -> net.starlark.java.eval lib.skylarkinterface -> net.starlark.java.annot PiperOrigin-RevId: 312126212
diff --git a/src/BUILD b/src/BUILD index 85f695e..0d46818 100644 --- a/src/BUILD +++ b/src/BUILD
@@ -442,8 +442,8 @@ "//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/starlark/cmd:srcs", - "//src/main/java/com/google/devtools/starlark/spelling:srcs", + "//src/main/java/net/starlark/java/cmd:srcs", + "//src/main/java/net/starlark/java/spelling:srcs", "//src/main/native:srcs", "//src/main/protobuf:srcs", "//src/main/tools:srcs", @@ -459,7 +459,7 @@ "//src/test/java/com/google/devtools/build/skydoc:srcs", "//src/test/java/com/google/devtools/build/skyframe:srcs", "//src/test/java/com/google/devtools/common/options:srcs", - "//src/test/java/com/google/devtools/starlark/spelling:srcs", + "//src/test/java/net/starlark/java/spelling:srcs", "//src/test/py/bazel:srcs", "//src/test/shell:srcs", "//src/test/testdata/test_tls_certificate",
diff --git a/src/main/java/com/google/devtools/build/lib/packages/BUILD b/src/main/java/com/google/devtools/build/lib/packages/BUILD index 3bc808a..7c573c0 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BUILD +++ b/src/main/java/com/google/devtools/build/lib/packages/BUILD
@@ -62,7 +62,7 @@ "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment", "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/main/java/com/google/devtools/common/options", - "//src/main/java/com/google/devtools/starlark/spelling", + "//src/main/java/net/starlark/java/spelling", "//src/main/protobuf:build_java_proto", "//third_party:auto_value", "//third_party:flogger",
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Package.java b/src/main/java/com/google/devtools/build/lib/packages/Package.java index 272e254..c52beb8 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Package.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Package.java
@@ -50,7 +50,6 @@ import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.Root; import com.google.devtools.build.lib.vfs.RootedPath; -import com.google.devtools.starlark.spelling.SpellChecker; import com.google.protobuf.CodedInputStream; import com.google.protobuf.CodedOutputStream; import java.io.IOException; @@ -66,6 +65,7 @@ import java.util.Set; import java.util.TreeMap; import javax.annotation.Nullable; +import net.starlark.java.spelling.SpellChecker; /** * A package, which is a container of {@link Rule}s, each of which contains a dictionary of named
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BUILD b/src/main/java/com/google/devtools/build/lib/syntax/BUILD index 50f9d88..218c184 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/BUILD +++ b/src/main/java/com/google/devtools/build/lib/syntax/BUILD
@@ -71,7 +71,7 @@ ], deps = [ "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", - "//src/main/java/com/google/devtools/starlark/spelling", + "//src/main/java/net/starlark/java/spelling", "//third_party:auto_value", "//third_party:guava", "//third_party:jsr305", @@ -125,7 +125,7 @@ ":frontend", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/skylarkinterface", - "//src/main/java/com/google/devtools/starlark/spelling", + "//src/main/java/net/starlark/java/spelling", "//third_party:auto_value", "//third_party:guava", "//third_party:jsr305",
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BuiltinCallable.java b/src/main/java/com/google/devtools/build/lib/syntax/BuiltinCallable.java index 0792583..e563bb8 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/BuiltinCallable.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/BuiltinCallable.java
@@ -17,12 +17,12 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.skylarkinterface.StarlarkMethod; -import com.google.devtools.starlark.spelling.SpellChecker; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.List; import javax.annotation.Nullable; +import net.starlark.java.spelling.SpellChecker; /** * A BuiltinCallable is a callable Starlark value that reflectively invokes a
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Eval.java b/src/main/java/com/google/devtools/build/lib/syntax/Eval.java index 7cbcd62..ac1d809 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/Eval.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/Eval.java
@@ -16,12 +16,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.google.devtools.starlark.spelling.SpellChecker; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; +import net.starlark.java.spelling.SpellChecker; /** A syntax-tree-walking evaluator for StarlarkFunction bodies. */ final class Eval {
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java index 0e832d3..0384e43 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
@@ -16,8 +16,8 @@ import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Ordering; -import com.google.devtools.starlark.spelling.SpellChecker; import java.util.IllegalFormatException; +import net.starlark.java.spelling.SpellChecker; /** Utilities used by the evaluator. */ // TODO(adonovan): move all fundamental values and operators of the language to Starlark
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Resolver.java b/src/main/java/com/google/devtools/build/lib/syntax/Resolver.java index 7a64948..0b40fd6 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/Resolver.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/Resolver.java
@@ -16,7 +16,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -import com.google.devtools.starlark.spelling.SpellChecker; import com.google.errorprone.annotations.FormatMethod; import java.util.ArrayList; import java.util.HashMap; @@ -25,6 +24,7 @@ import java.util.Map; import java.util.Set; import javax.annotation.Nullable; +import net.starlark.java.spelling.SpellChecker; /** * The Resolver resolves each identifier in a syntax tree to its binding, and performs other
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkFunction.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkFunction.java index 1c6822b..b0bafb2 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkFunction.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkFunction.java
@@ -15,11 +15,11 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; -import com.google.devtools.starlark.spelling.SpellChecker; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import javax.annotation.Nullable; +import net.starlark.java.spelling.SpellChecker; /** A StarlarkFunction is a function value created by a Starlark {@code def} statement. */ public final class StarlarkFunction implements StarlarkCallable {
diff --git a/src/main/java/com/google/devtools/starlark/cmd/BUILD b/src/main/java/net/starlark/java/cmd/BUILD similarity index 92% rename from src/main/java/com/google/devtools/starlark/cmd/BUILD rename to src/main/java/net/starlark/java/cmd/BUILD index 5e28606..0247321 100644 --- a/src/main/java/com/google/devtools/starlark/cmd/BUILD +++ b/src/main/java/net/starlark/java/cmd/BUILD
@@ -17,7 +17,6 @@ # ... but only on JDK >= 9 "-XX:+IgnoreUnrecognizedVMOptions", ], - main_class = "com.google.devtools.starlark.cmd.Starlark", visibility = ["//visibility:public"], deps = ["//src/main/java/com/google/devtools/build/lib:syntax"], )
diff --git a/src/main/java/com/google/devtools/starlark/cmd/Starlark.java b/src/main/java/net/starlark/java/cmd/Starlark.java similarity index 98% rename from src/main/java/com/google/devtools/starlark/cmd/Starlark.java rename to src/main/java/net/starlark/java/cmd/Starlark.java index f2fda5b..42b9e25 100644 --- a/src/main/java/com/google/devtools/starlark/cmd/Starlark.java +++ b/src/main/java/net/starlark/java/cmd/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.starlark.cmd; +package net.starlark.java.cmd; import com.google.devtools.build.lib.syntax.EvalException; import com.google.devtools.build.lib.syntax.EvalUtils; @@ -88,6 +88,7 @@ /** Provide a REPL evaluating Starlark code. */ @SuppressWarnings("CatchAndPrintStackTrace") private void readEvalPrintLoop() { + System.err.println("Welcome to Starlark (java.starlark.net)"); String line; // TODO(adonovan): parse a compound statement, like the Python and
diff --git a/src/main/java/com/google/devtools/starlark/spelling/BUILD b/src/main/java/net/starlark/java/spelling/BUILD similarity index 100% rename from src/main/java/com/google/devtools/starlark/spelling/BUILD rename to src/main/java/net/starlark/java/spelling/BUILD
diff --git a/src/main/java/com/google/devtools/starlark/spelling/SpellChecker.java b/src/main/java/net/starlark/java/spelling/SpellChecker.java similarity index 98% rename from src/main/java/com/google/devtools/starlark/spelling/SpellChecker.java rename to src/main/java/net/starlark/java/spelling/SpellChecker.java index b561592..9805b9e 100644 --- a/src/main/java/com/google/devtools/starlark/spelling/SpellChecker.java +++ b/src/main/java/net/starlark/java/spelling/SpellChecker.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.starlark.spelling; +package net.starlark.java.spelling; import javax.annotation.Nullable;
diff --git a/src/test/java/com/google/devtools/starlark/spelling/BUILD b/src/test/java/net/starlark/java/spelling/BUILD similarity index 87% rename from src/test/java/com/google/devtools/starlark/spelling/BUILD rename to src/test/java/net/starlark/java/spelling/BUILD index d3793f7..601cde2 100644 --- a/src/test/java/com/google/devtools/starlark/spelling/BUILD +++ b/src/test/java/net/starlark/java/spelling/BUILD
@@ -16,7 +16,7 @@ name = "SpellCheckerTest", srcs = ["SpellCheckerTest.java"], deps = [ - "//src/main/java/com/google/devtools/starlark/spelling", + "//src/main/java/net/starlark/java/spelling", "//third_party:guava", "//third_party:junit4", "//third_party:truth",
diff --git a/src/test/java/com/google/devtools/starlark/spelling/SpellCheckerTest.java b/src/test/java/net/starlark/java/spelling/SpellCheckerTest.java similarity index 98% rename from src/test/java/com/google/devtools/starlark/spelling/SpellCheckerTest.java rename to src/test/java/net/starlark/java/spelling/SpellCheckerTest.java index 1c837ff..32275e1 100644 --- a/src/test/java/com/google/devtools/starlark/spelling/SpellCheckerTest.java +++ b/src/test/java/net/starlark/java/spelling/SpellCheckerTest.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.starlark.spelling; +package net.starlark.java.spelling; import static com.google.common.truth.Truth.assertThat;
diff --git a/src/test/starlark/BUILD b/src/test/starlark/BUILD index e5654a0..98b0dda 100644 --- a/src/test/starlark/BUILD +++ b/src/test/starlark/BUILD
@@ -22,7 +22,7 @@ ], args = [test_file], data = [ - "//src/main/java/com/google/devtools/starlark/cmd:Starlark", + "//src/main/java/net/starlark/java/cmd:Starlark", test_file, ], main = "starlark_test.py",
diff --git a/src/test/starlark/testenv.py b/src/test/starlark/testenv.py index 68e49d1..defff7e 100644 --- a/src/test/starlark/testenv.py +++ b/src/test/starlark/testenv.py
@@ -13,5 +13,5 @@ # limitations under the License. """Test constants for src/test/starlark.""" -STARLARK_BINARY_PATH = "src/main/java/com/google/devtools/starlark/cmd/Starlark" +STARLARK_BINARY_PATH = "src/main/java/net/starlark/java/cmd/Starlark" STARLARK_TESTDATA_PATH = "src/test/starlark/"