diff options
| author | Paul Phillips <paulp@improving.org> | 2013-01-31 23:31:19 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-01-31 23:31:19 -0800 |
| commit | 309ff57ba62b6a6ec1a9c1b28b8bbabfd1b47b72 (patch) | |
| tree | 39030b5419c51c89afbc40ede4828f5cebf99810 /test/files/neg | |
| parent | 36f78dd6060ac753c3a7707b3d5ca3afb300f915 (diff) | |
| parent | ff92610c48ad13c17f0374619faa9c2c6e1dd0e5 (diff) | |
| download | scala-309ff57ba62b6a6ec1a9c1b28b8bbabfd1b47b72.tar.gz scala-309ff57ba62b6a6ec1a9c1b28b8bbabfd1b47b72.tar.bz2 scala-309ff57ba62b6a6ec1a9c1b28b8bbabfd1b47b72.zip | |
Merge pull request #2015 from paulp/rc1-backports
10 backports
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/t5353.check | 4 | ||||
| -rw-r--r-- | test/files/neg/t5353.scala | 3 | ||||
| -rw-r--r-- | test/files/neg/t5692a.check | 2 | ||||
| -rw-r--r-- | test/files/neg/t5692b.check | 2 | ||||
| -rw-r--r-- | test/files/neg/t6426.check | 7 | ||||
| -rw-r--r-- | test/files/neg/t6426.scala | 5 |
6 files changed, 21 insertions, 2 deletions
diff --git a/test/files/neg/t5353.check b/test/files/neg/t5353.check new file mode 100644 index 0000000000..75e2435600 --- /dev/null +++ b/test/files/neg/t5353.check @@ -0,0 +1,4 @@ +t5353.scala:2: error: this type parameter must be specified + def f(x: Boolean) = if (x) Array("abc") else Array() + ^ +one error found diff --git a/test/files/neg/t5353.scala b/test/files/neg/t5353.scala new file mode 100644 index 0000000000..1ee869aac1 --- /dev/null +++ b/test/files/neg/t5353.scala @@ -0,0 +1,3 @@ +class A { + def f(x: Boolean) = if (x) Array("abc") else Array() +} diff --git a/test/files/neg/t5692a.check b/test/files/neg/t5692a.check index ded95a8820..7fbfb5dba7 100644 --- a/test/files/neg/t5692a.check +++ b/test/files/neg/t5692a.check @@ -1,4 +1,4 @@ -Test_2.scala:2: error: type parameter not specified +Test_2.scala:2: error: this type parameter must be specified def x = Macros.foo ^ one error found diff --git a/test/files/neg/t5692b.check b/test/files/neg/t5692b.check index e453870ec8..16796826b4 100644 --- a/test/files/neg/t5692b.check +++ b/test/files/neg/t5692b.check @@ -1,4 +1,4 @@ -Test_2.scala:2: error: type parameters not specified +Test_2.scala:2: error: these type parameters must be specified def x = Macros.foo ^ one error found diff --git a/test/files/neg/t6426.check b/test/files/neg/t6426.check new file mode 100644 index 0000000000..149f74c4de --- /dev/null +++ b/test/files/neg/t6426.check @@ -0,0 +1,7 @@ +t6426.scala:4: error: wildcard invalid as backquoted identifier + println(`_`.Buffer(0)) + ^ +t6426.scala:5: error: ')' expected but '}' found. +} +^ +two errors found diff --git a/test/files/neg/t6426.scala b/test/files/neg/t6426.scala new file mode 100644 index 0000000000..a27d18eb58 --- /dev/null +++ b/test/files/neg/t6426.scala @@ -0,0 +1,5 @@ +class A { + import collection.{mutable => _, _} + + println(`_`.Buffer(0)) +} |