diff options
| author | Paul Phillips <paulp@improving.org> | 2012-12-21 12:39:02 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-12-28 15:15:52 -0800 |
| commit | 394cc426c1ff1da53146679b4e2995ece52a133e (patch) | |
| tree | a93bf5d05957f3e6b9100e3365c9a1cf0aa1f181 /test/files/run/repl-colon-type.check | |
| parent | ed40f5cbdf35d09b02898e9c0950b9bd34c1f858 (diff) | |
| download | scala-394cc426c1ff1da53146679b4e2995ece52a133e.tar.gz scala-394cc426c1ff1da53146679b4e2995ece52a133e.tar.bz2 scala-394cc426c1ff1da53146679b4e2995ece52a133e.zip | |
Fix and simplify typedTypeConstructor.
Investigating the useful output of devWarning (-Xdev people,
it's good for you) led back to this comment:
"normalize to get rid of type aliases"
You may know that this is not all the normalizing does.
Normalizing also turns TypeRefs with unapplied arguments
(type constructors) into PolyTypes. That means that when
typedParentType would call typedTypeConstructor it would
find its parent had morphed into a PolyType. Not that it
noticed; it would blithely continue and unwittingly discard
the type arguments by way of appliedType (which smoothly
logged the incident, thank you appliedType.)
The simplification of typedTypeConstructor:
There was a whole complicated special treatment of AnyRef
here which appears to have become unnecessary. Removed special
treatment and lit a candle for regularity.
Updated lots of tests regarding newly not-so-special AnyRef.
Diffstat (limited to 'test/files/run/repl-colon-type.check')
| -rw-r--r-- | test/files/run/repl-colon-type.check | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/files/run/repl-colon-type.check b/test/files/run/repl-colon-type.check index 7716221f54..4cd0e1d588 100644 --- a/test/files/run/repl-colon-type.check +++ b/test/files/run/repl-colon-type.check @@ -75,10 +75,10 @@ scala> :type -v List(1,2,3) filter _ // Internal Type structure TypeRef( - TypeSymbol(abstract trait Function1[-T1, +R] extends Object) + TypeSymbol(abstract trait Function1[-T1, +R] extends AnyRef) args = List( TypeRef( - TypeSymbol(abstract trait Function1[-T1, +R] extends Object) + TypeSymbol(abstract trait Function1[-T1, +R] extends AnyRef) args = List( TypeRef(TypeSymbol(final abstract class Int extends AnyVal)) TypeRef( @@ -145,7 +145,7 @@ Int => Iterator[List[Nothing]] // Internal Type structure TypeRef( - TypeSymbol(abstract trait Function1[-T1, +R] extends Object) + TypeSymbol(abstract trait Function1[-T1, +R] extends AnyRef) args = List( TypeRef(TypeSymbol(final abstract class Int extends AnyVal)) TypeRef( @@ -178,7 +178,7 @@ PolyType( typeParams = List(TypeParam(T <: AnyVal)) resultType = NullaryMethodType( TypeRef( - TypeSymbol(abstract trait Function1[-T1, +R] extends Object) + TypeSymbol(abstract trait Function1[-T1, +R] extends AnyRef) args = List( TypeRef(TypeSymbol(final abstract class Int extends AnyVal)) TypeRef( |