diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-07 16:45:27 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-07 16:45:27 -0800 |
| commit | 427e1864aec01b3b23ddc133c2090eec5c201be0 (patch) | |
| tree | 647dbee745a5dee2c6520fd9e06a243eeedd9838 | |
| parent | 4d618dca20cad709fd3f4b2346374e1c54501e01 (diff) | |
| parent | 0d68a874e2158d9739abd3977ae0d9edd4a76e59 (diff) | |
| download | scala-427e1864aec01b3b23ddc133c2090eec5c201be0.tar.gz scala-427e1864aec01b3b23ddc133c2090eec5c201be0.tar.bz2 scala-427e1864aec01b3b23ddc133c2090eec5c201be0.zip | |
Merge pull request #2084 from scalamacros/ticket/6113
SI-6113 typeOf now works for type lambdas
| -rw-r--r-- | src/compiler/scala/reflect/reify/codegen/GenTypes.scala | 3 | ||||
| -rw-r--r-- | src/compiler/scala/reflect/reify/phases/Reify.scala | 5 | ||||
| -rw-r--r-- | test/files/run/t6113.check | 1 | ||||
| -rw-r--r-- | test/files/run/t6113.scala | 6 |
4 files changed, 12 insertions, 3 deletions
diff --git a/src/compiler/scala/reflect/reify/codegen/GenTypes.scala b/src/compiler/scala/reflect/reify/codegen/GenTypes.scala index 7aa87dc2f8..bb7e1f9b56 100644 --- a/src/compiler/scala/reflect/reify/codegen/GenTypes.scala +++ b/src/compiler/scala/reflect/reify/codegen/GenTypes.scala @@ -69,8 +69,7 @@ trait GenTypes { def reificationIsConcrete: Boolean = state.reificationIsConcrete def spliceType(tpe: Type): Tree = { - val quantified = currentQuantified - if (tpe.isSpliceable && !(quantified contains tpe.typeSymbol)) { + if (tpe.isSpliceable && !(boundSymbolsInCallstack contains tpe.typeSymbol)) { if (reifyDebug) println("splicing " + tpe) val tagFlavor = if (concrete) tpnme.TypeTag.toString else tpnme.WeakTypeTag.toString diff --git a/src/compiler/scala/reflect/reify/phases/Reify.scala b/src/compiler/scala/reflect/reify/phases/Reify.scala index dc0028be38..8e13a45cdb 100644 --- a/src/compiler/scala/reflect/reify/phases/Reify.scala +++ b/src/compiler/scala/reflect/reify/phases/Reify.scala @@ -28,7 +28,10 @@ trait Reify extends GenSymbols finally currents = currents.tail } } - def currentQuantified = flatCollect(reifyStack.currents)({ case ExistentialType(quantified, _) => quantified }) + def boundSymbolsInCallstack = flatCollect(reifyStack.currents) { + case ExistentialType(quantified, _) => quantified + case PolyType(typeParams, _) => typeParams + } def current = reifyStack.currents.head def currents = reifyStack.currents diff --git a/test/files/run/t6113.check b/test/files/run/t6113.check new file mode 100644 index 0000000000..65fb3cd090 --- /dev/null +++ b/test/files/run/t6113.check @@ -0,0 +1 @@ +Foo[[X](Int, X)] diff --git a/test/files/run/t6113.scala b/test/files/run/t6113.scala new file mode 100644 index 0000000000..321cae86a3 --- /dev/null +++ b/test/files/run/t6113.scala @@ -0,0 +1,6 @@ +trait Foo[C[_]] + +object Test extends App { + import scala.reflect.runtime.universe._ + println(typeOf[Foo[({type l[X] = (Int, X)})#l]]) +}
\ No newline at end of file |