summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-08-10 00:56:07 +0000
committerPaul Phillips <paulp@improving.org>2011-08-10 00:56:07 +0000
commitff7416d88b67b26c5f066ef08801517c09bd2859 (patch)
treee33566f785eb9c0377bc30524a1679b00ec8362c /src/compiler
parent879e5af47db2ae6807aef26dd786e6ea920ac554 (diff)
downloadscala-ff7416d88b67b26c5f066ef08801517c09bd2859.tar.gz
scala-ff7416d88b67b26c5f066ef08801517c09bd2859.tar.bz2
scala-ff7416d88b67b26c5f066ef08801517c09bd2859.zip
Expanded the range of a warning, and made suppr...
Expanded the range of a warning, and made suppressed warnings visible. Modified the positioning of "permanently hidden" errors so that when there is more than one, the later ones are not ignored. Also changed the error suppression code to emit the error anyway if -Ydebug was given (it is prefixed with "[suppressed] ".) Since I can't be the only one who wondered where his errors were vanishing to. No review.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/backend/MSILPlatform.scala2
-rw-r--r--src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala1
-rw-r--r--src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala9
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Namers.scala8
4 files changed, 14 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/MSILPlatform.scala b/src/compiler/scala/tools/nsc/backend/MSILPlatform.scala
index 1606e6b1d0..9781111004 100644
--- a/src/compiler/scala/tools/nsc/backend/MSILPlatform.scala
+++ b/src/compiler/scala/tools/nsc/backend/MSILPlatform.scala
@@ -12,7 +12,7 @@ import msil.GenMSIL
trait MSILPlatform extends Platform[MSILType] {
import global._
- import definitions.{ ComparatorClass, BoxedNumberClass, getMember, getClass }
+ import definitions.{ ComparatorClass, BoxedNumberClass, getMember }
if (settings.verbose.value)
inform("[AssemRefs = " + settings.assemrefs.value + "]")
diff --git a/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala b/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala
index fb5a93fdc8..888413257f 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala
@@ -26,7 +26,6 @@ package icode
trait TypeKinds { self: ICodes =>
import global._
import definitions.{ ArrayClass, AnyRefClass, ObjectClass, NullClass, NothingClass, arrayType }
- import icodes.{ checkerDebug, NothingReference, NullReference }
/** A map from scala primitive Types to ICode TypeKinds */
lazy val primitiveTypeMap: Map[Symbol, TypeKind] = {
diff --git a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
index cad69deb7b..2ba8c8eb6b 100644
--- a/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
+++ b/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala
@@ -42,8 +42,13 @@ abstract class AbstractReporter extends Reporter {
val hidden = testAndLog(pos, severity)
if (severity == WARNING && noWarnings) ()
else {
- if (!hidden || isPromptSet) display(pos, msg, severity)
- if (isPromptSet) displayPrompt
+ if (!hidden || isPromptSet)
+ display(pos, msg, severity)
+ else if (settings.debug.value)
+ display(pos, "[ suppressed ] " + msg, severity)
+
+ if (isPromptSet)
+ displayPrompt
}
}
}
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index 2ebfdc7426..a94205e07a 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -315,6 +315,7 @@ trait Namers { self: Analyzer =>
}
def check(to: Name) = {
val e = context.scope.lookupEntry(to)
+
if (e != null && e.owner == context.scope && e.sym.exists)
warnRedundant(e.sym)
else if (context ne context.enclClass) {
@@ -334,7 +335,7 @@ trait Namers { self: Analyzer =>
}
}
def checkSelector(s: ImportSelector) = {
- val ImportSelector(from, _, to, _) = s
+ val ImportSelector(from, fromPos, to, _) = s
if (from != nme.WILDCARD && base != ErrorType) {
if (isValid(from)) {
if (currentRun.compileSourceFor(expr, from)) {
@@ -345,7 +346,10 @@ trait Namers { self: Analyzer =>
else if (!nme.isModuleName(from) || isValid(nme.stripModuleSuffix(from)))
notAMemberError(tree.pos, expr, from)
}
- checkNotRedundant(tree.pos, from, to)
+ // Setting the position at the import means that if there is more
+ // than one hidden names, the second will not be warned
+ // So it is the position of the actual hidden name.
+ checkNotRedundant(tree.pos withPoint fromPos, from, to)
}
}
def noDuplicates(names: List[Name], message: String) {