diff options
Diffstat (limited to 'test/files/run')
24 files changed, 65 insertions, 65 deletions
diff --git a/test/files/run/compiler-asSeenFrom.scala b/test/files/run/compiler-asSeenFrom.scala index 1fc3a5ee71..19feb45101 100644 --- a/test/files/run/compiler-asSeenFrom.scala +++ b/test/files/run/compiler-asSeenFrom.scala @@ -47,10 +47,10 @@ package ll { for (p <- typeRefPrefixes ; c <- classes filter (isPossibleEnclosure(p.typeSymbol, _)) ; a <- targs) yield typeRef(p, c, List(a)) ) - + val wfmt = "%-" + 25 + "s" def to_s(x: Any): String = wfmt.format(x.toString.replaceAll("""\bll\.""", "")) - + def fmt(args: Any*): String = { (args map to_s mkString " ").replaceAll("""\s+$""", "") } @@ -61,7 +61,7 @@ package ll { } def permuteAsSeenFrom(targs: List[Type]) = ( - for { + for { tp <- typeRefs(targs filterNot (_ eq NoType)) prefix <- asSeenPrefixes if tp.prefix != prefix @@ -72,11 +72,11 @@ package ll { } yield ((site, tp, prefix, seen)) ) - + def block(label: Any)(lines: List[String]): List[String] = { val first = "" + label + " {" val last = "}" - + first +: lines.map(" " + _) :+ last } @@ -84,7 +84,7 @@ package ll { permuteAsSeenFrom(targs).groupBy(_._1).toList.sortBy(_._1.toString) flatMap { case (site, xs) => block(fmt(site)) { - fmt("type", "seen from prefix", "is") :: + fmt("type", "seen from prefix", "is") :: fmt("----", "----------------", "--") :: { xs.groupBy(_._2).toList.sortBy(_._1.toString) flatMap { case (tp, ys) => @@ -95,15 +95,15 @@ package ll { } } } - + def pretty(xs: List[_]) = if (xs.isEmpty) "" else xs.mkString("\n ", "\n ", "\n") def signaturesIn(info: Type): List[String] = ( - info.members + info.members.toList filterNot (s => s.isType || s.owner == ObjectClass || s.owner == AnyClass || s.isConstructor) map (_.defString) ) - + def check(source: String, unit: global.CompilationUnit) = { import syms._ diff --git a/test/files/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala b/test/files/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala index 32a8958577..7a2c0a6fa9 100644 --- a/test/files/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala +++ b/test/files/run/macro-reflective-mamd-normal-mi/Macros_Test_2.scala @@ -9,7 +9,7 @@ object Test extends App { import scala.tools.reflect.ToolBox val macrobody = Select(Ident(newTermName("Impls")), newTermName("foo")) - val macroparam = ValDef(NoMods, newTermName("x"), TypeTree(definitions.IntClass.asType), EmptyTree) + val macroparam = ValDef(NoMods, newTermName("x"), TypeTree(definitions.IntClass.toType), EmptyTree) val macrodef = DefDef(Modifiers(MACRO), newTermName("foo"), Nil, List(List(macroparam)), TypeTree(), macrobody) val modulector = DefDef(NoMods, nme.CONSTRUCTOR, Nil, List(List()), TypeTree(), Block(Apply(Select(Super(This(EmptyTypeName), EmptyTypeName), nme.CONSTRUCTOR), List()))) val module = ModuleDef(NoMods, newTermName("Macros"), Template(Nil, emptyValDef, List(modulector, macrodef))) diff --git a/test/files/run/macro-sip19-revised/Impls_Macros_1.scala b/test/files/run/macro-sip19-revised/Impls_Macros_1.scala index 013130d181..05d3e036d9 100644 --- a/test/files/run/macro-sip19-revised/Impls_Macros_1.scala +++ b/test/files/run/macro-sip19-revised/Impls_Macros_1.scala @@ -4,7 +4,7 @@ object Macros { def impl(c: Context) = { import c.universe._ - val inscope = c.inferImplicitValue(c.mirror.staticClass("SourceLocation").asType) + val inscope = c.inferImplicitValue(c.mirror.staticClass("SourceLocation").toType) val outer = c.Expr[SourceLocation](if (!inscope.isEmpty) inscope else Literal(Constant(null))) val Apply(fun, args) = c.enclosingImplicits(0)._2 diff --git a/test/files/run/macro-typecheck-macrosdisabled2.check b/test/files/run/macro-typecheck-macrosdisabled2.check index 2160d3800a..908fb65bb3 100644 --- a/test/files/run/macro-typecheck-macrosdisabled2.check +++ b/test/files/run/macro-typecheck-macrosdisabled2.check @@ -28,7 +28,7 @@ def apply[U >: Nothing <: scala.reflect.base.Universe with Singleton]($m$untyped: scala.reflect.base.MirrorOf[U]): U#Type = {
val $u: U = $m$untyped.universe;
val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror];
- $u.TypeRef.apply($u.ThisType.apply($m.staticPackage("scala").asModuleSymbol.moduleClass), $m.staticClass("scala.Array"), scala.collection.immutable.List.apply[$u.Type]($m.staticClass("scala.Int").asTypeSymbol.asTypeConstructor))
+ $u.TypeRef.apply($u.ThisType.apply($m.staticPackage("scala").asModule.moduleClass), $m.staticClass("scala.Array"), scala.collection.immutable.List.apply[$u.Type]($m.staticClass("scala.Int").asType.toTypeConstructor))
}
};
new $typecreator2()
diff --git a/test/files/run/reflection-constructormirror-inner-badpath.scala b/test/files/run/reflection-constructormirror-inner-badpath.scala index a42bedea83..4bccff21fe 100644 --- a/test/files/run/reflection-constructormirror-inner-badpath.scala +++ b/test/files/run/reflection-constructormirror-inner-badpath.scala @@ -12,7 +12,7 @@ class Foo{ val classTag = implicitly[ClassTag[R]] val cl = classTag.runtimeClass.getClassLoader val cm = runtimeMirror(cl) - val constructor = expectedType.tpe.member( nme.CONSTRUCTOR ).asMethodSymbol + val constructor = expectedType.tpe.member( nme.CONSTRUCTOR ).asMethod val sig = constructor.typeSignature val sym = cm.classSymbol( classTag.runtimeClass ) try { diff --git a/test/files/run/reflection-constructormirror-inner-good.scala b/test/files/run/reflection-constructormirror-inner-good.scala index c09f464b24..861332161f 100644 --- a/test/files/run/reflection-constructormirror-inner-good.scala +++ b/test/files/run/reflection-constructormirror-inner-good.scala @@ -12,7 +12,7 @@ class Foo{ val classTag = implicitly[ClassTag[R]] val cl = classTag.runtimeClass.getClassLoader val cm = runtimeMirror(cl) - val constructor = expectedType.tpe.member( nme.CONSTRUCTOR ).asMethodSymbol + val constructor = expectedType.tpe.member( nme.CONSTRUCTOR ).asMethod val sig = constructor.typeSignature val sym = cm.classSymbol( classTag.runtimeClass ) val cls = cm.reflect( this ).reflectClass( sym ) diff --git a/test/files/run/reflection-constructormirror-nested-badpath.scala b/test/files/run/reflection-constructormirror-nested-badpath.scala index ece0044c61..2983f185de 100644 --- a/test/files/run/reflection-constructormirror-nested-badpath.scala +++ b/test/files/run/reflection-constructormirror-nested-badpath.scala @@ -8,7 +8,7 @@ class Foo{ val classTag = implicitly[ClassTag[R]] val cl = classTag.runtimeClass.getClassLoader val cm = runtimeMirror(cl) - val constructor = expectedType.tpe.member( nme.CONSTRUCTOR ).asMethodSymbol + val constructor = expectedType.tpe.member( nme.CONSTRUCTOR ).asMethod val sig = constructor.typeSignature val sym = cm.classSymbol( classTag.runtimeClass ) try { diff --git a/test/files/run/reflection-constructormirror-nested-good.scala b/test/files/run/reflection-constructormirror-nested-good.scala index 432e9d3707..0b7c413975 100644 --- a/test/files/run/reflection-constructormirror-nested-good.scala +++ b/test/files/run/reflection-constructormirror-nested-good.scala @@ -8,7 +8,7 @@ class Foo{ val classTag = implicitly[ClassTag[R]] val cl = classTag.runtimeClass.getClassLoader val cm = runtimeMirror(cl) - val constructor = expectedType.tpe.member( nme.CONSTRUCTOR ).asMethodSymbol + val constructor = expectedType.tpe.member( nme.CONSTRUCTOR ).asMethod val sig = constructor.typeSignature val sym = cm.classSymbol( classTag.runtimeClass ) val cls = cm.reflectClass( sym ) diff --git a/test/files/run/reflection-constructormirror-toplevel-badpath.scala b/test/files/run/reflection-constructormirror-toplevel-badpath.scala index 7a7adbd603..cf92929119 100644 --- a/test/files/run/reflection-constructormirror-toplevel-badpath.scala +++ b/test/files/run/reflection-constructormirror-toplevel-badpath.scala @@ -13,7 +13,7 @@ class Foo{ val classTag = implicitly[ClassTag[R]] val cl = classTag.runtimeClass.getClassLoader val cm = runtimeMirror(cl) - val constructor = expectedType.tpe.member( nme.CONSTRUCTOR ).asMethodSymbol + val constructor = expectedType.tpe.member( nme.CONSTRUCTOR ).asMethod val sig = constructor.typeSignature val sym = cm.classSymbol( classTag.runtimeClass ) try { diff --git a/test/files/run/reflection-constructormirror-toplevel-good.scala b/test/files/run/reflection-constructormirror-toplevel-good.scala index 96713a11cb..b68134b2cb 100644 --- a/test/files/run/reflection-constructormirror-toplevel-good.scala +++ b/test/files/run/reflection-constructormirror-toplevel-good.scala @@ -13,7 +13,7 @@ class Foo{ val classTag = implicitly[ClassTag[R]] val cl = classTag.runtimeClass.getClassLoader val cm = runtimeMirror(cl) - val constructor = expectedType.tpe.member( nme.CONSTRUCTOR ).asMethodSymbol + val constructor = expectedType.tpe.member( nme.CONSTRUCTOR ).asMethod val sig = constructor.typeSignature val sym = cm.classSymbol( classTag.runtimeClass ) val cls = cm.reflectClass( sym ) diff --git a/test/files/run/reflection-equality.check b/test/files/run/reflection-equality.check index feafb58d3b..be531fbbd3 100644 --- a/test/files/run/reflection-equality.check +++ b/test/files/run/reflection-equality.check @@ -29,7 +29,7 @@ java.lang.Object { def methodIntIntInt: <?>
}
-scala> val ms: MethodSymbol = ts.declaration(newTermName("methodIntIntInt")).asMethodSymbol
+scala> val ms: MethodSymbol = ts.declaration(newTermName("methodIntIntInt")).asMethod
ms: reflect.runtime.universe.MethodSymbol = method methodIntIntInt
scala> val MethodType( _, t1 ) = ms.typeSignature
diff --git a/test/files/run/reflection-equality.scala b/test/files/run/reflection-equality.scala index 35dc47a59f..8fc82721e7 100644 --- a/test/files/run/reflection-equality.scala +++ b/test/files/run/reflection-equality.scala @@ -11,7 +11,7 @@ object Test extends ReplTest { |def im: InstanceMirror = cm.reflect(new X) |val cs: ClassSymbol = im.symbol |val ts: Type = cs.typeSignature - |val ms: MethodSymbol = ts.declaration(newTermName("methodIntIntInt")).asMethodSymbol + |val ms: MethodSymbol = ts.declaration(newTermName("methodIntIntInt")).asMethod |val MethodType( _, t1 ) = ms.typeSignature |val t2 = typeOf[scala.Int] |t1 == t2 diff --git a/test/files/run/reflection-fieldmirror-accessorsareokay.scala b/test/files/run/reflection-fieldmirror-accessorsareokay.scala index c586ce9bdd..9590cbe811 100644 --- a/test/files/run/reflection-fieldmirror-accessorsareokay.scala +++ b/test/files/run/reflection-fieldmirror-accessorsareokay.scala @@ -13,7 +13,7 @@ object Test extends App { def test(f: Symbol) = { try { - val fm: FieldMirror = im.reflectField(f.asTermSymbol) + val fm: FieldMirror = im.reflectField(f.asTerm) println(fm.symbol.isVariable) println(fm.get) fm.set(2) @@ -24,6 +24,6 @@ object Test extends App { } } - test(cs.typeSignature.declaration(newTermName("x")).asTermSymbol) - test(cs.typeSignature.declaration(newTermName("x_$eq")).asTermSymbol) + test(cs.typeSignature.declaration(newTermName("x")).asTerm) + test(cs.typeSignature.declaration(newTermName("x_$eq")).asTerm) } diff --git a/test/files/run/reflection-fieldmirror-ctorparam.scala b/test/files/run/reflection-fieldmirror-ctorparam.scala index fa9dd81d7f..b9d50fe97b 100644 --- a/test/files/run/reflection-fieldmirror-ctorparam.scala +++ b/test/files/run/reflection-fieldmirror-ctorparam.scala @@ -10,7 +10,7 @@ object Test extends App { val im: InstanceMirror = cm.reflect(a) val cs = im.symbol - val f = cs.typeSignature.declaration(newTermName("x")).asTermSymbol + val f = cs.typeSignature.declaration(newTermName("x")).asTerm try { val fm: FieldMirror = im.reflectField(f) println(fm.get) diff --git a/test/files/run/reflection-fieldmirror-getsetval.scala b/test/files/run/reflection-fieldmirror-getsetval.scala index af9a6e4c56..67c54d9708 100644 --- a/test/files/run/reflection-fieldmirror-getsetval.scala +++ b/test/files/run/reflection-fieldmirror-getsetval.scala @@ -10,7 +10,7 @@ object Test extends App { val im: InstanceMirror = cm.reflect(a) val cs = im.symbol - val f = cs.typeSignature.declaration(newTermName("x" + nme.LOCAL_SUFFIX_STRING)).asTermSymbol + val f = cs.typeSignature.declaration(newTermName("x" + nme.LOCAL_SUFFIX_STRING)).asTerm val fm: FieldMirror = im.reflectField(f) try { println(fm.get) diff --git a/test/files/run/reflection-fieldmirror-getsetvar.scala b/test/files/run/reflection-fieldmirror-getsetvar.scala index d9fbdaade0..abcf396dd1 100644 --- a/test/files/run/reflection-fieldmirror-getsetvar.scala +++ b/test/files/run/reflection-fieldmirror-getsetvar.scala @@ -10,7 +10,7 @@ object Test extends App { val im: InstanceMirror = cm.reflect(a) val cs = im.symbol - val f = cs.typeSignature.declaration(newTermName("x" + nme.LOCAL_SUFFIX_STRING)).asTermSymbol + val f = cs.typeSignature.declaration(newTermName("x" + nme.LOCAL_SUFFIX_STRING)).asTerm val fm: FieldMirror = im.reflectField(f) println(fm.get) fm.set(2) diff --git a/test/files/run/reflection-fieldmirror-nmelocalsuffixstring.scala b/test/files/run/reflection-fieldmirror-nmelocalsuffixstring.scala index d89e6a90ef..5cfe583ed5 100644 --- a/test/files/run/reflection-fieldmirror-nmelocalsuffixstring.scala +++ b/test/files/run/reflection-fieldmirror-nmelocalsuffixstring.scala @@ -10,7 +10,7 @@ object Test extends App { val im: InstanceMirror = cm.reflect(a) val cs = im.symbol - val f = cs.typeSignature.declaration(newTermName("x" + nme.LOCAL_SUFFIX_STRING)).asTermSymbol + val f = cs.typeSignature.declaration(newTermName("x" + nme.LOCAL_SUFFIX_STRING)).asTerm val fm: FieldMirror = im.reflectField(f) println(fm.symbol.isVariable) } diff --git a/test/files/run/reflection-fieldmirror-privatethis.scala b/test/files/run/reflection-fieldmirror-privatethis.scala index 0c415e09e4..7aa179958d 100644 --- a/test/files/run/reflection-fieldmirror-privatethis.scala +++ b/test/files/run/reflection-fieldmirror-privatethis.scala @@ -10,7 +10,7 @@ object Test extends App { val im: InstanceMirror = cm.reflect(a) val cs = im.symbol - val f = cs.typeSignature.declaration(newTermName("x")).asTermSymbol + val f = cs.typeSignature.declaration(newTermName("x")).asTerm val fm: FieldMirror = im.reflectField(f) println(fm.symbol.isVariable) println(fm.get) diff --git a/test/files/run/reflection-methodsymbol-allparams.scala b/test/files/run/reflection-methodsymbol-allparams.scala index cfd14f56a5..d7c1c281b0 100644 --- a/test/files/run/reflection-methodsymbol-allparams.scala +++ b/test/files/run/reflection-methodsymbol-allparams.scala @@ -13,12 +13,12 @@ class C { } object Test extends App { - println(typeOf[C].member(newTermName("x1")).asMethodSymbol.allParams) - println(typeOf[C].member(newTermName("x2")).asMethodSymbol.allParams) - println(typeOf[C].member(newTermName("x3")).asMethodSymbol.allParams) - println(typeOf[C].member(newTermName("x4")).asMethodSymbol.allParams) - println(typeOf[C].member(newTermName("y1")).asMethodSymbol.allParams) - println(typeOf[C].member(newTermName("y2")).asMethodSymbol.allParams) - println(typeOf[C].member(newTermName("y3")).asMethodSymbol.allParams) - println(typeOf[C].member(newTermName("y4")).asMethodSymbol.allParams) + println(typeOf[C].member(newTermName("x1")).asMethod.allParams) + println(typeOf[C].member(newTermName("x2")).asMethod.allParams) + println(typeOf[C].member(newTermName("x3")).asMethod.allParams) + println(typeOf[C].member(newTermName("x4")).asMethod.allParams) + println(typeOf[C].member(newTermName("y1")).asMethod.allParams) + println(typeOf[C].member(newTermName("y2")).asMethod.allParams) + println(typeOf[C].member(newTermName("y3")).asMethod.allParams) + println(typeOf[C].member(newTermName("y4")).asMethod.allParams) }
\ No newline at end of file diff --git a/test/files/run/reflection-methodsymbol-params.scala b/test/files/run/reflection-methodsymbol-params.scala index 654a16b59d..7174c6f49b 100644 --- a/test/files/run/reflection-methodsymbol-params.scala +++ b/test/files/run/reflection-methodsymbol-params.scala @@ -13,12 +13,12 @@ class C { } object Test extends App { - println(typeOf[C].member(newTermName("x1")).asMethodSymbol.params) - println(typeOf[C].member(newTermName("x2")).asMethodSymbol.params) - println(typeOf[C].member(newTermName("x3")).asMethodSymbol.params) - println(typeOf[C].member(newTermName("x4")).asMethodSymbol.params) - println(typeOf[C].member(newTermName("y1")).asMethodSymbol.params) - println(typeOf[C].member(newTermName("y2")).asMethodSymbol.params) - println(typeOf[C].member(newTermName("y3")).asMethodSymbol.params) - println(typeOf[C].member(newTermName("y4")).asMethodSymbol.params) + println(typeOf[C].member(newTermName("x1")).asMethod.params) + println(typeOf[C].member(newTermName("x2")).asMethod.params) + println(typeOf[C].member(newTermName("x3")).asMethod.params) + println(typeOf[C].member(newTermName("x4")).asMethod.params) + println(typeOf[C].member(newTermName("y1")).asMethod.params) + println(typeOf[C].member(newTermName("y2")).asMethod.params) + println(typeOf[C].member(newTermName("y3")).asMethod.params) + println(typeOf[C].member(newTermName("y4")).asMethod.params) }
\ No newline at end of file diff --git a/test/files/run/reflection-methodsymbol-resulttype.scala b/test/files/run/reflection-methodsymbol-resulttype.scala index 7a9f66dda8..0e3de26b9f 100644 --- a/test/files/run/reflection-methodsymbol-resulttype.scala +++ b/test/files/run/reflection-methodsymbol-resulttype.scala @@ -13,12 +13,12 @@ class C { } object Test extends App { - println(typeOf[C].member(newTermName("x1")).asMethodSymbol.resultType) - println(typeOf[C].member(newTermName("x2")).asMethodSymbol.resultType) - println(typeOf[C].member(newTermName("x3")).asMethodSymbol.resultType) - println(typeOf[C].member(newTermName("x4")).asMethodSymbol.resultType) - println(typeOf[C].member(newTermName("y1")).asMethodSymbol.resultType) - println(typeOf[C].member(newTermName("y2")).asMethodSymbol.resultType) - println(typeOf[C].member(newTermName("y3")).asMethodSymbol.resultType) - println(typeOf[C].member(newTermName("y4")).asMethodSymbol.resultType) + println(typeOf[C].member(newTermName("x1")).asMethod.resultType) + println(typeOf[C].member(newTermName("x2")).asMethod.resultType) + println(typeOf[C].member(newTermName("x3")).asMethod.resultType) + println(typeOf[C].member(newTermName("x4")).asMethod.resultType) + println(typeOf[C].member(newTermName("y1")).asMethod.resultType) + println(typeOf[C].member(newTermName("y2")).asMethod.resultType) + println(typeOf[C].member(newTermName("y3")).asMethod.resultType) + println(typeOf[C].member(newTermName("y4")).asMethod.resultType) }
\ No newline at end of file diff --git a/test/files/run/reflection-methodsymbol-typeparams.scala b/test/files/run/reflection-methodsymbol-typeparams.scala index 28f1c8973d..bb0a3c3aec 100644 --- a/test/files/run/reflection-methodsymbol-typeparams.scala +++ b/test/files/run/reflection-methodsymbol-typeparams.scala @@ -13,12 +13,12 @@ class C { } object Test extends App { - println(typeOf[C].member(newTermName("x1")).asMethodSymbol.typeParams) - println(typeOf[C].member(newTermName("x2")).asMethodSymbol.typeParams) - println(typeOf[C].member(newTermName("x3")).asMethodSymbol.typeParams) - println(typeOf[C].member(newTermName("x4")).asMethodSymbol.typeParams) - println(typeOf[C].member(newTermName("y1")).asMethodSymbol.typeParams) - println(typeOf[C].member(newTermName("y2")).asMethodSymbol.typeParams) - println(typeOf[C].member(newTermName("y3")).asMethodSymbol.typeParams) - println(typeOf[C].member(newTermName("y4")).asMethodSymbol.typeParams) + println(typeOf[C].member(newTermName("x1")).asMethod.typeParams) + println(typeOf[C].member(newTermName("x2")).asMethod.typeParams) + println(typeOf[C].member(newTermName("x3")).asMethod.typeParams) + println(typeOf[C].member(newTermName("x4")).asMethod.typeParams) + println(typeOf[C].member(newTermName("y1")).asMethod.typeParams) + println(typeOf[C].member(newTermName("y2")).asMethod.typeParams) + println(typeOf[C].member(newTermName("y3")).asMethod.typeParams) + println(typeOf[C].member(newTermName("y4")).asMethod.typeParams) }
\ No newline at end of file diff --git a/test/files/run/reflection-sanitychecks.scala b/test/files/run/reflection-sanitychecks.scala index a6a24088a4..e95d130460 100644 --- a/test/files/run/reflection-sanitychecks.scala +++ b/test/files/run/reflection-sanitychecks.scala @@ -19,10 +19,10 @@ object Test extends App { def test(tpe: Type): Unit = { def failsafe(action: => Any): Any = try action catch { case ex: Throwable => ex.toString } - println("field: " + failsafe(im.reflectField(tpe.member(newTermName("foo")).asTermSymbol).get)) - println("method: " + failsafe(im.reflectMethod(tpe.member(newTermName("bar")).asMethodSymbol)())) - println("class: " + failsafe(im.reflectClass(tpe.member(newTypeName("C")).asClassSymbol).reflectConstructor(typeOf[C].member(newTypeName("C")).asClassSymbol.typeSignature.member(newTermName("<init>")).asMethodSymbol)())) - println("object: " + failsafe(im.reflectModule(tpe.member(newTermName("O")).asModuleSymbol).instance)) + println("field: " + failsafe(im.reflectField(tpe.member(newTermName("foo")).asTerm).get)) + println("method: " + failsafe(im.reflectMethod(tpe.member(newTermName("bar")).asMethod)())) + println("class: " + failsafe(im.reflectClass(tpe.member(newTypeName("C")).asClass).reflectConstructor(typeOf[C].member(newTypeName("C")).asClass.typeSignature.member(newTermName("<init>")).asMethod)())) + println("object: " + failsafe(im.reflectModule(tpe.member(newTermName("O")).asModule).instance)) } test(typeOf[C]) diff --git a/test/files/run/toolbox_typecheck_macrosdisabled2.check b/test/files/run/toolbox_typecheck_macrosdisabled2.check index 53041e328d..fa55a09c40 100644 --- a/test/files/run/toolbox_typecheck_macrosdisabled2.check +++ b/test/files/run/toolbox_typecheck_macrosdisabled2.check @@ -28,7 +28,7 @@ def apply[U <: scala.reflect.base.Universe with Singleton]($m$untyped: scala.reflect.base.MirrorOf[U]): U#Type = {
val $u: U = $m$untyped.universe;
val $m: $u.Mirror = $m$untyped.asInstanceOf[$u.Mirror];
- $u.TypeRef.apply($u.ThisType.apply($m.staticPackage("scala").asModuleSymbol.moduleClass), $m.staticClass("scala.Array"), scala.collection.immutable.List.apply[$u.Type]($m.staticClass("scala.Int").asTypeSymbol.asTypeConstructor))
+ $u.TypeRef.apply($u.ThisType.apply($m.staticPackage("scala").asModule.moduleClass), $m.staticClass("scala.Array"), scala.collection.immutable.List.apply[$u.Type]($m.staticClass("scala.Int").asType.toTypeConstructor))
}
};
new $typecreator2()
|