diff options
| author | Julien Richard-Foy <julien@richard-foy.fr> | 2012-08-10 00:34:39 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2012-11-13 22:29:18 +0100 |
| commit | d08060ee326345970cd1dbfbb73d227105e35d67 (patch) | |
| tree | 97562558e07e0f26c4d928ce32c6d766632a7d9d | |
| parent | 8b598436f64ca4e980c8a38f642085b4d23e2327 (diff) | |
| download | scala-d08060ee326345970cd1dbfbb73d227105e35d67.tar.gz scala-d08060ee326345970cd1dbfbb73d227105e35d67.tar.bz2 scala-d08060ee326345970cd1dbfbb73d227105e35d67.zip | |
Fix raw string interpolator: string parts which were after the first argument were still escaped
| -rw-r--r-- | src/library/scala/StringContext.scala | 2 | ||||
| -rw-r--r-- | test/files/run/rawstrings.check | 2 | ||||
| -rw-r--r-- | test/files/run/rawstrings.scala | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/StringContext.scala b/src/library/scala/StringContext.scala index f72547724d..8be0cb1619 100644 --- a/src/library/scala/StringContext.scala +++ b/src/library/scala/StringContext.scala @@ -120,7 +120,7 @@ case class StringContext(parts: String*) { val bldr = new java.lang.StringBuilder(process(pi.next())) while (ai.hasNext) { bldr append ai.next - bldr append treatEscapes(pi.next()) + bldr append process(pi.next()) } bldr.toString } diff --git a/test/files/run/rawstrings.check b/test/files/run/rawstrings.check index 36e63594df..2b6c40725a 100644 --- a/test/files/run/rawstrings.check +++ b/test/files/run/rawstrings.check @@ -1 +1 @@ -[\n\t'"$] +[\n\t'"$\n] diff --git a/test/files/run/rawstrings.scala b/test/files/run/rawstrings.scala index 9df64f6625..b4d6e0c40a 100644 --- a/test/files/run/rawstrings.scala +++ b/test/files/run/rawstrings.scala @@ -1,3 +1,3 @@ object Test extends App { - println(raw"[\n\t'${'"'}$$]") + println(raw"[\n\t'${'"'}$$\n]") } |