summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-07-20 14:54:05 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-07-20 14:54:05 -0700
commit15fba6bd2eb45ca47e975ef033aaf20136d71c67 (patch)
tree4c4582657e095e8fb711af2c23ef6e0ae61a3233 /test/files/neg
parentb0742ebacb5fb5982baa1096ad12457d9b14124e (diff)
parent32fd97df41bb2e99018f024f41b06490e41bd7ad (diff)
downloadscala-15fba6bd2eb45ca47e975ef033aaf20136d71c67.tar.gz
scala-15fba6bd2eb45ca47e975ef033aaf20136d71c67.tar.bz2
scala-15fba6bd2eb45ca47e975ef033aaf20136d71c67.zip
Merge pull request #924 from hubertp/2.10.x-issue/5385
Fix for SI-5385.
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/t4069.check2
-rw-r--r--test/files/neg/t4584.check7
-rw-r--r--test/files/neg/unicode-unterminated-quote.check5
3 files changed, 10 insertions, 4 deletions
diff --git a/test/files/neg/t4069.check b/test/files/neg/t4069.check
index 91bf882cec..08e937bdfe 100644
--- a/test/files/neg/t4069.check
+++ b/test/files/neg/t4069.check
@@ -12,5 +12,5 @@ t4069.scala:4: error: I encountered a '}' where I didn't expect one, maybe this
^
t4069.scala:10: error: '}' expected but eof found.
}
-^
+ ^
5 errors found
diff --git a/test/files/neg/t4584.check b/test/files/neg/t4584.check
index 060160d76a..419f5704b1 100644
--- a/test/files/neg/t4584.check
+++ b/test/files/neg/t4584.check
@@ -1,4 +1,7 @@
-t4584.scala:1: error: incomplete unicode escape
+t4584.scala:1: error: error in unicode escape
+class A { val /u2
+ ^
+t4584.scala:1: error: illegal character '/uffff'
class A { val /u2
^
-one error found
+two errors found
diff --git a/test/files/neg/unicode-unterminated-quote.check b/test/files/neg/unicode-unterminated-quote.check
index fc5caa6d7e..5085505fb4 100644
--- a/test/files/neg/unicode-unterminated-quote.check
+++ b/test/files/neg/unicode-unterminated-quote.check
@@ -1,4 +1,7 @@
unicode-unterminated-quote.scala:2: error: unclosed string literal
val x = /u0022
^
-one error found
+unicode-unterminated-quote.scala:2: error: '}' expected but eof found.
+ val x = /u0022
+ ^
+two errors found