summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2010-10-12 15:53:40 +0000
committerAdriaan Moors <adriaan.moors@epfl.ch>2010-10-12 15:53:40 +0000
commitcf11854cf0f21b57634d8e7ec68ac23539ed4fb6 (patch)
tree88a3a05aee1aca44b00f00d049f1361e14e16ad8 /src
parent44d0bb2426c23ede04a0f6c5873bdb8567eac5e3 (diff)
downloadscala-cf11854cf0f21b57634d8e7ec68ac23539ed4fb6.tar.gz
scala-cf11854cf0f21b57634d8e7ec68ac23539ed4fb6.tar.bz2
scala-cf11854cf0f21b57634d8e7ec68ac23539ed4fb6.zip
closes #3915.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Implicits.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
index ad39736ba3..4d0cc0c041 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
@@ -950,7 +950,7 @@ self: Analyzer =>
// http://dcsobral.blogspot.com/2010/01/string-interpolation-in-scala-with.html
private def interpolate(text: String, vars: Map[String, String]) = { import scala.util.matching.Regex
"""\$\{([^}]+)\}""".r.replaceAllIn(text, (_: Regex.Match) match {
- case Regex.Groups(v) => vars.getOrElse(v, "")
+ case Regex.Groups(v) => java.util.regex.Matcher.quoteReplacement(vars.getOrElse(v, "")) // #3915: need to quote replacement string since it may include $'s (such as the interpreter's $iw)
})}
private lazy val typeParamNames: List[String] = sym.typeParams.map(_.decodedName)