Merge pull request #69 from odersky/topic/generalize-companions

Bullet-proofing companion objects

2 files changed, 44 insertions, 0 deletions

diff --git a/tests/neg/companions.scala b/tests/neg/companions.scala
new file mode 100644
index 000000000..96b6b4bb6
--- /dev/null
+++ b/tests/neg/companions.scala
@@ -0,0 +1,16 @@
+object companionsNeg {
+
+  def foo() = {
+
+    class C {
+      private val q = 2
+    }
+
+    { object C {
+      private val p = 1
+      println(new C().q)
+    }}
+  }
+
+}
+
diff --git a/tests/pos/companions.scala b/tests/pos/companions.scala
new file mode 100644
index 000000000..6821ad768
--- /dev/null
+++ b/tests/pos/companions.scala
@@ -0,0 +1,28 @@
+object companions {
+
+  def foo() = {
+
+    class C {
+      println(C.p)
+      private val q = 2
+    }
+
+    object C {
+      private val p = 1
+      println(new C().q)
+    }
+  }
+
+}
+object companions2 {
+  def foo() = {
+     {
+      class C {
+        println(C.p)
+      }
+      object C {
+        private val p = 1
+      }
+    }
+  }
+}