Handle local traits in lambda lift

2 files changed, 100 insertions, 9 deletions

diff --git a/tests/pos/llift.scala b/tests/pos/llift.scala
deleted file mode 100644
index 51631ac97..000000000
--- a/tests/pos/llift.scala
+++ /dev/null
@@ -1,9 +0,0 @@
-class A {
-  class B {
-    def outer(): Unit = {
-      def inner(): Int = 2
-
-      val fi: Function0[Int] = () => inner()
-    }
-  }
-}
diff --git a/tests/run/llift.scala b/tests/run/llift.scala
new file mode 100644
index 000000000..0c8c9b4be
--- /dev/null
+++ b/tests/run/llift.scala
@@ -0,0 +1,100 @@
+class A {
+  class B {
+    def outer(): Unit = {
+      def inner(): Int = 2
+
+      val fi: Function0[Int] = () => inner()
+    }
+  }
+}
+object Test {
+  def foo(x: Int) = {
+    trait B {
+      def bar = x
+    }
+    class C extends B {
+      override def bar = super[B].bar
+    }
+    new C().bar
+  }
+
+
+  def f1(x: Int) = {
+    class C1 {
+      def f2 = {
+        class C2 {
+          def f3 = {
+            def f4 = x
+            f4
+          }
+        }
+        new C2().f3
+      }
+    }
+    new C1().f2
+  }
+
+  def f1a(x: Int) = {
+//    class C1 {
+      def f2 = {
+        trait T2 {
+          def f3 = {
+            def f4 = x
+            def f5 = f4
+            f5
+          }
+        }
+        class C2 extends T2
+        new C2().f3
+      }
+//    }
+    /*new C1().*/f2
+  }
+
+  def f1b(x: Int) = {
+    class T1 {
+      def f2 = {
+        trait T2 {
+          def f3 = {
+            def f4 = x
+            def f5 = f4
+            f5
+          }
+        }
+        class C2 extends T2
+        new C2().f3
+      }
+    }
+    class C1 extends T1
+    new C1().f2
+  }
+
+  def f1c(x: Int) = {
+    class T1 {
+      def f2 = {
+        trait T2 {
+          def f3: Int = {
+            def f4 = x
+            def f5 = f4
+            def f7 = this.f3
+            f5
+          }
+        }
+        class C2 extends T2
+        class C3 extends T1
+        new C2().f3 + new C3().f6
+      }
+      def f6 = x
+    }
+    class C1 extends T1
+    new C1().f2
+  }
+
+  def main(args: Array[String]) = {
+    assert(foo(3) == 3)
+    assert(f1(4) == 4)
+    assert(f1a(5) == 5)
+    assert(f1b(6) == 6)
+    assert(f1c(6) == 12)
+  }
+}