diff options
| author | Martin Odersky <odersky@gmail.com> | 2014-07-21 18:41:52 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2014-07-21 18:41:52 +0200 |
| commit | a9aa810472b5ee117b0865350a06b28a06b27c5c (patch) | |
| tree | f433aeeabde2c6c5d84184f5f9fdcad32f3a59ae /src/dotty/tools/dotc/core/Types.scala | |
| parent | 9e1759f34dcfa90f688ef560c90f209dcb9b1374 (diff) | |
| download | dotty-a9aa810472b5ee117b0865350a06b28a06b27c5c.tar.gz dotty-a9aa810472b5ee117b0865350a06b28a06b27c5c.tar.bz2 dotty-a9aa810472b5ee117b0865350a06b28a06b27c5c.zip | |
Fix of FullParameterization
Avoid substitituting A.this if A is a globally accesisble mdoule.
Diffstat (limited to 'src/dotty/tools/dotc/core/Types.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/Types.scala | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/dotty/tools/dotc/core/Types.scala b/src/dotty/tools/dotc/core/Types.scala index 289515ae1..85211fca5 100644 --- a/src/dotty/tools/dotc/core/Types.scala +++ b/src/dotty/tools/dotc/core/Types.scala @@ -832,6 +832,10 @@ object Types { final def substThis(cls: ClassSymbol, tp: Type)(implicit ctx: Context): Type = ctx.substThis(this, cls, tp, null) + /** As substThis, but only is class is a static owner (i.e. a globally accessible object) */ + final def substThisUnlessStatic(cls: ClassSymbol, tp: Type)(implicit ctx: Context): Type = + if (cls.isStaticOwner) this else ctx.substThis(this, cls, tp, null) + /** Substitute all occurrences of `RefinedThis(rt)` by `tp` */ final def substThis(rt: RefinedType, tp: Type)(implicit ctx: Context): Type = ctx.substThis(this, rt, tp, null) |