summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMiles Sabin <miles@milessabin.com>2009-08-25 17:28:33 +0000
committerMiles Sabin <miles@milessabin.com>2009-08-25 17:28:33 +0000
commit7224d1c26def0519cab9c31c77f02f0ab5734838 (patch)
treeea69bc7b8696ca5dbe16b621367a2b0f1ee58d3d /test
parentac290525356e1db8408e4c6b2034103805783dec (diff)
downloadscala-7224d1c26def0519cab9c31c77f02f0ab5734838.tar.gz
scala-7224d1c26def0519cab9c31c77f02f0ab5734838.tar.bz2
scala-7224d1c26def0519cab9c31c77f02f0ab5734838.zip
Fix for #2275 with tests.
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/bug2275a.check13
-rw-r--r--test/files/neg/bug2275a.scala7
-rw-r--r--test/files/neg/bug2275b.check13
-rw-r--r--test/files/neg/bug2275b.scala3
4 files changed, 36 insertions, 0 deletions
diff --git a/test/files/neg/bug2275a.check b/test/files/neg/bug2275a.check
new file mode 100644
index 0000000000..892a903948
--- /dev/null
+++ b/test/files/neg/bug2275a.check
@@ -0,0 +1,13 @@
+bug2275a.scala:4: error: in XML literal: in XML content, please use '}}' to express '}'
+ }else{
+ ^
+bug2275a.scala:3: error: I encountered a '}' where I didn't expect one, maybe this tag isn't closed <br>
+ <br>
+ ^
+bug2275a.scala:4: error: ';' expected but 'else' found.
+ }else{
+ ^
+bug2275a.scala:7: error: '}' expected but eof found.
+}
+ ^
+four errors found
diff --git a/test/files/neg/bug2275a.scala b/test/files/neg/bug2275a.scala
new file mode 100644
index 0000000000..7f2b803daa
--- /dev/null
+++ b/test/files/neg/bug2275a.scala
@@ -0,0 +1,7 @@
+object Test {
+ if(true) {
+ <br>
+ }else{
+ <span>{"louenesee"}</span>
+ }
+}
diff --git a/test/files/neg/bug2275b.check b/test/files/neg/bug2275b.check
new file mode 100644
index 0000000000..4b61f242d0
--- /dev/null
+++ b/test/files/neg/bug2275b.check
@@ -0,0 +1,13 @@
+bug2275b.scala:2: error: in XML literal: in XML content, please use '}}' to express '}'
+ {<br>}xx
+ ^
+bug2275b.scala:2: error: I encountered a '}' where I didn't expect one, maybe this tag isn't closed <br>
+ {<br>}xx
+ ^
+bug2275b.scala:2: error: ';' expected but identifier found.
+ {<br>}xx
+ ^
+bug2275b.scala:3: error: '}' expected but eof found.
+}
+ ^
+four errors found
diff --git a/test/files/neg/bug2275b.scala b/test/files/neg/bug2275b.scala
new file mode 100644
index 0000000000..312cba8d6d
--- /dev/null
+++ b/test/files/neg/bug2275b.scala
@@ -0,0 +1,3 @@
+object Test {
+ {<br>}xx
+}