From 1ab7d1c5f84d438d69cd36a391e80912d8f9080c Mon Sep 17 00:00:00 2001
From: Eugene Burmako <xeno.by@gmail.com>
Date: Thu, 31 Jan 2013 11:13:05 +0100
Subject: evicts eponymous packages and objects from tests

As I figured out from http://groups.google.com/group/scala-internals/browse_thread/thread/ace970a799dcf7a0,
current behavior with same-named objects silently taking precedence over
same-named packages is a bug and shouldn't be relied upon.
---
 test/files/run/reify-staticXXX.scala | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'test')

diff --git a/test/files/run/reify-staticXXX.scala b/test/files/run/reify-staticXXX.scala
index dc861f843e..e80157dd8f 100644
--- a/test/files/run/reify-staticXXX.scala
+++ b/test/files/run/reify-staticXXX.scala
@@ -4,12 +4,12 @@ import scala.tools.reflect.Eval
 object B { override def toString = "object" }
 class C { override def toString = "class" }
 
-package foo {
+package foo1 {
   object B { override def toString = "package > object" }
   class C { override def toString = "package > class" }
 }
 
-object foo {
+object Foo2 {
   object B { override def toString = "object > object" }
   class C { override def toString = "object > class" }
 }
@@ -20,14 +20,14 @@ object packageless {
     println(reify(B).eval)
     println(new C)
     println(reify(new C).eval)
-    println(foo.B)
-    println(reify(foo.B).eval)
-    println(new foo.C)
-    println(reify(new foo.C).eval)
-    println(_root_.foo.B)
-    println(reify(_root_.foo.B).eval)
-    println(new _root_.foo.C)
-    println(reify(new _root_.foo.C).eval)
+    println(Foo2.B)
+    println(reify(Foo2.B).eval)
+    println(new Foo2.C)
+    println(reify(new Foo2.C).eval)
+    println(_root_.foo1.B)
+    println(reify(_root_.foo1.B).eval)
+    println(new _root_.foo1.C)
+    println(reify(new _root_.foo1.C).eval)
   }
 }
 
@@ -38,14 +38,14 @@ package packageful {
       println(reify(B).eval)
       println(new C)
       println(reify(new C).eval)
-      println(foo.B)
-      println(reify(foo.B).eval)
-      println(new foo.C)
-      println(reify(new foo.C).eval)
-      println(_root_.foo.B)
-      println(reify(_root_.foo.B).eval)
-      println(new _root_.foo.C)
-      println(reify(new _root_.foo.C).eval)
+      println(Foo2.B)
+      println(reify(Foo2.B).eval)
+      println(new Foo2.C)
+      println(reify(new Foo2.C).eval)
+      println(_root_.foo1.B)
+      println(reify(_root_.foo1.B).eval)
+      println(new _root_.foo1.C)
+      println(reify(new _root_.foo1.C).eval)
     }
   }
 }
-- 
cgit v1.2.3