diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-06 11:37:35 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-06 11:49:38 -0800 |
| commit | 7539c4ee51c25a684399cd5400bf0285e6508fe2 (patch) | |
| tree | 94a9eb9b9519417d1924711f56638a4be02f4a2b /test/files/run/reflection-implClass.scala | |
| parent | f0dcb3c87fe9c3214af6abe4e8d2032a8d51295c (diff) | |
| parent | 93c2d93f4e7aaffaac92bdf14714a6c3871718c9 (diff) | |
| download | scala-7539c4ee51c25a684399cd5400bf0285e6508fe2.tar.gz scala-7539c4ee51c25a684399cd5400bf0285e6508fe2.tar.bz2 scala-7539c4ee51c25a684399cd5400bf0285e6508fe2.zip | |
Merge branch 'master' into topic/inline
Conflicts:
src/compiler/scala/tools/nsc/Global.scala
test/files/run/programmatic-main.check
Diffstat (limited to 'test/files/run/reflection-implClass.scala')
| -rw-r--r-- | test/files/run/reflection-implClass.scala | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/files/run/reflection-implClass.scala b/test/files/run/reflection-implClass.scala index 2b30e29bb3..7718b52f33 100644 --- a/test/files/run/reflection-implClass.scala +++ b/test/files/run/reflection-implClass.scala @@ -8,19 +8,19 @@ object Test extends App with Outer { import scala.reflect.mirror - assert(mirror.classToSymbol(manifest[Foo].erasure).typeSig.declaration(mirror.newTermName("bar")).typeSig == - mirror.classToSymbol(manifest[Bar].erasure).typeSig.declaration(mirror.newTermName("foo")).typeSig) + assert(mirror.classToSymbol(manifest[Foo].erasure).typeSignature.declaration(mirror.newTermName("bar")).typeSignature == + mirror.classToSymbol(manifest[Bar].erasure).typeSignature.declaration(mirror.newTermName("foo")).typeSignature) val s1 = implClass(manifest[Foo].erasure) assert(s1 != mirror.NoSymbol) - assert(s1.typeSig != mirror.NoType) - assert(s1.companionModule.typeSig != mirror.NoType) - assert(s1.companionModule.typeSig.declaration(mirror.newTermName("bar")) != mirror.NoSymbol) + assert(s1.typeSignature != mirror.NoType) + assert(s1.companionSymbol.typeSignature != mirror.NoType) + assert(s1.companionSymbol.typeSignature.declaration(mirror.newTermName("bar")) != mirror.NoSymbol) val s2 = implClass(manifest[Bar].erasure) assert(s2 != mirror.NoSymbol) - assert(s2.typeSig != mirror.NoType) - assert(s2.companionModule.typeSig != mirror.NoType) - assert(s2.companionModule.typeSig.declaration(mirror.newTermName("foo")) != mirror.NoSymbol) + assert(s2.typeSignature != mirror.NoType) + assert(s2.companionSymbol.typeSignature != mirror.NoType) + assert(s2.companionSymbol.typeSignature.declaration(mirror.newTermName("foo")) != mirror.NoSymbol) def implClass(clazz: Class[_]) = { val implClass = Class.forName(clazz.getName + "$class") mirror.classToSymbol(implClass) |