diff options
author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-13 11:06:59 +0200 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-13 11:06:59 +0200 |
commit | 2ccae8f8bbe6f6650f5d4f968943c32485e654db (patch) | |
tree | dd610615a9f1b5b9fdfc87a2950496e246dbdf2f /test/files/pos | |
parent | 761c5fe29dbaaa73d1971d560e46d834c7aa2142 (diff) | |
parent | f25713b50dadb3104980450fd61473e063d0b829 (diff) | |
download | scala-2ccae8f8bbe6f6650f5d4f968943c32485e654db.tar.gz scala-2ccae8f8bbe6f6650f5d4f968943c32485e654db.tar.bz2 scala-2ccae8f8bbe6f6650f5d4f968943c32485e654db.zip |
Merge branch '2.10.x'
Diffstat (limited to 'test/files/pos')
-rw-r--r-- | test/files/pos/t5957/T_1.scala | 6 | ||||
-rw-r--r-- | test/files/pos/t5957/Test.java | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/test/files/pos/t5957/T_1.scala b/test/files/pos/t5957/T_1.scala new file mode 100644 index 0000000000..1db5a3891f --- /dev/null +++ b/test/files/pos/t5957/T_1.scala @@ -0,0 +1,6 @@ +abstract class T { + def t1: Test$Bar + def t2: Test#Bar + def t3: Test$Baz + def t4: Test.Baz +} diff --git a/test/files/pos/t5957/Test.java b/test/files/pos/t5957/Test.java new file mode 100644 index 0000000000..4fbd257d95 --- /dev/null +++ b/test/files/pos/t5957/Test.java @@ -0,0 +1,11 @@ +public class Test { + public class Bar { + public Bar(int i) { + } + } + + public static class Baz { + public Baz(int i) { + } + } +} |