diff options
author | Paul Phillips <paulp@improving.org> | 2012-10-02 08:05:28 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-10-02 09:50:43 -0700 |
commit | b1307ff156c4b3ba736659ac3b5aee50bb38844f (patch) | |
tree | 10dbe8964e80275ed32ad0e842c03b9b62ab8460 /src/reflect/scala/reflect/internal/Symbols.scala | |
parent | 609b3b8b740447b212f0ee04c1e52d8c72b8dfc8 (diff) | |
download | scala-b1307ff156c4b3ba736659ac3b5aee50bb38844f.tar.gz scala-b1307ff156c4b3ba736659ac3b5aee50bb38844f.tar.bz2 scala-b1307ff156c4b3ba736659ac3b5aee50bb38844f.zip |
All the actual changes of tpe to tpe_* or tpeHK.
These are the call sites which formerly could be seen to
call .tpe on a symbol with unapplied type parameters. Now
each such call site makes an explicit choice about what is
intended for the result type.
Diffstat (limited to 'src/reflect/scala/reflect/internal/Symbols.scala')
-rw-r--r-- | src/reflect/scala/reflect/internal/Symbols.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index db2cb8d225..765a29946d 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -642,7 +642,7 @@ trait Symbols extends api.Symbols { self: SymbolTable => final def isStaticModule = isModule && isStatic && !isMethod final def isThisSym = isTerm && owner.thisSym == this final def isError = hasFlag(IS_ERROR) - final def isErroneous = isError || isInitialized && tpe.isErroneous + final def isErroneous = isError || isInitialized && tpe_*.isErroneous def isHigherOrderTypeParameter = owner.isTypeParameterOrSkolem @@ -1739,7 +1739,7 @@ trait Symbols extends api.Symbols { self: SymbolTable => def thisSym: Symbol = this /** The type of `this` in a class, or else the type of the symbol itself. */ - def typeOfThis = thisSym.tpe + def typeOfThis = thisSym.tpe_* /** If symbol is a class, the type <code>this.type</code> in this class, * otherwise <code>NoPrefix</code>. |