diff options
| author |  brandjon <brandjon@google.com> | 2018-05-01 10:54:58 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-01 10:57:43 -0700 |
| commit | b80eb18e66adcdcbfbc1ec62cd1a67db1924504d (patch) | |
| tree | 66080c778b7b095d3d159ba84855b315be96f4b9 /src/tools | |
| parent | 1de17c2644f8e0f4da0fbc6569db083a8acc56e7 (diff) | |
Move BazelLibrary from syntax/ to packages/
This helps the Skylark interpreter to not depend on Bazel concepts, though it adds a temporary dependency of Skylint on packages/. The fix for that will be to create a Build API interface for BazelLibrary (e.g., "BazelLibraryAPI").
Refactored some GlobalFrame construction logic to be more uniform. Instead of constructing a whole Environment just to get a frame, we build the frame directly, using ImmutableMap.Builder to accumulate bindings. This convention may further change once we convert MethodLibrary and the like to @SkylarkGlobalLibrary, but for now it's more readable.
RELNOTES: None
PiperOrigin-RevId: 194960824
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/skylark/java/com/google/devtools/skylark/skylint/BUILD | 2 | ||||
| -rw-r--r-- | src/tools/skylark/java/com/google/devtools/skylark/skylint/Environment.java | 2 |
2 files changed, 3 insertions, 1 deletions
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 89841a913d..9bbd103847 100644 --- a/src/tools/skylark/java/com/google/devtools/skylark/skylint/BUILD +++ b/src/tools/skylark/java/com/google/devtools/skylark/skylint/BUILD @@ -16,6 +16,8 @@ java_library( srcs = glob(["**/*.java"]), visibility = ["//src/tools/skylark/javatests/com/google/devtools/skylark/skylint:__pkg__"], deps = [ + # TODO(bazel-team): Once BazelLibrary has a Build API interface, depend + # on lib:skylarkbuildapi instead of on lib:packages. "//src/main/java/com/google/devtools/build/lib:packages", "//src/main/java/com/google/devtools/build/lib:skylarkinterface", "//third_party:guava", diff --git a/src/tools/skylark/java/com/google/devtools/skylark/skylint/Environment.java b/src/tools/skylark/java/com/google/devtools/skylark/skylint/Environment.java index 46e74d96ce..68d18e9497 100644 --- a/src/tools/skylark/java/com/google/devtools/skylark/skylint/Environment.java +++ b/src/tools/skylark/java/com/google/devtools/skylark/skylint/Environment.java @@ -14,9 +14,9 @@ package com.google.devtools.skylark.skylint; +import com.google.devtools.build.lib.packages.BazelLibrary; import com.google.devtools.build.lib.skylarkinterface.SkylarkSignature; import com.google.devtools.build.lib.syntax.ASTNode; -import com.google.devtools.build.lib.syntax.BazelLibrary; import com.google.devtools.build.lib.syntax.Comment; import com.google.devtools.build.lib.syntax.Identifier; import com.google.devtools.build.lib.syntax.MethodLibrary; |