diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2010-10-12 16:49:15 +0000 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2010-10-12 16:49:15 +0000 |
| commit | 91f59159f8768bb7ff34155a97c568076f2da675 (patch) | |
| tree | c1484daa9254349cb06481982d265dacd20654cb | |
| parent | 96fef78cb4cb64265666bc0eda84f0d24927c57f (diff) | |
| download | scala-91f59159f8768bb7ff34155a97c568076f2da675.tar.gz scala-91f59159f8768bb7ff34155a97c568076f2da675.tar.bz2 scala-91f59159f8768bb7ff34155a97c568076f2da675.zip | |
Merged revisions 23235 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r23235 | moors | 2010-10-12 17:53:40 +0200 (Tue, 12 Oct 2010) | 1 line
closes #3915. needed to quote replacement string for regex
replace. no review ........
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 2 |
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) |