diff options
author | Som Snytt <som.snytt@gmail.com> | 2012-04-26 15:35:57 -0700 |
---|---|---|
committer | Som Snytt <som.snytt@gmail.com> | 2012-04-26 15:35:57 -0700 |
commit | 2a9cce8a6859a34c259d0b399687df3a242de16b (patch) | |
tree | ca15e0b069265ff7ec43d147e613bb044f38c91a /test/files/neg/t5510.scala | |
parent | 47bfd744177121de08fed489a5b0b1b59a1ae06a (diff) | |
parent | f7e1a4940386491b0691147b12b1b321c4cce2c5 (diff) | |
download | scala-2a9cce8a6859a34c259d0b399687df3a242de16b.tar.gz scala-2a9cce8a6859a34c259d0b399687df3a242de16b.tar.bz2 scala-2a9cce8a6859a34c259d0b399687df3a242de16b.zip |
SI-5543: Merge with trunk
Reverts name unenmanglement that was objectionable in the previous patch
commit 47bfd744177121de08fed489a5b0b1b59a1ae06a.
Diffstat (limited to 'test/files/neg/t5510.scala')
-rw-r--r-- | test/files/neg/t5510.scala | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/files/neg/t5510.scala b/test/files/neg/t5510.scala new file mode 100644 index 0000000000..12630eb2cd --- /dev/null +++ b/test/files/neg/t5510.scala @@ -0,0 +1,7 @@ +object Test { + val s1 = s"xxx + val s2 = s"xxx $x + val s3 = s"xxx $$ + val s4 = ""s" + val s5 = ""s""" $s1 $s2 s" +} |