summaryrefslogtreecommitdiff
path: root/test/files/run
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2012-11-01 11:08:39 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2012-11-01 11:08:39 -0700
commita70c8219220b637072b52fc834439d90f0cf5b38 (patch)
treed1cf2daa641f63491d0b8935721385bafaaa1555 /test/files/run
parent2dd7142401d85badff451a6d3bb15eb84f4e9fa9 (diff)
parent578c4c6c64250a12a0e625d1e54a74dbdad6d972 (diff)
downloadscala-a70c8219220b637072b52fc834439d90f0cf5b38.tar.gz
scala-a70c8219220b637072b52fc834439d90f0cf5b38.tar.bz2
scala-a70c8219220b637072b52fc834439d90f0cf5b38.zip
Merge pull request #1521 from paulp/whats-in-a-name
Saving symbol lookup from typedIdent.
Diffstat (limited to 'test/files/run')
-rw-r--r--test/files/run/t4537.check1
-rw-r--r--test/files/run/t4537/a.scala5
-rw-r--r--test/files/run/t4537/b.scala5
-rw-r--r--test/files/run/t4537/c.scala8
-rw-r--r--test/files/run/t4537/d.scala6
5 files changed, 25 insertions, 0 deletions
diff --git a/test/files/run/t4537.check b/test/files/run/t4537.check
new file mode 100644
index 0000000000..63739ca64a
--- /dev/null
+++ b/test/files/run/t4537.check
@@ -0,0 +1 @@
+b.Settings
diff --git a/test/files/run/t4537/a.scala b/test/files/run/t4537/a.scala
new file mode 100644
index 0000000000..125e223e13
--- /dev/null
+++ b/test/files/run/t4537/a.scala
@@ -0,0 +1,5 @@
+package a
+
+private[a] object Settings {
+ val X = "a.Settings"
+}
diff --git a/test/files/run/t4537/b.scala b/test/files/run/t4537/b.scala
new file mode 100644
index 0000000000..c709d49b04
--- /dev/null
+++ b/test/files/run/t4537/b.scala
@@ -0,0 +1,5 @@
+package b
+
+object Settings {
+ val Y = "b.Settings"
+}
diff --git a/test/files/run/t4537/c.scala b/test/files/run/t4537/c.scala
new file mode 100644
index 0000000000..ee05d4bbfb
--- /dev/null
+++ b/test/files/run/t4537/c.scala
@@ -0,0 +1,8 @@
+package b
+package c
+
+import a._
+
+object Unambiguous {
+ println(Settings.Y)
+}
diff --git a/test/files/run/t4537/d.scala b/test/files/run/t4537/d.scala
new file mode 100644
index 0000000000..dd1d2045ed
--- /dev/null
+++ b/test/files/run/t4537/d.scala
@@ -0,0 +1,6 @@
+import a._
+import b._
+
+object Test extends App {
+ println(Settings.Y)
+}