summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Typers.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-12-05 19:42:17 +0000
committerPaul Phillips <paulp@improving.org>2010-12-05 19:42:17 +0000
commited5459550ef6fd8ed1c23cbe6cec8ba8a541c1e3 (patch)
treece6a4a005aa5619c201aa63a75fdb2b98781d1b0 /src/compiler/scala/tools/nsc/typechecker/Typers.scala
parent77eb8fefec3e62ead95c7d409ec5a28f30289ec3 (diff)
downloadscala-ed5459550ef6fd8ed1c23cbe6cec8ba8a541c1e3.tar.gz
scala-ed5459550ef6fd8ed1c23cbe6cec8ba8a541c1e3.tar.bz2
scala-ed5459550ef6fd8ed1c23cbe6cec8ba8a541c1e3.zip
Cleaned up and brought up to date the help text...
Cleaned up and brought up to date the help text for -X and -Y options. Made some enhancements to PhasesSetting, which are documented if you run scalac -X or -Y. (Try it!) Disabled some dead settings and renamed others to reflect their current purpose. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 65ce41c020..8ce26c92a1 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -1247,9 +1247,10 @@ trait Typers { self: Analyzer =>
}
if (!(selfType <:< parent.tpe.typeOfThis) &&
!phase.erasedTypes &&
- !context.owner.isSynthetic && // don't do this check for synthetic concrete classes for virtuals (part of DEVIRTUALIZE)
- !(settings.suppressVTWarn.value) &&
- !selfType.isErroneous && !parent.tpe.isErroneous)
+ !context.owner.isSynthetic && // don't check synthetic concrete classes for virtuals (part of DEVIRTUALIZE)
+ !settings.noSelfCheck.value && // setting to suppress this very check
+ !selfType.isErroneous &&
+ !parent.tpe.isErroneous)
{
//Console.println(context.owner);//DEBUG
//Console.println(context.owner.unsafeTypeParams);//DEBUG