diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-04-01 14:41:22 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-04-01 14:41:22 -0700 |
| commit | 00e6c8b9e395cae3b761b848482bc91c7634ec13 (patch) | |
| tree | a3b4bdf5d54d4d9ed5a260f4e410d3a918571fdc /test/files/pos/t7232d | |
| parent | 3a33a8be46881474376cd8628cf4a6092fc3b97e (diff) | |
| parent | 8383b65fb53ae9424cf9c6f1314ee73321ad3b9a (diff) | |
| download | scala-00e6c8b9e395cae3b761b848482bc91c7634ec13.tar.gz scala-00e6c8b9e395cae3b761b848482bc91c7634ec13.tar.bz2 scala-00e6c8b9e395cae3b761b848482bc91c7634ec13.zip | |
Merge pull request #2317 from retronym/ticket/7232-master
[forward-port] SI-7232 Fix Java import vs defn. binding precendence
Diffstat (limited to 'test/files/pos/t7232d')
| -rw-r--r-- | test/files/pos/t7232d/Entry.java | 4 | ||||
| -rw-r--r-- | test/files/pos/t7232d/Foo.java | 8 | ||||
| -rw-r--r-- | test/files/pos/t7232d/Test.scala | 4 |
3 files changed, 16 insertions, 0 deletions
diff --git a/test/files/pos/t7232d/Entry.java b/test/files/pos/t7232d/Entry.java new file mode 100644 index 0000000000..0cfb6fb25b --- /dev/null +++ b/test/files/pos/t7232d/Entry.java @@ -0,0 +1,4 @@ +package pack; + +public class Entry { +} diff --git a/test/files/pos/t7232d/Foo.java b/test/files/pos/t7232d/Foo.java new file mode 100644 index 0000000000..df7114a0f0 --- /dev/null +++ b/test/files/pos/t7232d/Foo.java @@ -0,0 +1,8 @@ +package pack; + +import java.util.Map.Entry; + +public class Foo { + public static Entry mapEntry() { throw new Error(); } + public static void javaTest() { mapEntry().getKey(); } +} diff --git a/test/files/pos/t7232d/Test.scala b/test/files/pos/t7232d/Test.scala new file mode 100644 index 0000000000..89a8063b3c --- /dev/null +++ b/test/files/pos/t7232d/Test.scala @@ -0,0 +1,4 @@ +object Test { + import pack._ + Foo.mapEntry().getKey() +} |