summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2014-01-20 15:59:21 +0300
committerEugene Burmako <xeno.by@gmail.com>2014-01-20 15:59:21 +0300
commit2d0aaf555dc3d43e245162a73ff06ed99667a6ee (patch)
treeb94f1f1b4244920bfca797ee7ed993d809dc6c1d
parent35300b46311c93c692744701275dbb4807f851e2 (diff)
downloadscala-2d0aaf555dc3d43e245162a73ff06ed99667a6ee.tar.gz
scala-2d0aaf555dc3d43e245162a73ff06ed99667a6ee.tar.bz2
scala-2d0aaf555dc3d43e245162a73ff06ed99667a6ee.zip
capitalizes ā€œsā€ in tostring
As suggested by the reviewers, tostringXXX variables in TypeToStrings.scala have been renamed to toStringXXX.
-rw-r--r--src/reflect/scala/reflect/internal/tpe/TypeToStrings.scala24
-rw-r--r--src/reflect/scala/reflect/runtime/JavaUniverseForce.scala4
-rw-r--r--src/reflect/scala/reflect/runtime/SynchronizedTypes.scala10
3 files changed, 19 insertions, 19 deletions
diff --git a/src/reflect/scala/reflect/internal/tpe/TypeToStrings.scala b/src/reflect/scala/reflect/internal/tpe/TypeToStrings.scala
index b08aabef85..ceb667365e 100644
--- a/src/reflect/scala/reflect/internal/tpe/TypeToStrings.scala
+++ b/src/reflect/scala/reflect/internal/tpe/TypeToStrings.scala
@@ -10,21 +10,21 @@ private[internal] trait TypeToStrings {
/** The maximum number of recursions allowed in toString
*/
- final val maxTostringRecursions = 50
+ final val maxToStringRecursions = 50
- private var _tostringRecursions = 0
- def tostringRecursions = _tostringRecursions
- def tostringRecursions_=(value: Int) = _tostringRecursions = value
+ private var _toStringRecursions = 0
+ def toStringRecursions = _toStringRecursions
+ def toStringRecursions_=(value: Int) = _toStringRecursions = value
- private var _tostringSubjects = HashSet[Type]()
- def tostringSubjects = _tostringSubjects
+ private var _toStringSubjects = HashSet[Type]()
+ def toStringSubjects = _toStringSubjects
protected def typeToString(tpe: Type): String =
- if (tostringSubjects contains tpe) {
+ if (toStringSubjects contains tpe) {
// handles self-referential anonymous classes and who knows what else
"..."
}
- else if (tostringRecursions >= maxTostringRecursions) {
+ else if (toStringRecursions >= maxToStringRecursions) {
devWarning("Exceeded recursion depth attempting to print " + util.shortClassOfInstance(tpe))
if (settings.debug)
(new Throwable).printStackTrace
@@ -33,11 +33,11 @@ private[internal] trait TypeToStrings {
}
else
try {
- tostringRecursions += 1
- tostringSubjects += tpe
+ toStringRecursions += 1
+ toStringSubjects += tpe
tpe.safeToString
} finally {
- tostringSubjects -= tpe
- tostringRecursions -= 1
+ toStringSubjects -= tpe
+ toStringRecursions -= 1
}
}
diff --git a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
index ac6dd0783d..9224749864 100644
--- a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
+++ b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala
@@ -41,8 +41,8 @@ trait JavaUniverseForce { self: runtime.JavaUniverse =>
// inaccessible: this._lubResults
// inaccessible: this._glbResults
// inaccessible: this._indent
- // inaccessible: this._tostringRecursions
- // inaccessible: this._tostringSubjects
+ // inaccessible: this._toStringRecursions
+ // inaccessible: this._toStringSubjects
// inaccessible: this.atomicIds
// inaccessible: this.atomicExistentialIds
// inaccessible: this._recursionTable
diff --git a/src/reflect/scala/reflect/runtime/SynchronizedTypes.scala b/src/reflect/scala/reflect/runtime/SynchronizedTypes.scala
index 12ada07a56..83d471f91e 100644
--- a/src/reflect/scala/reflect/runtime/SynchronizedTypes.scala
+++ b/src/reflect/scala/reflect/runtime/SynchronizedTypes.scala
@@ -81,12 +81,12 @@ private[reflect] trait SynchronizedTypes extends internal.Types { self: SymbolTa
override def indent = _indent.get
override def indent_=(value: String) = _indent.set(value)
- private lazy val _tostringRecursions = mkThreadLocalStorage(0)
- override def tostringRecursions = _tostringRecursions.get
- override def tostringRecursions_=(value: Int) = _tostringRecursions.set(value)
+ private lazy val _toStringRecursions = mkThreadLocalStorage(0)
+ override def toStringRecursions = _toStringRecursions.get
+ override def toStringRecursions_=(value: Int) = _toStringRecursions.set(value)
- private lazy val _tostringSubjects = mkThreadLocalStorage(new mutable.HashSet[Type])
- override def tostringSubjects = _tostringSubjects.get
+ private lazy val _toStringSubjects = mkThreadLocalStorage(new mutable.HashSet[Type])
+ override def toStringSubjects = _toStringSubjects.get
/* The idea of caches is as follows.
* When in reflexive mode, a cache is either null, or one sentinal