- bug fix: replace "this" expressions which ref...

- bug fix: replace "this" expressions which refer to outer classes by
uses of outer links

1 files changed, 10 insertions, 0 deletions

diff --git a/sources/scalac/transformer/ExplicitOuterClasses.java b/sources/scalac/transformer/ExplicitOuterClasses.java
index 5eff0c87bb..80fbf4abaf 100644
--- a/sources/scalac/transformer/ExplicitOuterClasses.java
+++ b/sources/scalac/transformer/ExplicitOuterClasses.java
@@ -177,6 +177,16 @@ public class ExplicitOuterClasses extends Transformer {
             }
         }
 
+        case This(Tree qualifier): {
+            // If "this" refers to some outer class, replace it by
+            // explicit reference to it.
+            int level = qualifier.hasSymbol() ? outerLevel(qualifier.symbol()) : 0;
+            if (level > 0)
+                return outerRef(level);
+            else
+                return super.transform(tree);
+        }
+
         case Apply(Tree fun, Tree[] args): {
             // Add outer parameter to constructor calls.
             Tree realFun;