diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2017-02-21 11:57:05 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-21 11:57:05 -0800 |
| commit | d60f6e340766f8876adb21092081bf264c64597f (patch) | |
| tree | c465fa15a9e1d6207c45107b318818aa84b6ea50 /test/files/neg | |
| parent | a8c4a54d18c5560417d8c41db8b23a10fe8d616d (diff) | |
| download | scala-d60f6e340766f8876adb21092081bf264c64597f.tar.gz scala-d60f6e340766f8876adb21092081bf264c64597f.tar.bz2 scala-d60f6e340766f8876adb21092081bf264c64597f.zip | |
Revert "SI-10133 Require escaped single quote char lit"
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/badtok-1.check | 8 | ||||
| -rw-r--r-- | test/files/neg/badtok-1.scala | 7 | ||||
| -rw-r--r-- | test/files/neg/t5856.check | 2 |
3 files changed, 2 insertions, 15 deletions
diff --git a/test/files/neg/badtok-1.check b/test/files/neg/badtok-1.check index 5d5a8e1f35..b05bc60161 100644 --- a/test/files/neg/badtok-1.check +++ b/test/files/neg/badtok-1.check @@ -4,10 +4,4 @@ badtok-1.scala:2: error: unclosed character literal badtok-1.scala:2: error: unclosed character literal '42' ^ -badtok-1.scala:6: error: empty character literal (use '\'' for single quote) -''' -^ -badtok-1.scala:9: error: unclosed character literal (or use " for string literal "abc") -'abc' - ^ -four errors found +two errors found diff --git a/test/files/neg/badtok-1.scala b/test/files/neg/badtok-1.scala index cc7dc6cecc..706e794946 100644 --- a/test/files/neg/badtok-1.scala +++ b/test/files/neg/badtok-1.scala @@ -1,9 +1,2 @@ // bug 989 '42' - - -// SI-10133 -''' - -// SI-10120 -'abc' diff --git a/test/files/neg/t5856.check b/test/files/neg/t5856.check index 306cc04177..08a61bdc07 100644 --- a/test/files/neg/t5856.check +++ b/test/files/neg/t5856.check @@ -1,4 +1,4 @@ -t5856.scala:10: error: invalid string interpolation $", expected: $$, $identifier or ${expression} +t5856.scala:10: error: invalid string interpolation: `$$', `$'ident or `$'BlockExpr expected val s9 = s"$" ^ t5856.scala:10: error: unclosed string literal |