diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-02-13 11:44:14 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-02-13 11:44:14 +0100 |
commit | c83e01d47d941265fa5415c0f29a884c904fdfa0 (patch) | |
tree | 5e266fdffd2dad974a8120b266c73c2f89914369 /test/files/pos/t5954c | |
parent | d1c0b359ede63e9e5f5dc230d3ac354c9680c048 (diff) | |
parent | 436bbbe1b3168f18ccf6dee81cf4a8283c2daaec (diff) | |
download | scala-c83e01d47d941265fa5415c0f29a884c904fdfa0.tar.gz scala-c83e01d47d941265fa5415c0f29a884c904fdfa0.tar.bz2 scala-c83e01d47d941265fa5415c0f29a884c904fdfa0.zip |
Merge pull request #3389 from retronym/ticket/8134-2
SI-8134 SI-5954 Fix companions in package object under separate comp.
Diffstat (limited to 'test/files/pos/t5954c')
-rw-r--r-- | test/files/pos/t5954c/A_1.scala | 18 | ||||
-rw-r--r-- | test/files/pos/t5954c/B_2.scala | 18 |
2 files changed, 36 insertions, 0 deletions
diff --git a/test/files/pos/t5954c/A_1.scala b/test/files/pos/t5954c/A_1.scala new file mode 100644 index 0000000000..29ad9547a2 --- /dev/null +++ b/test/files/pos/t5954c/A_1.scala @@ -0,0 +1,18 @@ +package object A { + // these used to should be prevented by the implementation restriction + // but are now allowed + class B + object B + trait C + object C + case class D() + // all the rest of these should be ok + class E + object F + val g = "omg" + var h = "wtf" + def i = "lol" + type j = String + class K(val k : Int) extends AnyVal + implicit class L(val l : Int) +} diff --git a/test/files/pos/t5954c/B_2.scala b/test/files/pos/t5954c/B_2.scala new file mode 100644 index 0000000000..29ad9547a2 --- /dev/null +++ b/test/files/pos/t5954c/B_2.scala @@ -0,0 +1,18 @@ +package object A { + // these used to should be prevented by the implementation restriction + // but are now allowed + class B + object B + trait C + object C + case class D() + // all the rest of these should be ok + class E + object F + val g = "omg" + var h = "wtf" + def i = "lol" + type j = String + class K(val k : Int) extends AnyVal + implicit class L(val l : Int) +} |