diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-09-04 00:14:13 -0700 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-09-04 00:14:13 -0700 |
commit | 0195d7e7cd1f0200915a2a1741f5bd5e5c27def6 (patch) | |
tree | b6cb43f8fd88b39d9b5084d07f136d371a921fc5 /src/reflect | |
parent | 350ec9547908f0692431370cb1510dcb769576ff (diff) | |
parent | bce786f070afe383d203c4d809ef69803330b340 (diff) | |
download | scala-0195d7e7cd1f0200915a2a1741f5bd5e5c27def6.tar.gz scala-0195d7e7cd1f0200915a2a1741f5bd5e5c27def6.tar.bz2 scala-0195d7e7cd1f0200915a2a1741f5bd5e5c27def6.zip |
Merge pull request #2876 from retronym/ticket/7782
SI-7782 Derive type skolems at the ground level
Diffstat (limited to 'src/reflect')
-rw-r--r-- | src/reflect/scala/reflect/internal/ExistentialsAndSkolems.scala | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/ExistentialsAndSkolems.scala b/src/reflect/scala/reflect/internal/ExistentialsAndSkolems.scala index 3bcb793926..2c2ed351c9 100644 --- a/src/reflect/scala/reflect/internal/ExistentialsAndSkolems.scala +++ b/src/reflect/scala/reflect/internal/ExistentialsAndSkolems.scala @@ -19,6 +19,9 @@ trait ExistentialsAndSkolems { * can be deskolemized to the original type parameter. (A skolem is a * representation of a bound variable when viewed inside its scope.) * !!!Adriaan: this does not work for hk types. + * + * Skolems will be created at level 0, rather than the current value + * of `skolemizationLevel`. (See SI-7782) */ def deriveFreshSkolems(tparams: List[Symbol]): List[Symbol] = { class Deskolemizer extends LazyType { @@ -30,7 +33,11 @@ trait ExistentialsAndSkolems { sym setInfo sym.deSkolemize.info.substSym(typeParams, typeSkolems) } } - (new Deskolemizer).typeSkolems + + val saved = skolemizationLevel + skolemizationLevel = 0 + try new Deskolemizer().typeSkolems + finally skolemizationLevel = saved } def isRawParameter(sym: Symbol) = // is it a type parameter leaked by a raw type? |