diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-16 14:58:09 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-16 15:00:35 -0700 |
commit | fada1ef6b315326ac0329d9e78951cfc95ad0eb0 (patch) | |
tree | a29fb94694bb033c33bfe7e8ec3be9534101fb53 /src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala | |
parent | 97d5179127e02af39b19076e78e4b2bc099eef94 (diff) | |
download | scala-fada1ef6b315326ac0329d9e78951cfc95ad0eb0.tar.gz scala-fada1ef6b315326ac0329d9e78951cfc95ad0eb0.tar.bz2 scala-fada1ef6b315326ac0329d9e78951cfc95ad0eb0.zip |
SI-6815 untangle isStable and hasVolatileType
`Symbol::isStable` is now independent of `Symbol::hasVolatileType`,
so that we can allow stable identifiers that are volatile in ident patterns.
This split is validated by SI-6815 and the old logic in RefChecks,
which seems to assume this independence, and thus I don't think ever worked:
```
if (member.isStable && !otherTp.isVolatile) {
if (memberTp.isVolatile)
overrideError("has a volatile type; cannot override a member with non-volatile type")
```
Introduces `admitsTypeSelection` and `isStableIdentifierPattern` in treeInfo,
and uses them instead of duplicating that logic all over the place.
Since volatility only matters in the context of type application,
`isStableIdentifierPattern` is used to check patterns (resulting in `==` checks)
and imports.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala index 61cdb63ac9..e1e26cd8c9 100644 --- a/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala +++ b/src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala @@ -141,7 +141,7 @@ trait ContextErrors { } issueNormalTypeError(tree, "stable identifier required, but "+tree+" found." + ( - if (isStableExceptVolatile(tree)) addendum else "")) + if (treeInfo.hasVolatileType(tree)) addendum else "")) setError(tree) } |