Fixing an incomplete svnmerge; second, merge ag...

Fixing an incomplete svnmerge; second, merge again from trunk.

1 files changed, 42 insertions, 0 deletions

diff --git a/test/files/pos/t4432.scala b/test/files/pos/t4432.scala
new file mode 100644
index 0000000000..106312311a
--- /dev/null
+++ b/test/files/pos/t4432.scala
@@ -0,0 +1,42 @@
+object Main {
+  def foo1 = {
+    class A {
+      val x = {
+        lazy val cc = 1 //
+        cc
+        ()
+      }
+    }
+    new A
+  }
+
+  def foo2 = {
+    class B {
+      val x = {
+        object cc
+        cc
+        ()
+      }
+    }
+    new B
+  }
+
+  def foo3 = {
+    object C {
+      val x = {
+        lazy val cc = 1
+        cc
+      }
+    }
+    C
+  }
+
+  def foo4 = {
+    class D {
+      lazy val cc = 1
+      cc
+    }
+    new D
+  }
+
+}