aboutsummaryrefslogtreecommitdiff
path: root/test/dotc/tests.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2014-03-13 21:41:40 +0100
committerMartin Odersky <odersky@gmail.com>2014-03-13 21:43:39 +0100
commit163b16014331ab909aa719b035dbc9491630edae (patch)
tree9cc6c4622a92a2a7547af6ac730a7dbee57facf7 /test/dotc/tests.scala
parentdb950e5e168f6fd71a367da343e352139e8d653e (diff)
downloaddotty-163b16014331ab909aa719b035dbc9491630edae.tar.gz
dotty-163b16014331ab909aa719b035dbc9491630edae.tar.bz2
dotty-163b16014331ab909aa719b035dbc9491630edae.zip
Bullet-proofing companion objects
Companion class/module computations now also work for local classes and modules. For this to work, either one of two conditions must be met: (1) some enclosing context refers to a scope that contains the companions. (2) the context's compilation unit has a typed tree that contains the companions. (1) is usually true when type-checking, (2) when transforming trees. Local companions are searched as follows: If (2) holds, we locate the statement sequence containing the companions by searching down from the root stored in the compilation unit. Otherwise, we search outwards in the enclosing contexts for a scope containing the companions.
Diffstat (limited to 'test/dotc/tests.scala')
-rw-r--r--test/dotc/tests.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
index 546b09b3a..54d9cfca6 100644
--- a/test/dotc/tests.scala
+++ b/test/dotc/tests.scala
@@ -56,6 +56,7 @@ class tests extends CompilerTest {
@Test def neg_templateParents() = compileFile(negDir, "templateParents", xerrors = 3)
@Test def neg_i39 = compileFile(negDir, "i39", xerrors = 1)
@Test def neg_i50_volatile = compileFile(negDir, "i50-volatile", xerrors = 4)
+ @Test def neg_companions = compileFile(negDir, "companions", xerrors = 1)
@Test def dotc = compileDir(dotcDir + "tools/dotc", twice)
@Test def dotc_ast = compileDir(dotcDir + "tools/dotc/ast", twice)