summaryrefslogtreecommitdiff
path: root/test/files/run/t7246
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-04-02 08:06:31 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-04-02 08:06:31 -0700
commitc77dd12d8d1041af0b9f79c19a03eb34d34a9327 (patch)
treeecb17550e07c09acd5db362a3f7ee8b9d4eaacc4 /test/files/run/t7246
parent00e6c8b9e395cae3b761b848482bc91c7634ec13 (diff)
parent51d96a32f1726f5152b1b6ff9a469944c8a77e94 (diff)
downloadscala-c77dd12d8d1041af0b9f79c19a03eb34d34a9327.tar.gz
scala-c77dd12d8d1041af0b9f79c19a03eb34d34a9327.tar.bz2
scala-c77dd12d8d1041af0b9f79c19a03eb34d34a9327.zip
Merge pull request #2343 from retronym/topic/merge-2.10.x-to-v2.11.0-M2-74-g00e6c8b
Merge 2.10.x to master
Diffstat (limited to 'test/files/run/t7246')
-rwxr-xr-xtest/files/run/t7246/Outer.java4
-rwxr-xr-xtest/files/run/t7246/Test.scala16
2 files changed, 20 insertions, 0 deletions
diff --git a/test/files/run/t7246/Outer.java b/test/files/run/t7246/Outer.java
new file mode 100755
index 0000000000..163276fb3b
--- /dev/null
+++ b/test/files/run/t7246/Outer.java
@@ -0,0 +1,4 @@
+public class Outer {
+ public class Inner {
+ }
+} \ No newline at end of file
diff --git a/test/files/run/t7246/Test.scala b/test/files/run/t7246/Test.scala
new file mode 100755
index 0000000000..9f23ca8f3a
--- /dev/null
+++ b/test/files/run/t7246/Test.scala
@@ -0,0 +1,16 @@
+object Test extends App {
+
+ val so = new SubOuter
+ val si = new so.SubInner
+ println(si.bar)
+}
+
+class SubOuter extends Outer {
+
+ val foo = "hello"
+
+ class SubInner extends Inner {
+ def bar = foo
+ }
+
+} \ No newline at end of file