diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 1 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/util/EditDistance.scala | 31 | ||||
| -rw-r--r-- | src/library/scala/collection/GenSeqLike.scala | 4 | ||||
| -rw-r--r-- | src/library/scala/collection/TraversableLike.scala | 4 | ||||
| -rw-r--r-- | src/library/scala/math/package.scala | 12 |
6 files changed, 27 insertions, 27 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index 1f8fa5bbe2..6be15e4e98 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -178,7 +178,6 @@ trait ScalaSettings extends AbsScalaSettings val exposeEmptyPackage = BooleanSetting("-Yexpose-empty-package", "Internal only: expose the empty package.").internalOnly() val YnoProductN = BooleanSetting ("-Yno-productN", "Do not add ProductN to case classes") - val suggestIdents = BooleanSetting("-Ysuggest-idents", "Suggest alternatives for `not found` identifiers") def stop = stopAfter diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 30d10325be..7671ccbed7 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -3874,7 +3874,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser { else { val similar = ( // name length check to limit unhelpful suggestions for e.g. "x" and "b1" - if (settings.suggestIdents.value && name.length > 2) { + if (name.length > 2) { val allowed = ( startingIdentContext.enclosingContextChain flatMap (ctx => ctx.scope.toList ++ ctx.imports.flatMap(_.allImportedSymbols)) diff --git a/src/compiler/scala/tools/util/EditDistance.scala b/src/compiler/scala/tools/util/EditDistance.scala index 704286d47e..a8d7408532 100644 --- a/src/compiler/scala/tools/util/EditDistance.scala +++ b/src/compiler/scala/tools/util/EditDistance.scala @@ -8,22 +8,22 @@ package util object EditDistance { def similarString(name: String, allowed: TraversableOnce[String]): String = { - val suggested = suggestions(name, allowed.toSeq, maxDistance = 2, maxSuggestions = 2) - if (suggested.isEmpty) "" + val suggested = suggestions(name, allowed.toSeq, maxDistance = 1, maxSuggestions = 2) + if (suggested.isEmpty) "" else suggested.mkString(" (similar: ", ", ", ")") } - def suggestions(a: String, bs: Seq[String], maxDistance: Int = 3, maxSuggestions: Int = 3): Seq[String] = - bs.map { b => (b, distance(a, b) ) } filter (_._2 <= maxDistance) sortBy(_._2) take(maxSuggestions) map(_._1) + def suggestions(a: String, bs: Seq[String], maxDistance: Int, maxSuggestions: Int): Seq[String] = ( + bs map (b => (b, distance(a, b))) + filter (_._2 <= maxDistance) + sortBy (_._2) + take (maxSuggestions) + map (_._1) + ) - def distance(a: String, b: String): Int = - levenshtein(a, b, insertCost = 1, deleteCost = 1, subCost = 2, transposeCost = 1, matchCost = -1, true) + def distance(a: String, b: String): Int = levenshtein(a, b, transpositions = true) - /** Translated from the java version at - * http://www.merriampark.com/ld.htm - * which is declared to be public domain. - */ - def levenshtein(s: String, t: String, insertCost: Int = 1, deleteCost: Int = 1, subCost: Int = 1, transposeCost: Int = 1, matchCost: Int = 0, transpositions: Boolean = false): Int = { + def levenshtein(s: String, t: String, transpositions: Boolean): Int = { val n = s.length val m = t.length if (n == 0) return m @@ -35,18 +35,17 @@ object EditDistance { for (i <- 1 to n ; val s_i = s(i - 1) ; j <- 1 to m) { val t_j = t(j - 1) - val cost = if (s_i == t_j) matchCost else subCost - val tcost = if (s_i == t_j) matchCost else transposeCost + val cost = if (s_i == t_j) 0 else 1 - val c1 = d(i - 1)(j) + deleteCost - val c2 = d(i)(j - 1) + insertCost + val c1 = d(i - 1)(j) + 1 + val c2 = d(i)(j - 1) + 1 val c3 = d(i - 1)(j - 1) + cost d(i)(j) = c1 min c2 min c3 if (transpositions) { if (i > 1 && j > 1 && s(i - 1) == t(j - 2) && s(i - 2) == t(j - 1)) - d(i)(j) = d(i)(j) min (d(i - 2)(j - 2) + cost) + d(i)(j) = d(i)(j) min (d(i - 2)(j - 2) + cost) } } diff --git a/src/library/scala/collection/GenSeqLike.scala b/src/library/scala/collection/GenSeqLike.scala index b3dd4764a9..63e9543711 100644 --- a/src/library/scala/collection/GenSeqLike.scala +++ b/src/library/scala/collection/GenSeqLike.scala @@ -276,6 +276,8 @@ trait GenSeqLike[+A, +Repr] extends GenIterableLike[A, Repr] with Equals with Pa /** A copy of the $coll with an element prepended. * * Note that :-ending operators are right associative (see example). + * A mnemonic for `+:` vs. `:+` is: the COLon goes on the COLlection side. + * * Also, the original $coll is not modified, so you will want to capture the result. * * Example: @@ -304,6 +306,8 @@ trait GenSeqLike[+A, +Repr] extends GenIterableLike[A, Repr] with Equals with Pa /** A copy of this $coll with an element appended. * + * A mnemonic for `+:` vs. `:+` is: the COLon goes on the COLlection side. + * * $willNotTerminateInf * @param elem the appended element * @tparam B the element type of the returned $coll. diff --git a/src/library/scala/collection/TraversableLike.scala b/src/library/scala/collection/TraversableLike.scala index 6fa05bd85b..4f0fec1de3 100644 --- a/src/library/scala/collection/TraversableLike.scala +++ b/src/library/scala/collection/TraversableLike.scala @@ -159,8 +159,10 @@ trait TraversableLike[+A, +Repr] extends HasNewBuilder[A, Repr] /** As with `++`, returns a new collection containing the elements from the left operand followed by the * elements from the right operand. + * * It differs from `++` in that the right operand determines the type of * the resulting collection rather than the left one. + * Mnemonic: the COLon is on the side of the new COLlection type. * * Example: * {{{ @@ -195,8 +197,10 @@ trait TraversableLike[+A, +Repr] extends HasNewBuilder[A, Repr] /** As with `++`, returns a new collection containing the elements from the * left operand followed by the elements from the right operand. + * * It differs from `++` in that the right operand determines the type of * the resulting collection rather than the left one. + * Mnemonic: the COLon is on the side of the new COLlection type. * * Example: * {{{ diff --git a/src/library/scala/math/package.scala b/src/library/scala/math/package.scala index 8948722340..0417461f85 100644 --- a/src/library/scala/math/package.scala +++ b/src/library/scala/math/package.scala @@ -127,15 +127,9 @@ package object math { else if (x > 0) 1.0f else x // NaN - def signum(x: Long): Long = - if (x == 0l) 0l - else if (x < 0) -1l - else 1l - - def signum(x: Int): Int = - if (x == 0) 0 - else if (x < 0) -1 - else 1 + def signum(x: Long): Long = java.lang.Long.signum(x) + + def signum(x: Int): Int = java.lang.Integer.signum(x) // ----------------------------------------------------------------------- // root functions |