diff options
author | Paul Phillips <paulp@improving.org> | 2012-01-25 10:16:17 -0800 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-01-25 10:16:17 -0800 |
commit | cbad2ec3b1a564efa7312c45cd40733bf292294b (patch) | |
tree | e5d01aa8e0ce17b26e91aa465d524a12788dd950 /test/files/run | |
parent | c9a2d079eabd1d6d143ef43d95d2cb93d1996bfc (diff) | |
parent | 3a09b7845c3b16906c9bea9b9deccc545b7a4cb7 (diff) | |
download | scala-cbad2ec3b1a564efa7312c45cd40733bf292294b.tar.gz scala-cbad2ec3b1a564efa7312c45cd40733bf292294b.tar.bz2 scala-cbad2ec3b1a564efa7312c45cd40733bf292294b.zip |
Merge remote-tracking branch 'odersky/topic/reflect' into develop
Conflicts:
src/compiler/scala/reflect/internal/Symbols.scala
src/compiler/scala/reflect/internal/Types.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
src/library/scala/reflect/api/Trees.scala
Diffstat (limited to 'test/files/run')
-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 b91f122a23..2b30e29bb3 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).info.declaration(mirror.newTermName("bar")).info == - mirror.classToSymbol(manifest[Bar].erasure).info.declaration(mirror.newTermName("foo")).info) + assert(mirror.classToSymbol(manifest[Foo].erasure).typeSig.declaration(mirror.newTermName("bar")).typeSig == + mirror.classToSymbol(manifest[Bar].erasure).typeSig.declaration(mirror.newTermName("foo")).typeSig) val s1 = implClass(manifest[Foo].erasure) assert(s1 != mirror.NoSymbol) - assert(s1.info != mirror.NoType) - assert(s1.companionModule.info != mirror.NoType) - assert(s1.companionModule.info.declaration(mirror.newTermName("bar")) != mirror.NoSymbol) + assert(s1.typeSig != mirror.NoType) + assert(s1.companionModule.typeSig != mirror.NoType) + assert(s1.companionModule.typeSig.declaration(mirror.newTermName("bar")) != mirror.NoSymbol) val s2 = implClass(manifest[Bar].erasure) assert(s2 != mirror.NoSymbol) - assert(s2.info != mirror.NoType) - assert(s2.companionModule.info != mirror.NoType) - assert(s2.companionModule.info.declaration(mirror.newTermName("foo")) != mirror.NoSymbol) + assert(s2.typeSig != mirror.NoType) + assert(s2.companionModule.typeSig != mirror.NoType) + assert(s2.companionModule.typeSig.declaration(mirror.newTermName("foo")) != mirror.NoSymbol) def implClass(clazz: Class[_]) = { val implClass = Class.forName(clazz.getName + "$class") mirror.classToSymbol(implClass) |