aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java
diff options
context:
space:
mode:
authorGravatar fzaiser <fzaiser@google.com>2017-08-28 17:05:54 +0200
committerGravatar Vladimir Moskva <vladmos@google.com>2017-08-28 17:36:01 +0200
commit37af5d531cdd052e5a0d313e2474c32c1c79b3d3 (patch)
treee1acff56e0952310147ad616269a5ea53f94a9d5 /src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java
parentf4e20e6cb2f8e4333460157b2dd28e9bf1822010 (diff)
Change Identifier#boundNames to #boundIdentifiers.
RELNOTES: None PiperOrigin-RevId: 166704851
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java
index 3e35a9de33..e2d2a486cc 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkylarkImportLookupFunction.java
@@ -39,6 +39,7 @@ import com.google.devtools.build.lib.syntax.AssignmentStatement;
import com.google.devtools.build.lib.syntax.BuildFileAST;
import com.google.devtools.build.lib.syntax.Environment.Extension;
import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.syntax.Identifier;
import com.google.devtools.build.lib.syntax.LoadStatement;
import com.google.devtools.build.lib.syntax.Mutability;
import com.google.devtools.build.lib.syntax.SkylarkImport;
@@ -417,14 +418,14 @@ public class SkylarkImportLookupFunction implements SkyFunction {
return;
}
AssignmentStatement assignmentStatement = (AssignmentStatement) statement;
- ImmutableSet<String> boundNames = assignmentStatement.getLValue().boundNames();
- for (String name : boundNames) {
- Object lookup = extensionEnv.lookup(name);
+ ImmutableSet<Identifier> boundIdentifiers = assignmentStatement.getLValue().boundIdentifiers();
+ for (Identifier ident : boundIdentifiers) {
+ Object lookup = extensionEnv.lookup(ident.getName());
if (lookup instanceof SkylarkExportable) {
try {
SkylarkExportable exportable = (SkylarkExportable) lookup;
if (!exportable.isExported()) {
- exportable.export(extensionLabel, name);
+ exportable.export(extensionLabel, ident.getName());
}
} catch (EvalException e) {
eventHandler.handle(Event.error(e.getLocation(), e.getMessage()));