bazel: rename imports of lib.syntax to java.starlark.net This change was produced mechanically by running the script added in CL 322652849. PiperOrigin-RevId: 331611185
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java index 9c405bf..1458585 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
@@ -40,10 +40,6 @@ import com.google.devtools.build.lib.packages.Type.LabelClass; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; -import com.google.devtools.build.lib.syntax.ClassObject; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkValue; import com.google.devtools.build.lib.util.FileType; import com.google.devtools.build.lib.util.FileTypeSet; import com.google.devtools.build.lib.util.StringUtil; @@ -60,6 +56,10 @@ import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; +import net.starlark.java.eval.ClassObject; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkValue; /** * Metadata of a rule attribute. Contains the attribute name and type, and an default value to be
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AttributeValueSource.java b/src/main/java/com/google/devtools/build/lib/packages/AttributeValueSource.java index 7effc45..7e013b7 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/AttributeValueSource.java +++ b/src/main/java/com/google/devtools/build/lib/packages/AttributeValueSource.java
@@ -13,8 +13,8 @@ // limitations under the License. package com.google.devtools.build.lib.packages; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Starlark; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Starlark; /** * An enum that represents different types of rule attributes, based on where their values come
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 74d8a82..3aa84a2 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BUILD +++ b/src/main/java/com/google/devtools/build/lib/packages/BUILD
@@ -41,8 +41,6 @@ "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi", "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", - "//src/main/java/com/google/devtools/build/lib/syntax:evaluator", - "//src/main/java/com/google/devtools/build/lib/syntax:frontend", "//src/main/java/com/google/devtools/build/lib/util", "//src/main/java/com/google/devtools/build/lib/util:detailed_exit_code", "//src/main/java/com/google/devtools/build/lib/util:exit_code", @@ -53,7 +51,9 @@ "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects", "//src/main/java/com/google/devtools/common/options", "//src/main/java/net/starlark/java/annot", + "//src/main/java/net/starlark/java/eval", "//src/main/java/net/starlark/java/spelling", + "//src/main/java/net/starlark/java/syntax", "//src/main/protobuf:build_java_proto", "//src/main/protobuf:failure_details_java_proto", "//third_party:auto_value",
diff --git a/src/main/java/com/google/devtools/build/lib/packages/BazelModuleContext.java b/src/main/java/com/google/devtools/build/lib/packages/BazelModuleContext.java index 5f1e36f..f3f81d2 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BazelModuleContext.java +++ b/src/main/java/com/google/devtools/build/lib/packages/BazelModuleContext.java
@@ -17,15 +17,15 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.syntax.Module; +import net.starlark.java.eval.Module; /** * BazelModuleContext records Bazel-specific information associated with a .bzl {@link - * com.google.devtools.build.lib.syntax.Module}. + * net.starlark.java.eval.Module}. */ @AutoValue public abstract class BazelModuleContext { - /** Label associated with the Starlark {@link com.google.devtools.build.lib.syntax.Module}. */ + /** Label associated with the Starlark {@link net.starlark.java.eval.Module}. */ public abstract Label label(); /** Returns the name of the module's .bzl file, as provided to the parser. */ @@ -38,19 +38,19 @@ public abstract ImmutableMap<String, Module> loads(); /** - * Transitive digest of the .bzl file of the {@link com.google.devtools.build.lib.syntax.Module} - * itself and all files it transitively loads. + * Transitive digest of the .bzl file of the {@link net.starlark.java.eval.Module} itself and all + * files it transitively loads. */ @SuppressWarnings({"AutoValueImmutableFields", "mutable"}) @AutoValue.CopyAnnotations public abstract byte[] bzlTransitiveDigest(); /** - * Returns a label for a {@link com.google.devtools.build.lib.syntax.Module}. + * Returns a label for a {@link net.starlark.java.eval.Module}. * * <p>This is a user-facing value and we rely on this string to be a valid label for the {@link - * com.google.devtools.build.lib.syntax.Module} (and that only). Please see the documentation of - * {@link com.google.devtools.build.lib.syntax.Module#setClientData(Object)} for more details. + * net.starlark.java.eval.Module} (and that only). Please see the documentation of {@link + * net.starlark.java.eval.Module#setClientData(Object)} for more details. */ @Override public final String toString() {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/BazelStarlarkContext.java b/src/main/java/com/google/devtools/build/lib/packages/BazelStarlarkContext.java index 24a7b3b..813837f 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BazelStarlarkContext.java +++ b/src/main/java/com/google/devtools/build/lib/packages/BazelStarlarkContext.java
@@ -19,10 +19,10 @@ import com.google.devtools.build.lib.analysis.RuleDefinitionContext; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.RepositoryName; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkThread; import javax.annotation.Nullable; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkThread; /** Contextual information associated with each Starlark thread created by Bazel. */ // TODO(adonovan): rename BazelThreadContext, for symmetry with BazelModuleContext.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/BuildSetting.java b/src/main/java/com/google/devtools/build/lib/packages/BuildSetting.java index d8cddf0..ac5f493 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BuildSetting.java +++ b/src/main/java/com/google/devtools/build/lib/packages/BuildSetting.java
@@ -15,7 +15,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.devtools.build.lib.starlarkbuildapi.StarlarkConfigApi.BuildSettingApi; -import com.google.devtools.build.lib.syntax.Printer; +import net.starlark.java.eval.Printer; /** * Metadata of a build setting rule's properties. This describes the build setting's type (for
diff --git a/src/main/java/com/google/devtools/build/lib/packages/BuildType.java b/src/main/java/com/google/devtools/build/lib/packages/BuildType.java index 8b495f4..bdf25b7 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BuildType.java +++ b/src/main/java/com/google/devtools/build/lib/packages/BuildType.java
@@ -29,10 +29,6 @@ import com.google.devtools.build.lib.packages.Type.LabelClass; import com.google.devtools.build.lib.packages.Type.ListType; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Printer; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkValue; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; @@ -40,6 +36,10 @@ import java.util.Map; import java.util.Set; import javax.annotation.Nullable; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Printer; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkValue; /** * Collection of data types that are specific to building things, i.e. not inherent to Starlark.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/BuiltinProvider.java b/src/main/java/com/google/devtools/build/lib/packages/BuiltinProvider.java index 496701b..0ff81ee 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BuiltinProvider.java +++ b/src/main/java/com/google/devtools/build/lib/packages/BuiltinProvider.java
@@ -15,11 +15,11 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.packages.NativeProvider.NativeKey; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Location; -import com.google.devtools.build.lib.syntax.Printer; -import com.google.devtools.build.lib.syntax.Starlark; import javax.annotation.Nullable; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Printer; +import net.starlark.java.eval.Starlark; +import net.starlark.java.syntax.Location; /** * Base class for declared providers {@see Provider} defined in native code.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/CallStack.java b/src/main/java/com/google/devtools/build/lib/packages/CallStack.java index 65a1880..a08b017 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/CallStack.java +++ b/src/main/java/com/google/devtools/build/lib/packages/CallStack.java
@@ -15,14 +15,14 @@ package com.google.devtools.build.lib.packages; import com.google.common.collect.ImmutableList; -import com.google.devtools.build.lib.syntax.Location; -import com.google.devtools.build.lib.syntax.StarlarkThread; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import javax.annotation.Nullable; +import net.starlark.java.eval.StarlarkThread; +import net.starlark.java.syntax.Location; /** * A CallStack is an opaque immutable stack of Starlark call frames, outermost call first. Its
diff --git a/src/main/java/com/google/devtools/build/lib/packages/ConfiguredAttributeMapper.java b/src/main/java/com/google/devtools/build/lib/packages/ConfiguredAttributeMapper.java index a4de20e..f56753e 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/ConfiguredAttributeMapper.java +++ b/src/main/java/com/google/devtools/build/lib/packages/ConfiguredAttributeMapper.java
@@ -23,7 +23,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.BuildType.Selector; import com.google.devtools.build.lib.packages.BuildType.SelectorList; -import com.google.devtools.build.lib.syntax.EvalException; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; @@ -32,6 +31,7 @@ import java.util.Map; import java.util.Set; import javax.annotation.Nullable; +import net.starlark.java.eval.EvalException; /** * {@link AttributeMap} implementation that binds a rule's attribute as follows:
diff --git a/src/main/java/com/google/devtools/build/lib/packages/ConstantRuleVisibility.java b/src/main/java/com/google/devtools/build/lib/packages/ConstantRuleVisibility.java index 935d48d..5c041c3 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/ConstantRuleVisibility.java +++ b/src/main/java/com/google/devtools/build/lib/packages/ConstantRuleVisibility.java
@@ -20,11 +20,11 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Starlark; import java.io.Serializable; import java.util.Collections; import java.util.List; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Starlark; /** * A rule visibility that simply says yes or no. It corresponds to public,
diff --git a/src/main/java/com/google/devtools/build/lib/packages/DefaultPackageArguments.java b/src/main/java/com/google/devtools/build/lib/packages/DefaultPackageArguments.java index ffca6d7..4ec2aef 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/DefaultPackageArguments.java +++ b/src/main/java/com/google/devtools/build/lib/packages/DefaultPackageArguments.java
@@ -17,10 +17,10 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.License.DistributionType; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Location; import java.util.List; import java.util.Set; +import net.starlark.java.eval.EvalException; +import net.starlark.java.syntax.Location; /** Encapsulates the core, default set of {@link PackageArgument}s. */ final class DefaultPackageArguments {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/EnvironmentGroup.java b/src/main/java/com/google/devtools/build/lib/packages/EnvironmentGroup.java index 587d626..1f1c850 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/EnvironmentGroup.java +++ b/src/main/java/com/google/devtools/build/lib/packages/EnvironmentGroup.java
@@ -26,13 +26,13 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.server.FailureDetails.PackageLoading.Code; -import com.google.devtools.build.lib.syntax.Location; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; +import net.starlark.java.syntax.Location; /** * Model for the "environment_group' rule: the piece of Bazel's rule constraint system that binds
diff --git a/src/main/java/com/google/devtools/build/lib/packages/FilesetEntry.java b/src/main/java/com/google/devtools/build/lib/packages/FilesetEntry.java index 87e7228..cc625fa 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/FilesetEntry.java +++ b/src/main/java/com/google/devtools/build/lib/packages/FilesetEntry.java
@@ -23,8 +23,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; import com.google.devtools.build.lib.starlarkbuildapi.FilesetEntryApi; -import com.google.devtools.build.lib.syntax.Printer; -import com.google.devtools.build.lib.syntax.StarlarkValue; import com.google.devtools.build.lib.vfs.PathFragment; import java.util.Collection; import java.util.Collections; @@ -33,6 +31,8 @@ import java.util.Locale; import java.util.Set; import javax.annotation.Nullable; +import net.starlark.java.eval.Printer; +import net.starlark.java.eval.StarlarkValue; /** * FilesetEntry is a value object used to represent a "FilesetEntry" inside a "Fileset" BUILD rule.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/ImplicitOutputsFunction.java b/src/main/java/com/google/devtools/build/lib/packages/ImplicitOutputsFunction.java index ace5f64..5fa594a 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/ImplicitOutputsFunction.java +++ b/src/main/java/com/google/devtools/build/lib/packages/ImplicitOutputsFunction.java
@@ -29,10 +29,6 @@ import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; -import com.google.devtools.build.lib.syntax.ClassObject; -import com.google.devtools.build.lib.syntax.Dict; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Starlark; import com.google.devtools.build.lib.util.StringUtil; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.PathFragment; @@ -44,6 +40,10 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.starlark.java.eval.ClassObject; +import net.starlark.java.eval.Dict; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Starlark; /** * A function interface allowing rules to specify their set of implicit outputs in a more dynamic
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Info.java b/src/main/java/com/google/devtools/build/lib/packages/Info.java index 99c273d..2d013b2 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Info.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Info.java
@@ -13,9 +13,9 @@ // limitations under the License. package com.google.devtools.build.lib.packages; -import com.google.devtools.build.lib.syntax.Location; -import com.google.devtools.build.lib.syntax.Printer; -import com.google.devtools.build.lib.syntax.StarlarkValue; +import net.starlark.java.eval.Printer; +import net.starlark.java.eval.StarlarkValue; +import net.starlark.java.syntax.Location; /** * An Info is a unit of information produced by analysis of one configured target and consumed by
diff --git a/src/main/java/com/google/devtools/build/lib/packages/InputFile.java b/src/main/java/com/google/devtools/build/lib/packages/InputFile.java index 64f1577..40de222 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/InputFile.java +++ b/src/main/java/com/google/devtools/build/lib/packages/InputFile.java
@@ -18,9 +18,9 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe; -import com.google.devtools.build.lib.syntax.Location; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; +import net.starlark.java.syntax.Location; /** * A file that is an input to the build system.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/InternalModule.java b/src/main/java/com/google/devtools/build/lib/packages/InternalModule.java index 817f5bb..10bed35 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/InternalModule.java +++ b/src/main/java/com/google/devtools/build/lib/packages/InternalModule.java
@@ -14,10 +14,10 @@ package com.google.devtools.build.lib.packages; -import com.google.devtools.build.lib.syntax.Printer; -import com.google.devtools.build.lib.syntax.StarlarkValue; import net.starlark.java.annot.StarlarkBuiltin; import net.starlark.java.annot.StarlarkDocumentationCategory; +import net.starlark.java.eval.Printer; +import net.starlark.java.eval.StarlarkValue; // TODO(#11437): Factor an API out into skylarkbuildapi, for stardoc's benefit. Otherwise, stardoc // can't run on @builtins bzls.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/License.java b/src/main/java/com/google/devtools/build/lib/packages/License.java index bf70b93..8bbfa39 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/License.java +++ b/src/main/java/com/google/devtools/build/lib/packages/License.java
@@ -24,13 +24,13 @@ import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; import com.google.devtools.build.lib.starlarkbuildapi.LicenseApi; -import com.google.devtools.build.lib.syntax.Printer; import java.util.Collection; import java.util.Collections; import java.util.EnumSet; import java.util.List; import java.util.Locale; import java.util.Set; +import net.starlark.java.eval.Printer; /** Support for license and distribution checking. */ @Immutable
diff --git a/src/main/java/com/google/devtools/build/lib/packages/NativeInfo.java b/src/main/java/com/google/devtools/build/lib/packages/NativeInfo.java index 9592565..1c1eda1 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/NativeInfo.java +++ b/src/main/java/com/google/devtools/build/lib/packages/NativeInfo.java
@@ -15,10 +15,10 @@ import com.google.common.collect.ImmutableCollection; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Location; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkSemantics; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkSemantics; +import net.starlark.java.syntax.Location; /** * Abstract base class for implementations of {@link StructImpl} that expose
diff --git a/src/main/java/com/google/devtools/build/lib/packages/NativeProvider.java b/src/main/java/com/google/devtools/build/lib/packages/NativeProvider.java index 9dac3cf..ed8ebfe 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/NativeProvider.java +++ b/src/main/java/com/google/devtools/build/lib/packages/NativeProvider.java
@@ -16,10 +16,10 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; -import com.google.devtools.build.lib.syntax.Location; -import com.google.devtools.build.lib.syntax.StarlarkValue; import com.google.devtools.build.lib.util.Pair; import javax.annotation.Nullable; +import net.starlark.java.eval.StarlarkValue; +import net.starlark.java.syntax.Location; /** * Base class for declared providers {@see Provider} defined in native code.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/OutputFile.java b/src/main/java/com/google/devtools/build/lib/packages/OutputFile.java index 490db8a..3b6c138 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/OutputFile.java +++ b/src/main/java/com/google/devtools/build/lib/packages/OutputFile.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.packages; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.syntax.Location; +import net.starlark.java.syntax.Location; /** * A generated file that is the output of a rule.
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 20c8635..68dd22a 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
@@ -49,10 +49,6 @@ import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.SerializationContext; import com.google.devtools.build.lib.skyframe.serialization.SerializationException; -import com.google.devtools.build.lib.syntax.Location; -import com.google.devtools.build.lib.syntax.Module; -import com.google.devtools.build.lib.syntax.StarlarkSemantics; -import com.google.devtools.build.lib.syntax.StarlarkThread; import com.google.devtools.build.lib.util.DetailedExitCode; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; @@ -73,7 +69,11 @@ import java.util.Set; import java.util.TreeMap; import javax.annotation.Nullable; +import net.starlark.java.eval.Module; +import net.starlark.java.eval.StarlarkSemantics; +import net.starlark.java.eval.StarlarkThread; import net.starlark.java.spelling.SpellChecker; +import net.starlark.java.syntax.Location; /** * 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/packages/PackageArgument.java b/src/main/java/com/google/devtools/build/lib/packages/PackageArgument.java index 20f9646..a7aca37 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/PackageArgument.java +++ b/src/main/java/com/google/devtools/build/lib/packages/PackageArgument.java
@@ -14,8 +14,8 @@ package com.google.devtools.build.lib.packages; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Location; +import net.starlark.java.eval.EvalException; +import net.starlark.java.syntax.Location; /** Defines an argument to the {@code package()} function. */ public abstract class PackageArgument<T> {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java index 02825ae..137e1b5 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java +++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -43,35 +43,6 @@ import com.google.devtools.build.lib.server.FailureDetails.FailureDetail; import com.google.devtools.build.lib.server.FailureDetails.PackageLoading; import com.google.devtools.build.lib.server.FailureDetails.PackageLoading.Code; -import com.google.devtools.build.lib.syntax.Argument; -import com.google.devtools.build.lib.syntax.CallExpression; -import com.google.devtools.build.lib.syntax.DefStatement; -import com.google.devtools.build.lib.syntax.Dict; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Expression; -import com.google.devtools.build.lib.syntax.FileOptions; -import com.google.devtools.build.lib.syntax.ForStatement; -import com.google.devtools.build.lib.syntax.Identifier; -import com.google.devtools.build.lib.syntax.IfStatement; -import com.google.devtools.build.lib.syntax.IntegerLiteral; -import com.google.devtools.build.lib.syntax.ListExpression; -import com.google.devtools.build.lib.syntax.Location; -import com.google.devtools.build.lib.syntax.Module; -import com.google.devtools.build.lib.syntax.Mutability; -import com.google.devtools.build.lib.syntax.NodeVisitor; -import com.google.devtools.build.lib.syntax.NoneType; -import com.google.devtools.build.lib.syntax.ParserInput; -import com.google.devtools.build.lib.syntax.Printer; -import com.google.devtools.build.lib.syntax.Program; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkCallable; -import com.google.devtools.build.lib.syntax.StarlarkFile; -import com.google.devtools.build.lib.syntax.StarlarkFunction; -import com.google.devtools.build.lib.syntax.StarlarkSemantics; -import com.google.devtools.build.lib.syntax.StarlarkThread; -import com.google.devtools.build.lib.syntax.StringLiteral; -import com.google.devtools.build.lib.syntax.SyntaxError; -import com.google.devtools.build.lib.syntax.Tuple; import com.google.devtools.build.lib.util.DetailedExitCode; import com.google.devtools.build.lib.util.ExitCode; import com.google.devtools.build.lib.vfs.FileSystem; @@ -90,6 +61,35 @@ import java.util.concurrent.ForkJoinPool; import java.util.concurrent.atomic.AtomicReference; import javax.annotation.Nullable; +import net.starlark.java.eval.Dict; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Module; +import net.starlark.java.eval.Mutability; +import net.starlark.java.eval.NoneType; +import net.starlark.java.eval.Printer; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkCallable; +import net.starlark.java.eval.StarlarkFunction; +import net.starlark.java.eval.StarlarkSemantics; +import net.starlark.java.eval.StarlarkThread; +import net.starlark.java.eval.Tuple; +import net.starlark.java.syntax.Argument; +import net.starlark.java.syntax.CallExpression; +import net.starlark.java.syntax.DefStatement; +import net.starlark.java.syntax.Expression; +import net.starlark.java.syntax.FileOptions; +import net.starlark.java.syntax.ForStatement; +import net.starlark.java.syntax.Identifier; +import net.starlark.java.syntax.IfStatement; +import net.starlark.java.syntax.IntegerLiteral; +import net.starlark.java.syntax.ListExpression; +import net.starlark.java.syntax.Location; +import net.starlark.java.syntax.NodeVisitor; +import net.starlark.java.syntax.ParserInput; +import net.starlark.java.syntax.Program; +import net.starlark.java.syntax.StarlarkFile; +import net.starlark.java.syntax.StringLiteral; +import net.starlark.java.syntax.SyntaxError; /** * The package factory is responsible for constructing Package instances from a BUILD file's
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageGroup.java b/src/main/java/com/google/devtools/build/lib/packages/PackageGroup.java index ca1aa12..2b12e33 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/PackageGroup.java +++ b/src/main/java/com/google/devtools/build/lib/packages/PackageGroup.java
@@ -22,11 +22,11 @@ import com.google.devtools.build.lib.packages.License.DistributionType; import com.google.devtools.build.lib.packages.PackageSpecification.PackageGroupContents; import com.google.devtools.build.lib.server.FailureDetails.PackageLoading.Code; -import com.google.devtools.build.lib.syntax.Location; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Set; +import net.starlark.java.syntax.Location; /** * This class represents a package group BUILD target. It has a name, a list of {@link
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageLoadingListener.java b/src/main/java/com/google/devtools/build/lib/packages/PackageLoadingListener.java index ce3398d..163743b 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/PackageLoadingListener.java +++ b/src/main/java/com/google/devtools/build/lib/packages/PackageLoadingListener.java
@@ -14,8 +14,8 @@ package com.google.devtools.build.lib.packages; -import com.google.devtools.build.lib.syntax.StarlarkSemantics; import java.util.List; +import net.starlark.java.eval.StarlarkSemantics; /** Listener for package-loading events. */ public interface PackageLoadingListener {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageUtils.java b/src/main/java/com/google/devtools/build/lib/packages/PackageUtils.java index 5d8e06d..58af703 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/PackageUtils.java +++ b/src/main/java/com/google/devtools/build/lib/packages/PackageUtils.java
@@ -15,8 +15,8 @@ package com.google.devtools.build.lib.packages; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.syntax.EvalException; import java.util.List; +import net.starlark.java.eval.EvalException; /** Miscellaneous utils internal to Packages. */ final class PackageUtils {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Provider.java b/src/main/java/com/google/devtools/build/lib/packages/Provider.java index 5c2fb2d..3e623e2 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Provider.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Provider.java
@@ -15,7 +15,7 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.starlarkbuildapi.core.ProviderApi; -import com.google.devtools.build.lib.syntax.Location; +import net.starlark.java.syntax.Location; /** * Declared Provider (a constructor for {@link Info}). @@ -48,7 +48,7 @@ /** * Returns an error message format string for instances to use for their {@link - * com.google.devtools.build.lib.syntax.ClassObject#getErrorMessageForUnknownField(String)}. + * net.starlark.java.eval.ClassObject#getErrorMessageForUnknownField(String)}. * * <p>The format string must contain one {@code '%s'} placeholder for the field name. */
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Rule.java b/src/main/java/com/google/devtools/build/lib/packages/Rule.java index 81d8899..e5095e8 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Rule.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Rule.java
@@ -32,14 +32,14 @@ import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.packages.License.DistributionType; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Location; import com.google.devtools.build.lib.util.BinaryPredicate; import java.util.Collection; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import javax.annotation.Nullable; +import net.starlark.java.eval.EvalException; +import net.starlark.java.syntax.Location; /** * An instance of a build rule in the build language. A rule has a name, a package to which it
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java index cf713a3..e14887d 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java +++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -56,11 +56,6 @@ import com.google.devtools.build.lib.packages.Type.ConversionException; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Location; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkCallable; -import com.google.devtools.build.lib.syntax.StarlarkThread; import com.google.devtools.build.lib.util.FileTypeSet; import com.google.devtools.build.lib.util.StringUtil; import com.google.devtools.build.lib.vfs.PathFragment; @@ -80,6 +75,11 @@ import java.util.regex.Pattern; import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkCallable; +import net.starlark.java.eval.StarlarkThread; +import net.starlark.java.syntax.Location; /** * Instances of RuleClass encapsulate the set of attributes of a given "class" of rule, such as
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClassProvider.java index 7676916..a35a351 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/RuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClassProvider.java
@@ -19,8 +19,8 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.packages.RuleClass.Builder.ThirdPartyLicenseExistencePolicy; -import com.google.devtools.build.lib.syntax.StarlarkThread; import java.util.Map; +import net.starlark.java.eval.StarlarkThread; /** * The collection of the supported build rules. Provides an StarlarkThread for Starlark rule
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleFactory.java b/src/main/java/com/google/devtools/build/lib/packages/RuleFactory.java index e54cc34..b1a402c 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/RuleFactory.java +++ b/src/main/java/com/google/devtools/build/lib/packages/RuleFactory.java
@@ -24,13 +24,13 @@ import com.google.devtools.build.lib.packages.Package.NameConflictException; import com.google.devtools.build.lib.packages.PackageFactory.PackageContext; import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions; -import com.google.devtools.build.lib.syntax.Location; -import com.google.devtools.build.lib.syntax.StarlarkSemantics; -import com.google.devtools.build.lib.syntax.StarlarkThread; -import com.google.devtools.build.lib.syntax.StarlarkThread.CallStackEntry; import java.util.Map; import java.util.Set; import javax.annotation.Nullable; +import net.starlark.java.eval.StarlarkSemantics; +import net.starlark.java.eval.StarlarkThread; +import net.starlark.java.eval.StarlarkThread.CallStackEntry; +import net.starlark.java.syntax.Location; /** * Given a {@link RuleClass} and a set of attribute values, returns a {@link Rule} instance. Also
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SelectorList.java b/src/main/java/com/google/devtools/build/lib/packages/SelectorList.java index 548149c..7a66a7c 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/SelectorList.java +++ b/src/main/java/com/google/devtools/build/lib/packages/SelectorList.java
@@ -18,17 +18,17 @@ import com.google.common.collect.Iterables; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; -import com.google.devtools.build.lib.syntax.Dict; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.HasBinary; -import com.google.devtools.build.lib.syntax.Printer; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkValue; -import com.google.devtools.build.lib.syntax.TokenKind; import java.util.Arrays; import java.util.List; import java.util.Objects; import net.starlark.java.annot.StarlarkBuiltin; +import net.starlark.java.eval.Dict; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.HasBinary; +import net.starlark.java.eval.Printer; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkValue; +import net.starlark.java.syntax.TokenKind; /** * An attribute value consisting of a concatenation of native types and selects, e.g:
diff --git a/src/main/java/com/google/devtools/build/lib/packages/SelectorValue.java b/src/main/java/com/google/devtools/build/lib/packages/SelectorValue.java index 1a484e7..414905f 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/SelectorValue.java +++ b/src/main/java/com/google/devtools/build/lib/packages/SelectorValue.java
@@ -17,14 +17,14 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.HasBinary; -import com.google.devtools.build.lib.syntax.Printer; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkValue; -import com.google.devtools.build.lib.syntax.TokenKind; import java.util.Map; import net.starlark.java.annot.StarlarkBuiltin; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.HasBinary; +import net.starlark.java.eval.Printer; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkValue; +import net.starlark.java.syntax.TokenKind; /** * The value returned by a call to {@code select({...})}, for example:
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkAspect.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkAspect.java index df46dfe..7c65d9b 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkAspect.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkAspect.java
@@ -16,7 +16,7 @@ import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.starlarkbuildapi.StarlarkAspectApi; -import com.google.devtools.build.lib.syntax.EvalException; +import net.starlark.java.eval.EvalException; /** Represents an aspect which can be attached to a Starlark-defined rule attribute. */ public interface StarlarkAspect extends StarlarkAspectApi {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkCallbackHelper.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkCallbackHelper.java index ec84dac..1f3ef02 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkCallbackHelper.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkCallbackHelper.java
@@ -18,13 +18,13 @@ import com.google.devtools.build.lib.events.Event; import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; -import com.google.devtools.build.lib.syntax.ClassObject; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Mutability; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkFunction; -import com.google.devtools.build.lib.syntax.StarlarkSemantics; -import com.google.devtools.build.lib.syntax.StarlarkThread; +import net.starlark.java.eval.ClassObject; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Mutability; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkFunction; +import net.starlark.java.eval.StarlarkSemantics; +import net.starlark.java.eval.StarlarkThread; /** * A helper class for calling Starlark functions from Java, where the argument values are supplied
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkDefinedAspect.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkDefinedAspect.java index ffb9794..6c2efab 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkDefinedAspect.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkDefinedAspect.java
@@ -22,13 +22,13 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec.VisibleForSerialization; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Printer; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkCallable; import java.util.Arrays; import java.util.List; import java.util.Objects; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Printer; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkCallable; /** A Starlark value that is a result of an 'aspect(..)' function call. */ @AutoCodec
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkExportable.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkExportable.java index 58805bc..0898726 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkExportable.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkExportable.java
@@ -15,8 +15,8 @@ package com.google.devtools.build.lib.packages; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.StarlarkValue; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.StarlarkValue; /** * {@link StarlarkValue}s that need special handling when they are exported from an extension file.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkInfo.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkInfo.java index 3f23e2d..d829fe9 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkInfo.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkInfo.java
@@ -19,17 +19,17 @@ import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.collect.nestedset.Depset; -import com.google.devtools.build.lib.syntax.ClassObject; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.HasBinary; -import com.google.devtools.build.lib.syntax.Location; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.TokenKind; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; import javax.annotation.Nullable; +import net.starlark.java.eval.ClassObject; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.HasBinary; +import net.starlark.java.eval.Starlark; +import net.starlark.java.syntax.Location; +import net.starlark.java.syntax.TokenKind; /** An Info (provider instance) for providers defined in Starlark. */ public final class StarlarkInfo extends StructImpl implements HasBinary, ClassObject {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkLibrary.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkLibrary.java index 3fe9883..3a16365 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkLibrary.java
@@ -24,18 +24,18 @@ import com.google.devtools.build.lib.packages.Type.ConversionException; import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions; import com.google.devtools.build.lib.server.FailureDetails.PackageLoading.Code; -import com.google.devtools.build.lib.syntax.Dict; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Location; -import com.google.devtools.build.lib.syntax.NoneType; -import com.google.devtools.build.lib.syntax.Sequence; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkThread; import java.util.List; import java.util.Set; import net.starlark.java.annot.Param; import net.starlark.java.annot.StarlarkGlobalLibrary; import net.starlark.java.annot.StarlarkMethod; +import net.starlark.java.eval.Dict; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.NoneType; +import net.starlark.java.eval.Sequence; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkThread; +import net.starlark.java.syntax.Location; /** * A library of pre-declared Bazel Starlark functions.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeAspect.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeAspect.java index 114382c..6d0fe86 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeAspect.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeAspect.java
@@ -15,7 +15,7 @@ package com.google.devtools.build.lib.packages; import com.google.common.collect.ImmutableSet; -import com.google.devtools.build.lib.syntax.Printer; +import net.starlark.java.eval.Printer; /** A natively-defined aspect that is may be referenced by Starlark attribute definitions. */ public abstract class StarlarkNativeAspect extends NativeAspectClass implements StarlarkAspect {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeModule.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeModule.java index 34caa41..2d44acf 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeModule.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeModule.java
@@ -32,17 +32,6 @@ import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions; import com.google.devtools.build.lib.server.FailureDetails.PackageLoading.Code; import com.google.devtools.build.lib.starlarkbuildapi.StarlarkNativeModuleApi; -import com.google.devtools.build.lib.syntax.Dict; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Location; -import com.google.devtools.build.lib.syntax.Mutability; -import com.google.devtools.build.lib.syntax.NoneType; -import com.google.devtools.build.lib.syntax.Sequence; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkList; -import com.google.devtools.build.lib.syntax.StarlarkThread; -import com.google.devtools.build.lib.syntax.StarlarkValue; -import com.google.devtools.build.lib.syntax.Tuple; import com.google.devtools.build.lib.util.DetailedExitCode; import java.io.IOException; import java.util.ArrayList; @@ -52,6 +41,17 @@ import java.util.Map; import java.util.TreeMap; import javax.annotation.Nullable; +import net.starlark.java.eval.Dict; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Mutability; +import net.starlark.java.eval.NoneType; +import net.starlark.java.eval.Sequence; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkList; +import net.starlark.java.eval.StarlarkThread; +import net.starlark.java.eval.StarlarkValue; +import net.starlark.java.eval.Tuple; +import net.starlark.java.syntax.Location; /** The Starlark native module. */ // TODO(cparsons): Move the definition of native.package() to this class.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkProvider.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkProvider.java index 87d10c8..baadd2a 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkProvider.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkProvider.java
@@ -18,15 +18,15 @@ import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Location; -import com.google.devtools.build.lib.syntax.Printer; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkCallable; -import com.google.devtools.build.lib.syntax.StarlarkThread; import java.util.Collection; import java.util.Objects; import javax.annotation.Nullable; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Printer; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkCallable; +import net.starlark.java.eval.StarlarkThread; +import net.starlark.java.syntax.Location; /** * A provider defined in Starlark rather than in native code.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java b/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java index 4238bec..ec675f8 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StructImpl.java
@@ -17,19 +17,19 @@ import com.google.common.base.Objects; import com.google.common.collect.Ordering; import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; -import com.google.devtools.build.lib.syntax.ClassObject; -import com.google.devtools.build.lib.syntax.Dict; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Location; -import com.google.devtools.build.lib.syntax.Printer; -import com.google.devtools.build.lib.syntax.Sequence; -import com.google.devtools.build.lib.syntax.Starlark; import com.google.protobuf.TextFormat; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; import javax.annotation.Nullable; +import net.starlark.java.eval.ClassObject; +import net.starlark.java.eval.Dict; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Printer; +import net.starlark.java.eval.Sequence; +import net.starlark.java.eval.Starlark; +import net.starlark.java.syntax.Location; /** * An abstract base class for Starlark values that have fields, have to_json and to_proto methods,
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java b/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java index c196b16..2a1fd88 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java
@@ -15,12 +15,12 @@ package com.google.devtools.build.lib.packages; import com.google.devtools.build.lib.starlarkbuildapi.core.StructApi; -import com.google.devtools.build.lib.syntax.Dict; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Location; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkThread; import java.util.Map; +import net.starlark.java.eval.Dict; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkThread; +import net.starlark.java.syntax.Location; /** * The provider for the built-in type {@code struct}.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Target.java b/src/main/java/com/google/devtools/build/lib/packages/Target.java index 3d1b8e7..9dc1fc9 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Target.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Target.java
@@ -16,9 +16,9 @@ import com.google.devtools.build.lib.packages.License.DistributionType; import com.google.devtools.build.lib.starlarkbuildapi.TargetApi; -import com.google.devtools.build.lib.syntax.Location; import java.util.Set; import javax.annotation.Nullable; +import net.starlark.java.syntax.Location; /** * A node in the build dependency graph, identified by a Label.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java b/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java index b45939f..b2ddd09 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java +++ b/src/main/java/com/google/devtools/build/lib/packages/TargetUtils.java
@@ -24,9 +24,6 @@ import com.google.common.collect.Maps; import com.google.devtools.build.lib.actions.ExecutionRequirements; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.syntax.Dict; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Location; import com.google.devtools.build.lib.util.Pair; import java.util.ArrayList; import java.util.Collection; @@ -34,6 +31,9 @@ import java.util.List; import java.util.Map; import javax.annotation.Nullable; +import net.starlark.java.eval.Dict; +import net.starlark.java.eval.EvalException; +import net.starlark.java.syntax.Location; /** * Utility functions over Targets that don't really belong in the base {@link
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Type.java b/src/main/java/com/google/devtools/build/lib/packages/Type.java index 46474c3..0a734ad 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/Type.java +++ b/src/main/java/com/google/devtools/build/lib/packages/Type.java
@@ -23,10 +23,6 @@ import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.collect.nestedset.Depset; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Printer; -import com.google.devtools.build.lib.syntax.Sequence; -import com.google.devtools.build.lib.syntax.Starlark; import com.google.devtools.build.lib.util.LoggingUtil; import com.google.devtools.build.lib.util.StringCanonicalizer; import java.util.ArrayList; @@ -38,6 +34,10 @@ import java.util.Set; import java.util.logging.Level; import javax.annotation.Nullable; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Printer; +import net.starlark.java.eval.Sequence; +import net.starlark.java.eval.Starlark; /** * Root of Type symbol hierarchy for values in the build language.
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java index fcb462f..4890bd2 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java +++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
@@ -25,19 +25,6 @@ import com.google.devtools.build.lib.packages.Package.NameConflictException; import com.google.devtools.build.lib.packages.PackageFactory.EnvironmentExtension; import com.google.devtools.build.lib.server.FailureDetails.PackageLoading.Code; -import com.google.devtools.build.lib.syntax.Dict; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Module; -import com.google.devtools.build.lib.syntax.Mutability; -import com.google.devtools.build.lib.syntax.Printer; -import com.google.devtools.build.lib.syntax.Program; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkCallable; -import com.google.devtools.build.lib.syntax.StarlarkFile; -import com.google.devtools.build.lib.syntax.StarlarkSemantics; -import com.google.devtools.build.lib.syntax.StarlarkThread; -import com.google.devtools.build.lib.syntax.SyntaxError; -import com.google.devtools.build.lib.syntax.Tuple; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.lib.vfs.PathFragment; import java.util.ArrayList; @@ -45,6 +32,19 @@ import java.util.List; import java.util.Map; import javax.annotation.Nullable; +import net.starlark.java.eval.Dict; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Module; +import net.starlark.java.eval.Mutability; +import net.starlark.java.eval.Printer; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkCallable; +import net.starlark.java.eval.StarlarkSemantics; +import net.starlark.java.eval.StarlarkThread; +import net.starlark.java.eval.Tuple; +import net.starlark.java.syntax.Program; +import net.starlark.java.syntax.StarlarkFile; +import net.starlark.java.syntax.SyntaxError; /** Parser for WORKSPACE files. Fills in an ExternalPackage.Builder */ // TODO(adonovan): make a simpler API around a single static function of this form:
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java index 1ffd028..a0eaad8 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java +++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactoryHelper.java
@@ -25,12 +25,12 @@ import com.google.devtools.build.lib.cmdline.RepositoryName; import com.google.devtools.build.lib.events.StoredEventHandler; import com.google.devtools.build.lib.packages.RuleFactory.BuildLangTypedAttributeValuesMap; -import com.google.devtools.build.lib.syntax.Dict; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.StarlarkSemantics; -import com.google.devtools.build.lib.syntax.StarlarkThread; import java.util.Map; import java.util.stream.Collectors; +import net.starlark.java.eval.Dict; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.StarlarkSemantics; +import net.starlark.java.eval.StarlarkThread; /** A helper for the {@link WorkspaceFactory} to create repository rules */ public class WorkspaceFactoryHelper {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFileValue.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFileValue.java index c9b6af9..ebfaa96 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFileValue.java +++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFileValue.java
@@ -22,7 +22,6 @@ import com.google.devtools.build.lib.concurrent.BlazeInterners; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec; -import com.google.devtools.build.lib.syntax.Module; import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.lib.vfs.RootedPath; import com.google.devtools.build.skyframe.SkyFunctionName; @@ -30,6 +29,7 @@ import com.google.devtools.build.skyframe.SkyValue; import java.util.Map; import java.util.Objects; +import net.starlark.java.eval.Module; /** * A SkyValue that contains the result of the parsing of one part of the WORKSPACE file. The parsing
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java index b024078..9321fde 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java +++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java
@@ -14,7 +14,7 @@ package com.google.devtools.build.lib.packages; -import static com.google.devtools.build.lib.syntax.Starlark.NONE; +import static net.starlark.java.eval.Starlark.NONE; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -30,13 +30,6 @@ import com.google.devtools.build.lib.packages.Package.NameConflictException; import com.google.devtools.build.lib.packages.RuleFactory.InvalidRuleException; import com.google.devtools.build.lib.starlarkbuildapi.WorkspaceGlobalsApi; -import com.google.devtools.build.lib.syntax.Dict; -import com.google.devtools.build.lib.syntax.EvalException; -import com.google.devtools.build.lib.syntax.Module; -import com.google.devtools.build.lib.syntax.NoneType; -import com.google.devtools.build.lib.syntax.Sequence; -import com.google.devtools.build.lib.syntax.Starlark; -import com.google.devtools.build.lib.syntax.StarlarkThread; import com.google.devtools.build.lib.vfs.PathFragment; import java.util.List; import java.util.Map; @@ -45,6 +38,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.annotation.Nullable; +import net.starlark.java.eval.Dict; +import net.starlark.java.eval.EvalException; +import net.starlark.java.eval.Module; +import net.starlark.java.eval.NoneType; +import net.starlark.java.eval.Sequence; +import net.starlark.java.eval.Starlark; +import net.starlark.java.eval.StarlarkThread; /** A collection of global Starlark build API functions that apply to WORKSPACE files. */ public class WorkspaceGlobals implements WorkspaceGlobalsApi {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/metrics/BUILD b/src/main/java/com/google/devtools/build/lib/packages/metrics/BUILD index 35df550..07f7069 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/metrics/BUILD +++ b/src/main/java/com/google/devtools/build/lib/packages/metrics/BUILD
@@ -22,9 +22,9 @@ "//src/main/java/com/google/devtools/build/lib/cmdline:cmdline-primitives", "//src/main/java/com/google/devtools/build/lib/collect:extrema", "//src/main/java/com/google/devtools/build/lib/packages", - "//src/main/java/com/google/devtools/build/lib/syntax:evaluator", "//src/main/java/com/google/devtools/build/lib/vfs", "//src/main/java/com/google/devtools/common/options", + "//src/main/java/net/starlark/java/eval", "//third_party:auto_value", "//third_party:flogger", "//third_party:guava",
diff --git a/src/main/java/com/google/devtools/build/lib/packages/metrics/PackageMetricsPackageLoadingListener.java b/src/main/java/com/google/devtools/build/lib/packages/metrics/PackageMetricsPackageLoadingListener.java index 904c780..a43937f 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/metrics/PackageMetricsPackageLoadingListener.java +++ b/src/main/java/com/google/devtools/build/lib/packages/metrics/PackageMetricsPackageLoadingListener.java
@@ -15,9 +15,9 @@ import com.google.devtools.build.lib.packages.Package; import com.google.devtools.build.lib.packages.PackageLoadingListener; -import com.google.devtools.build.lib.syntax.StarlarkSemantics; import com.google.protobuf.util.Durations; import javax.annotation.concurrent.GuardedBy; +import net.starlark.java.eval.StarlarkSemantics; /** Tracks per-invocation extreme package loading events. */ public class PackageMetricsPackageLoadingListener implements PackageLoadingListener {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/semantics/BUILD b/src/main/java/com/google/devtools/build/lib/packages/semantics/BUILD index 16a8d6c..00345cc 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/semantics/BUILD +++ b/src/main/java/com/google/devtools/build/lib/packages/semantics/BUILD
@@ -20,8 +20,8 @@ srcs = ["BuildLanguageOptions.java"], deps = [ "//src/main/java/com/google/devtools/build/lib/concurrent", - "//src/main/java/com/google/devtools/build/lib/syntax:evaluator", "//src/main/java/com/google/devtools/common/options", + "//src/main/java/net/starlark/java/eval", "//third_party:guava", ], )
diff --git a/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java b/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java index 023430e..287aa38 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java +++ b/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java
@@ -18,7 +18,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Interner; import com.google.devtools.build.lib.concurrent.BlazeInterners; -import com.google.devtools.build.lib.syntax.StarlarkSemantics; import com.google.devtools.common.options.Converters.CommaSeparatedOptionListConverter; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; @@ -27,6 +26,7 @@ import com.google.devtools.common.options.OptionsBase; import java.io.Serializable; import java.util.List; +import net.starlark.java.eval.StarlarkSemantics; /** * Options that affect the semantics of Bazel's build language.