summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-01-25 07:58:47 -0800
committerPaul Phillips <paulp@improving.org>2013-01-25 07:58:47 -0800
commit5e2821caef2f49185338c01a7cb8a4e5e0155b7a (patch)
treee0c5425170ad5a083bc4e780182ee6c23aed3a36 /test
parent417304514b664e5f66bfc06fb2b0e86b99d23a63 (diff)
parent8a74b7bd136f691d9d60c7dd10ddf96a45e32329 (diff)
downloadscala-5e2821caef2f49185338c01a7cb8a4e5e0155b7a.tar.gz
scala-5e2821caef2f49185338c01a7cb8a4e5e0155b7a.tar.bz2
scala-5e2821caef2f49185338c01a7cb8a4e5e0155b7a.zip
Merge pull request #1907 from namin/si-6952
Closes SI-6952: add correct error positions for Dynamic feature check.
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/t6040.check4
-rw-r--r--test/files/neg/t6952.check13
-rw-r--r--test/files/neg/t6952.scala4
3 files changed, 20 insertions, 1 deletions
diff --git a/test/files/neg/t6040.check b/test/files/neg/t6040.check
index f6757f97e3..f91df0c46d 100644
--- a/test/files/neg/t6040.check
+++ b/test/files/neg/t6040.check
@@ -1,7 +1,9 @@
-error: extension of type scala.Dynamic needs to be enabled
+t6040.scala:1: error: extension of type scala.Dynamic needs to be enabled
by making the implicit value language.dynamics visible.
This can be achieved by adding the import clause 'import scala.language.dynamics'
or by setting the compiler option -language:dynamics.
See the Scala docs for value scala.language.dynamics for a discussion
why the feature needs to be explicitly enabled.
+class X extends Dynamic
+ ^
one error found
diff --git a/test/files/neg/t6952.check b/test/files/neg/t6952.check
new file mode 100644
index 0000000000..f1e1881404
--- /dev/null
+++ b/test/files/neg/t6952.check
@@ -0,0 +1,13 @@
+t6952.scala:2: error: extension of type scala.Dynamic needs to be enabled
+by making the implicit value language.dynamics visible.
+This can be achieved by adding the import clause 'import scala.language.dynamics'
+or by setting the compiler option -language:dynamics.
+See the Scala docs for value scala.language.dynamics for a discussion
+why the feature needs to be explicitly enabled.
+trait B extends Dynamic
+ ^
+t6952.scala:3: error: extension of type scala.Dynamic needs to be enabled
+by making the implicit value language.dynamics visible.
+trait C extends A with Dynamic
+ ^
+two errors found
diff --git a/test/files/neg/t6952.scala b/test/files/neg/t6952.scala
new file mode 100644
index 0000000000..257ea3be68
--- /dev/null
+++ b/test/files/neg/t6952.scala
@@ -0,0 +1,4 @@
+trait A
+trait B extends Dynamic
+trait C extends A with Dynamic
+trait D extends B