diff options
| author | Adriaan Moors <adriaan@lightbend.com> | 2017-02-20 14:20:10 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-20 14:20:10 -0800 |
| commit | 023a96afe30d04e6de771d0676b85b0889b89a37 (patch) | |
| tree | 27a9342ae392a21bffad4c717f39d47bed5ac718 /test/files/neg | |
| parent | e21ab425880b7c3fa4cca3c9503045823d250025 (diff) | |
| parent | 05cc3e2271d2c2226ded33bef5a03f0c70c6f66d (diff) | |
| download | scala-023a96afe30d04e6de771d0676b85b0889b89a37.tar.gz scala-023a96afe30d04e6de771d0676b85b0889b89a37.tar.bz2 scala-023a96afe30d04e6de771d0676b85b0889b89a37.zip | |
Merge pull request #5629 from som-snytt/issue/10120-quote-err
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, 15 insertions, 2 deletions
diff --git a/test/files/neg/badtok-1.check b/test/files/neg/badtok-1.check index b05bc60161..5d5a8e1f35 100644 --- a/test/files/neg/badtok-1.check +++ b/test/files/neg/badtok-1.check @@ -4,4 +4,10 @@ badtok-1.scala:2: error: unclosed character literal badtok-1.scala:2: error: unclosed character literal '42' ^ -two errors found +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 diff --git a/test/files/neg/badtok-1.scala b/test/files/neg/badtok-1.scala index 706e794946..cc7dc6cecc 100644 --- a/test/files/neg/badtok-1.scala +++ b/test/files/neg/badtok-1.scala @@ -1,2 +1,9 @@ // bug 989 '42' + + +// SI-10133 +''' + +// SI-10120 +'abc' diff --git a/test/files/neg/t5856.check b/test/files/neg/t5856.check index 08a61bdc07..306cc04177 100644 --- a/test/files/neg/t5856.check +++ b/test/files/neg/t5856.check @@ -1,4 +1,4 @@ -t5856.scala:10: error: invalid string interpolation: `$$', `$'ident or `$'BlockExpr expected +t5856.scala:10: error: invalid string interpolation $", expected: $$, $identifier or ${expression} val s9 = s"$" ^ t5856.scala:10: error: unclosed string literal |