Fix wildcard import resolution
On-demand imported types shouldn't hide types in the current package.
MOE_MIGRATED_REVID=137101023
diff --git a/java/com/google/turbine/binder/Binder.java b/java/com/google/turbine/binder/Binder.java
index b574adb..fd064e8 100644
--- a/java/com/google/turbine/binder/Binder.java
+++ b/java/com/google/turbine/binder/Binder.java
@@ -46,6 +46,7 @@
import com.google.turbine.binder.lookup.MemberImportIndex;
import com.google.turbine.binder.lookup.Scope;
import com.google.turbine.binder.lookup.TopLevelIndex;
+import com.google.turbine.binder.lookup.WildImportIndex;
import com.google.turbine.binder.sym.ClassSymbol;
import com.google.turbine.binder.sym.FieldSymbol;
import com.google.turbine.model.Const;
@@ -200,8 +201,10 @@
CanonicalSymbolResolver importResolver =
new CanonicalResolver(CompoundEnv.<ClassSymbol, BoundClass>of(ienv).append(classPathEnv));
Scope importScope = ImportIndex.create(importResolver, tli, unit.imports());
+ Scope wildImportScope = WildImportIndex.create(importResolver, tli, unit.imports());
MemberImportIndex memberImports = new MemberImportIndex(importResolver, tli, unit.imports());
- CompoundScope scope = topLevel.append(packageScope).append(importScope);
+ CompoundScope scope =
+ topLevel.append(wildImportScope).append(packageScope).append(importScope);
for (ClassSymbol sym : entry.getValue()) {
env.putIfAbsent(
diff --git a/java/com/google/turbine/binder/lookup/ImportIndex.java b/java/com/google/turbine/binder/lookup/ImportIndex.java
index aa1e0c5..bbafaaf 100644
--- a/java/com/google/turbine/binder/lookup/ImportIndex.java
+++ b/java/com/google/turbine/binder/lookup/ImportIndex.java
@@ -40,12 +40,9 @@
public class ImportIndex implements Scope {
private final Map<String, Supplier<ClassSymbol>> thunks;
- private final ImmutableList<Supplier<Scope>> packages;
- public ImportIndex(
- ImmutableMap<String, Supplier<ClassSymbol>> thunks, ImmutableList<Supplier<Scope>> packages) {
+ public ImportIndex(ImmutableMap<String, Supplier<ClassSymbol>> thunks) {
this.thunks = thunks;
- this.packages = packages;
}
/** Creates an import index for the given top-level environment. */
@@ -53,39 +50,11 @@
final CanonicalSymbolResolver resolve,
final TopLevelIndex cpi,
ImmutableList<ImportDecl> imports) {
- ImmutableList.Builder<Supplier<Scope>> packageScopes = ImmutableList.builder();
Map<String, Supplier<ClassSymbol>> thunks = new HashMap<>();
for (final Tree.ImportDecl i : imports) {
- if (i.stat()) {
+ if (i.stat() || i.wild()) {
continue;
}
- if (i.wild()) {
- packageScopes.add(
- Suppliers.memoize(
- new Supplier<Scope>() {
- @Override
- public Scope get() {
- Scope packageIndex = cpi.lookupPackage(i.type());
- if (packageIndex != null) {
- // a wildcard import of a package
- return packageIndex;
- }
- LookupResult result = cpi.lookup(new LookupKey(i.type()));
- if (result == null) {
- return null;
- }
- // a wildcard import of a type's members
- return new Scope() {
- @Override
- public LookupResult lookup(LookupKey lookupKey) {
- ClassSymbol member =
- resolve.resolveOne((ClassSymbol) result.sym(), lookupKey.first());
- return member != null ? new LookupResult(member, lookupKey) : null;
- }
- };
- }
- }));
- }
thunks.put(getLast(i.type()), thunk(resolve, cpi, i));
}
// Best-effort static type import handling.
@@ -102,7 +71,7 @@
}
thunks.put(last, thunk(resolve, cpi, i));
}
- return new ImportIndex(ImmutableMap.copyOf(thunks), packageScopes.build());
+ return new ImportIndex(ImmutableMap.copyOf(thunks));
}
private static Supplier<ClassSymbol> thunk(
@@ -124,12 +93,6 @@
public LookupResult lookup(LookupKey lookup) {
Supplier<ClassSymbol> thunk = thunks.get(lookup.first());
if (thunk == null) {
- for (Supplier<Scope> packageScope : packages) {
- LookupResult result = packageScope.get().lookup(lookup);
- if (result != null) {
- return result;
- }
- }
return null;
}
ClassSymbol sym = thunk.get();
diff --git a/java/com/google/turbine/binder/lookup/WildImportIndex.java b/java/com/google/turbine/binder/lookup/WildImportIndex.java
new file mode 100644
index 0000000..9e97847
--- /dev/null
+++ b/java/com/google/turbine/binder/lookup/WildImportIndex.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.turbine.binder.lookup;
+
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+import com.google.common.collect.ImmutableList;
+import com.google.turbine.binder.sym.ClassSymbol;
+import com.google.turbine.tree.Tree.ImportDecl;
+
+/**
+ * A scope that provides best-effort lookup for on-demand imported types in a compilation unit.
+ *
+ * <p>Resolution is lazy, imports are not evaluated until the first request for a matching simple
+ * name.
+ *
+ * <p>Static on-demand imports of types are not supported.
+ */
+public class WildImportIndex implements Scope {
+
+ private final ImmutableList<Supplier<Scope>> packages;
+
+ public WildImportIndex(ImmutableList<Supplier<Scope>> packages) {
+ this.packages = packages;
+ }
+
+ /** Creates an import index for the given top-level environment. */
+ public static WildImportIndex create(
+ final CanonicalSymbolResolver resolve,
+ final TopLevelIndex cpi,
+ ImmutableList<ImportDecl> imports) {
+ ImmutableList.Builder<Supplier<Scope>> packageScopes = ImmutableList.builder();
+ for (final ImportDecl i : imports) {
+ if (i.stat()) {
+ continue;
+ }
+ if (!i.wild()) {
+ continue;
+ }
+ packageScopes.add(
+ Suppliers.memoize(
+ new Supplier<Scope>() {
+ @Override
+ public Scope get() {
+ Scope packageIndex = cpi.lookupPackage(i.type());
+ if (packageIndex != null) {
+ // a wildcard import of a package
+ return packageIndex;
+ }
+ LookupResult result = cpi.lookup(new LookupKey(i.type()));
+ if (result == null) {
+ return null;
+ }
+ // a wildcard import of a type's members
+ return new Scope() {
+ @Override
+ public LookupResult lookup(LookupKey lookupKey) {
+ ClassSymbol member =
+ resolve.resolveOne((ClassSymbol) result.sym(), lookupKey.first());
+ return member != null ? new LookupResult(member, lookupKey) : null;
+ }
+ };
+ }
+ }));
+ }
+ return new WildImportIndex(packageScopes.build());
+ }
+
+ @Override
+ public LookupResult lookup(LookupKey lookup) {
+ for (Supplier<Scope> packageScope : packages) {
+ LookupResult result = packageScope.get().lookup(lookup);
+ if (result != null) {
+ return result;
+ }
+ }
+ return null;
+ }
+}
diff --git a/javatests/com/google/turbine/lower/LowerIntegrationTest.java b/javatests/com/google/turbine/lower/LowerIntegrationTest.java
index 1c838d8..496eee6 100644
--- a/javatests/com/google/turbine/lower/LowerIntegrationTest.java
+++ b/javatests/com/google/turbine/lower/LowerIntegrationTest.java
@@ -228,6 +228,7 @@
"float_exponent.test",
"boxed_const.test",
"package_info.test",
+ "import_wild_order.test",
};
List<Object[]> tests =
ImmutableList.copyOf(testCases).stream().map(x -> new Object[] {x}).collect(toList());
diff --git a/javatests/com/google/turbine/lower/testdata/import_wild_order.test b/javatests/com/google/turbine/lower/testdata/import_wild_order.test
new file mode 100644
index 0000000..38435f2
--- /dev/null
+++ b/javatests/com/google/turbine/lower/testdata/import_wild_order.test
@@ -0,0 +1,15 @@
+=== a/A.java ===
+package a;
+public class A {}
+
+=== p/A.java ===
+package p;
+public class A {}
+
+=== p/Test.java ===
+package p;
+import a.*;
+// on-demand import of a.A does not hide p.A
+class Test extends A {
+}
+