summaryrefslogtreecommitdiff
path: root/test/files/run
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-01-31 20:03:57 -0800
committerPaul Phillips <paulp@improving.org>2013-01-31 20:03:57 -0800
commit644eb7078a11613a06dcaaefb807cbcc44f65ea7 (patch)
treea4a67c5474e5c9d57d233536159780ae66c335f5 /test/files/run
parentd672102fd8bf86fcdb53f1a063072d430d1c1fbb (diff)
parent1ab7d1c5f84d438d69cd36a391e80912d8f9080c (diff)
downloadscala-644eb7078a11613a06dcaaefb807cbcc44f65ea7.tar.gz
scala-644eb7078a11613a06dcaaefb807cbcc44f65ea7.tar.bz2
scala-644eb7078a11613a06dcaaefb807cbcc44f65ea7.zip
Merge pull request #2034 from scalamacros/topic/reify-staticXXX
evicts eponymous packages and objects from tests
Diffstat (limited to 'test/files/run')
-rw-r--r--test/files/run/reify-staticXXX.scala36
1 files changed, 18 insertions, 18 deletions
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)
}
}
}