aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/ast/untpd.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 /src/dotty/tools/dotc/ast/untpd.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 'src/dotty/tools/dotc/ast/untpd.scala')
-rw-r--r--src/dotty/tools/dotc/ast/untpd.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/ast/untpd.scala b/src/dotty/tools/dotc/ast/untpd.scala
index b6ae6661f..aea34e08a 100644
--- a/src/dotty/tools/dotc/ast/untpd.scala
+++ b/src/dotty/tools/dotc/ast/untpd.scala
@@ -9,7 +9,7 @@ import Decorators._
import language.higherKinds
import collection.mutable.ListBuffer
-object untpd extends Trees.Instance[Untyped] with TreeInfo[Untyped] {
+object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {
// ----- Tree cases that exist in untyped form only ------------------