diff options
| author | Paul Phillips <paulp@improving.org> | 2013-02-23 04:46:26 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-02-23 05:47:37 -0800 |
| commit | ed2a0ac9a169b13a10cb4eed0a5a5b3904766ec5 (patch) | |
| tree | bd21f50f57c8aa7a1ce76bca2fc3469937ee4c41 /src/reflect | |
| parent | 6e2f0fa09dc7f264865433865238661657facf09 (diff) | |
| parent | 88b2915790a6a2ccfa490de6e36aa355148a42b2 (diff) | |
| download | scala-ed2a0ac9a169b13a10cb4eed0a5a5b3904766ec5.tar.gz scala-ed2a0ac9a169b13a10cb4eed0a5a5b3904766ec5.tar.bz2 scala-ed2a0ac9a169b13a10cb4eed0a5a5b3904766ec5.zip | |
Merge remote-tracking branch 'origin/2.10.x' into master
* origin/2.10.x:
SI-7171 Consider prefix when assessing type finality.
please ant with filenames, add comments
Fixed error in reflection API docs about linearization order on method baseClasses
Shadowed Implict typo (fixes no issue)
remove unused imports
Conflicts:
src/reflect/scala/reflect/internal/Types.scala
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/api/Symbols.scala | 2 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/api/Types.scala | 2 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Types.scala | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/reflect/scala/reflect/api/Symbols.scala b/src/reflect/scala/reflect/api/Symbols.scala index a4a4277239..dbad3dd478 100644 --- a/src/reflect/scala/reflect/api/Symbols.scala +++ b/src/reflect/scala/reflect/api/Symbols.scala @@ -946,7 +946,7 @@ trait Symbols { self: Universe => def knownDirectSubclasses: Set[Symbol] /** The list of all base classes of this type (including its own typeSymbol) - * in reverse linearization order, starting with the class itself and ending + * in linearization order, starting with the class itself and ending * in class Any. * * @group Class diff --git a/src/reflect/scala/reflect/api/Types.scala b/src/reflect/scala/reflect/api/Types.scala index e8e9e9c048..e5140f23e5 100644 --- a/src/reflect/scala/reflect/api/Types.scala +++ b/src/reflect/scala/reflect/api/Types.scala @@ -144,7 +144,7 @@ trait Types extends ImplicitTags { def =:= (that: Type): Boolean /** The list of all base classes of this type (including its own typeSymbol) - * in reverse linearization order, starting with the class itself and ending + * in linearization order, starting with the class itself and ending * in class Any. */ def baseClasses: List[Symbol] diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala index ce7fae8628..5cb6f78874 100644 --- a/src/reflect/scala/reflect/internal/Types.scala +++ b/src/reflect/scala/reflect/internal/Types.scala @@ -372,7 +372,7 @@ trait Types extends api.Types { self: SymbolTable => * This is assessed to be the case if the class is final, * and all type parameters (if any) are invariant. */ - def isFinalType = typeSymbol.hasOnlyBottomSubclasses + def isFinalType = typeSymbol.hasOnlyBottomSubclasses && prefix.isStable /** Is this type completed (i.e. not a lazy type)? */ def isComplete: Boolean = true |