diff options
| author | Julien Richard-Foy <julien@richard-foy.fr> | 2012-08-10 00:34:39 +0200 |
|---|---|---|
| committer | Julien Richard-Foy <julien@richard-foy.fr> | 2012-08-10 09:05:58 +0200 |
| commit | 0b7aaa5251622b5e1192ef7da27823f150cb1918 (patch) | |
| tree | 5e29e1b2c2b1d52fcfdf835e1cf90ba2c253a497 | |
| parent | c0d5f0aaddc7bc309f84afd5d4f4b5c136c65816 (diff) | |
| download | scala-0b7aaa5251622b5e1192ef7da27823f150cb1918.tar.gz scala-0b7aaa5251622b5e1192ef7da27823f150cb1918.tar.bz2 scala-0b7aaa5251622b5e1192ef7da27823f150cb1918.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 723d95a499..855f63907e 100644 --- a/src/library/scala/StringContext.scala +++ b/src/library/scala/StringContext.scala @@ -63,7 +63,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]") } |