diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2012-04-17 22:49:07 +0200 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-04-17 22:59:59 +0200 |
| commit | 745fe4e36631f86665eb1bef9cb22e6623894a56 (patch) | |
| tree | be29a95afaa7849a327da9de6b5675c4f9c4eaec | |
| parent | 2093bccc56cbfb77dbcb6e8e3224d2416feb39fb (diff) | |
| download | scala-745fe4e36631f86665eb1bef9cb22e6623894a56.tar.gz scala-745fe4e36631f86665eb1bef9cb22e6623894a56.tar.bz2 scala-745fe4e36631f86665eb1bef9cb22e6623894a56.zip | |
fixes tests
| -rw-r--r-- | src/compiler/scala/reflect/makro/runtime/Reifiers.scala | 2 | ||||
| -rw-r--r-- | test/files/jvm/interpreter.check | 5 | ||||
| -rw-r--r-- | test/files/run/existentials3.check | 16 |
3 files changed, 11 insertions, 12 deletions
diff --git a/src/compiler/scala/reflect/makro/runtime/Reifiers.scala b/src/compiler/scala/reflect/makro/runtime/Reifiers.scala index 3586adc590..7c96b568bd 100644 --- a/src/compiler/scala/reflect/makro/runtime/Reifiers.scala +++ b/src/compiler/scala/reflect/makro/runtime/Reifiers.scala @@ -27,7 +27,7 @@ trait Reifiers { def reifyErasure(tpe: Type): Tree = { val positionBearer = enclosingMacros.find(c => c.macroApplication.pos != NoPosition).map(_.macroApplication).getOrElse(EmptyTree).asInstanceOf[Tree] - val typetagInScope = callsiteTyper.context.withMacrosDisabled(callsiteTyper.resolveTypeTag(positionBearer, gen.mkAttributedRef(Reflect_mirror).tpe, tpe, full = true)) + val typetagInScope = callsiteTyper.context.withMacrosDisabled(callsiteTyper.resolveTypeTag(positionBearer, singleType(Reflect_mirror.owner.thisPrefix, Reflect_mirror), tpe, full = true)) def typetagIsSynthetic(tree: Tree) = tree.isInstanceOf[Block] || (tree exists (sub => sub.symbol == TypeTagModule || sub.symbol == ConcreteTypeTagModule)) typetagInScope match { case success if !success.isEmpty && !typetagIsSynthetic(success) => diff --git a/test/files/jvm/interpreter.check b/test/files/jvm/interpreter.check index 85ec46c5f5..dc835bf8b6 100644 --- a/test/files/jvm/interpreter.check +++ b/test/files/jvm/interpreter.check @@ -316,9 +316,8 @@ scala> /* */
*/
-scala>
-scala>
+You typed two blank lines. Starting a new command.
scala> // multi-line string
@@ -326,7 +325,7 @@ scala> """ hello
there
"""
-res9: String =
+res12: String =
"
hello
there
diff --git a/test/files/run/existentials3.check b/test/files/run/existentials3.check index 85bc430a21..e2c9382ab4 100644 --- a/test/files/run/existentials3.check +++ b/test/files/run/existentials3.check @@ -1,24 +1,24 @@ -ConcreteTypeTag[Bar.type], t=TypeRef, s= <: scala.runtime.AbstractFunction0[Bar] with Serializable{case def unapply(x$0: Bar): Boolean} with Singleton
-ConcreteTypeTag[Bar], t=TypeRef, s= <: Test.ToS with Product with Serializable{def copy(): Bar}
+ConcreteTypeTag[Bar.type], t=AbstractTypeRef, s= <: scala.runtime.AbstractFunction0[Bar] with Serializable{case def unapply(x$0: Bar): Boolean} with Singleton
+ConcreteTypeTag[Bar], t=AbstractTypeRef, s= <: Test.ToS with Product with Serializable{def copy(): Bar}
ConcreteTypeTag[Test.ToS], t=RefinedType, s=f3
ConcreteTypeTag[Test.ToS], t=RefinedType, s=f4
ConcreteTypeTag[Test.ToS], t=RefinedType, s=f5
ConcreteTypeTag[() => Test.ToS], t=TypeRef, s=class Function0
ConcreteTypeTag[() => Test.ToS], t=TypeRef, s=class Function0
-ConcreteTypeTag[$anon], t=TypeRef, s= <: B with Test.ToS
-ConcreteTypeTag[$anon], t=TypeRef, s= <: B with A with Test.ToS
+ConcreteTypeTag[$anon], t=AbstractTypeRef, s= <: B with Test.ToS
+ConcreteTypeTag[$anon], t=AbstractTypeRef, s= <: B with A with Test.ToS
TypeTag[List[Object{type T1}#T1]], t=TypeRef, s=class List
ConcreteTypeTag[List[Seq[Int]]], t=TypeRef, s=class List
ConcreteTypeTag[List[Seq[U forSome { type U <: Int }]]], t=TypeRef, s=class List
-ConcreteTypeTag[Bar.type], t=TypeRef, s= <: scala.runtime.AbstractFunction0[Bar] with Serializable{case def unapply(x$0: Bar): Boolean} with Singleton
-ConcreteTypeTag[Bar], t=TypeRef, s= <: Test.ToS with Product with Serializable{def copy(): Bar}
+ConcreteTypeTag[Bar.type], t=AbstractTypeRef, s= <: scala.runtime.AbstractFunction0[Bar] with Serializable{case def unapply(x$0: Bar): Boolean} with Singleton
+ConcreteTypeTag[Bar], t=AbstractTypeRef, s= <: Test.ToS with Product with Serializable{def copy(): Bar}
ConcreteTypeTag[Test.ToS], t=RefinedType, s=g3
ConcreteTypeTag[Test.ToS], t=RefinedType, s=g4
ConcreteTypeTag[Test.ToS], t=RefinedType, s=g5
ConcreteTypeTag[() => Test.ToS], t=TypeRef, s=class Function0
ConcreteTypeTag[() => Test.ToS], t=TypeRef, s=class Function0
-ConcreteTypeTag[$anon], t=TypeRef, s= <: B with Test.ToS
-ConcreteTypeTag[$anon], t=TypeRef, s= <: B with A with Test.ToS
+ConcreteTypeTag[$anon], t=AbstractTypeRef, s= <: B with Test.ToS
+ConcreteTypeTag[$anon], t=AbstractTypeRef, s= <: B with A with Test.ToS
TypeTag[List[Object{type T1}#T1]], t=TypeRef, s=class List
ConcreteTypeTag[List[Seq[Int]]], t=TypeRef, s=class List
ConcreteTypeTag[List[Seq[U forSome { type U <: Int }]]], t=TypeRef, s=class List
|