summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2011-01-26 16:41:03 +0000
committerMartin Odersky <odersky@gmail.com>2011-01-26 16:41:03 +0000
commit6d43731ecf5f03fb3aa1f1aa062df51026a859fe (patch)
tree6fa612a1555057946560b83002651704b8720bff /src/compiler
parentd3d4a95ce79535b0468d186d95d9098e2f86817c (diff)
downloadscala-6d43731ecf5f03fb3aa1f1aa062df51026a859fe.tar.gz
scala-6d43731ecf5f03fb3aa1f1aa062df51026a859fe.tar.bz2
scala-6d43731ecf5f03fb3aa1f1aa062df51026a859fe.zip
removed a activeLocks tracking in Symbols, sinc...
removed a activeLocks tracking in Symbols, since no longer needed for presentation compiler.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/symtab/Symbols.scala13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/Symbols.scala b/src/compiler/scala/tools/nsc/symtab/Symbols.scala
index 12f044aafe..b4a31d4d9c 100644
--- a/src/compiler/scala/tools/nsc/symtab/Symbols.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Symbols.scala
@@ -23,10 +23,10 @@ trait Symbols extends reflect.generic.Symbols { self: SymbolTable =>
val emptySymbolArray = new Array[Symbol](0)
/** Used for deciding in the IDE whether we can interrupt the compiler */
- protected var activeLocks = 0
+ //protected var activeLocks = 0
/** Used for debugging only */
- protected var lockedSyms = collection.immutable.Set[Symbol]()
+ //protected var lockedSyms = collection.immutable.Set[Symbol]()
/** Used to keep track of the recursion depth on locked symbols */
private var recursionTable = immutable.Map.empty[Symbol, Int]
@@ -307,14 +307,16 @@ trait Symbols extends reflect.generic.Symbols { self: SymbolTable =>
} else { handler }
} else {
rawflags |= LOCKED
- activeLocks += 1
+// activeLocks += 1
+// lockedSyms += this
}
}
// Unlock a symbol
def unlock() = {
if ((rawflags & LOCKED) != 0L) {
- activeLocks -= 1
+// activeLocks -= 1
+// lockedSyms -= this
rawflags = rawflags & ~LOCKED
if (settings.Yrecursion.value != 0)
recursionTable -= this
@@ -699,7 +701,8 @@ trait Symbols extends reflect.generic.Symbols { self: SymbolTable =>
}
} else {
rawflags |= LOCKED
- activeLocks += 1
+// activeLocks += 1
+ // lockedSyms += this
}
val current = phase
try {