summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-07-23 22:50:46 +0000
committerPaul Phillips <paulp@improving.org>2011-07-23 22:50:46 +0000
commitc3c1c65d5fa2a6fd94e8f3bda7c5b4b5408bb789 (patch)
tree59302a13061022c78058c65d41774bb94983f8d9 /src/compiler/scala/tools/nsc/typechecker/Contexts.scala
parent5c61410fe5b8fd636bde6484f04a2d1160ed7eb4 (diff)
downloadscala-c3c1c65d5fa2a6fd94e8f3bda7c5b4b5408bb789.tar.gz
scala-c3c1c65d5fa2a6fd94e8f3bda7c5b4b5408bb789.tar.bz2
scala-c3c1c65d5fa2a6fd94e8f3bda7c5b4b5408bb789.zip
Since trunk seems to be undergoing all kinds of...
Since trunk seems to be undergoing all kinds of changes of the sort which touch lots of files, the time is ripe for various search/replace improvements which have stacked up. This one is the replacement of all "if (settings.debug.value) log" with "debuglog" since as noted in a recent commit, the inliner will take care of that for you. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Contexts.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Contexts.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
index 8e22da83b0..96b27b58ae 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
@@ -504,7 +504,7 @@ trait Contexts { self: Analyzer =>
def restoreTypeBounds(tp: Type): Type = {
var current = tp
for ((sym, info) <- savedTypeBounds) {
- if (settings.debug.value) log("resetting " + sym + " to " + info);
+ debuglog("resetting " + sym + " to " + info);
sym.info match {
case TypeBounds(lo, hi) if (hi <:< lo && lo <:< hi) =>
current = current.instantiateTypeParams(List(sym), List(lo))
@@ -558,7 +558,7 @@ trait Contexts { self: Analyzer =>
}
impls
}
- //if (settings.debug.value) log("collect implicit imports " + imp + "=" + collect(imp.tree.selectors))//DEBUG
+ //debuglog("collect implicit imports " + imp + "=" + collect(imp.tree.selectors))//DEBUG
collect(imp.tree.selectors)
}
@@ -570,14 +570,14 @@ trait Contexts { self: Analyzer =>
val newImplicits: List[ImplicitInfo] =
if (owner != nextOuter.owner && owner.isClass && !owner.isPackageClass && !inSelfSuperCall) {
if (!owner.isInitialized) return nextOuter.implicitss
- // if (settings.debug.value) log("collect member implicits " + owner + ", implicit members = " + owner.thisType.implicitMembers)//DEBUG
+ // debuglog("collect member implicits " + owner + ", implicit members = " + owner.thisType.implicitMembers)//DEBUG
val savedEnclClass = enclClass
this.enclClass = this
val res = collectImplicits(owner.thisType.implicitMembers, owner.thisType)
this.enclClass = savedEnclClass
res
} else if (scope != nextOuter.scope && !owner.isPackageClass) {
- if (settings.debug.value) log("collect local implicits " + scope.toList)//DEBUG
+ debuglog("collect local implicits " + scope.toList)//DEBUG
collectImplicits(scope.toList, NoPrefix)
} else if (imports != nextOuter.imports) {
assert(imports.tail == nextOuter.imports)