summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-05-02 09:35:37 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-05-02 09:35:37 +0000
commit4e4e1e4c759c14fbc45f92072b692fa3b9540ba0 (patch)
tree3ba88bc75b71a3fe64f62a3bc8e6ac680abea09e /test/files/neg
parent660683929b6346d7a316273c145c677db7118e7d (diff)
downloadscala-4e4e1e4c759c14fbc45f92072b692fa3b9540ba0.tar.gz
scala-4e4e1e4c759c14fbc45f92072b692fa3b9540ba0.tar.bz2
scala-4e4e1e4c759c14fbc45f92072b692fa3b9540ba0.zip
Merged revisions 21765-21767,21771 via svnmerge...
Merged revisions 21765-21767,21771 via svnmerge from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r21765 | extempore | 2010-04-30 16:41:33 +0200 (Fri, 30 Apr 2010) | 1 line Kicked partest up to a 6 hour timeout. No review. ........ r21766 | dubochet | 2010-04-30 19:22:59 +0200 (Fri, 30 Apr 2010) | 1 line Removed AnnotationInfos.ScalaSigBytes from reflect.generic, as it is an implementation detail of the compiler and shouldn't be part of a public API. Review by odersky. ........ r21767 | extempore | 2010-04-30 23:17:56 +0200 (Fri, 30 Apr 2010) | 2 lines Accumulate missing abstract member errors so they can all be printed instead of only the first. Closes #2213, no review. ........ r21771 | extempore | 2010-05-01 19:17:56 +0200 (Sat, 01 May 2010) | 3 lines Kicked the partest timeouts way up since apparently even 6 hours isn't enough for windows to complete. Don't know what the deal is there, let's see if 10 hours is enough. No review. ........
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/bug2213.check15
-rw-r--r--test/files/neg/bug2213.scala11
-rw-r--r--test/files/neg/bug856.check4
3 files changed, 29 insertions, 1 deletions
diff --git a/test/files/neg/bug2213.check b/test/files/neg/bug2213.check
new file mode 100644
index 0000000000..b24f7dc554
--- /dev/null
+++ b/test/files/neg/bug2213.check
@@ -0,0 +1,15 @@
+bug2213.scala:9: error: class C needs to be abstract, since:
+value y in class A of type Int is not defined
+value x in class A of type Int is not defined
+method g in class A of type => Int is not defined
+method f in class A of type => Int is not defined
+class C extends A {}
+ ^
+bug2213.scala:11: error: object creation impossible, since:
+value y in class A of type Int is not defined
+value x in class A of type Int is not defined
+method g in class A of type => Int is not defined
+method f in class A of type => Int is not defined
+object Q extends A { }
+ ^
+two errors found
diff --git a/test/files/neg/bug2213.scala b/test/files/neg/bug2213.scala
new file mode 100644
index 0000000000..af1df3ccfe
--- /dev/null
+++ b/test/files/neg/bug2213.scala
@@ -0,0 +1,11 @@
+abstract class A {
+ def f: Int
+ def g: Int
+
+ val x: Int
+ val y: Int
+}
+
+class C extends A {}
+
+object Q extends A { } \ No newline at end of file
diff --git a/test/files/neg/bug856.check b/test/files/neg/bug856.check
index e1d0801c5f..168855d6a2 100644
--- a/test/files/neg/bug856.check
+++ b/test/files/neg/bug856.check
@@ -1,4 +1,6 @@
-bug856.scala:3: error: class ComplexRect needs to be abstract, since method _2 in trait Product2 of type => Double is not defined
+bug856.scala:3: error: class ComplexRect needs to be abstract, since:
+method _2 in trait Product2 of type => Double is not defined
+method canEqual in trait Equals of type (that: Any)Boolean is not defined
class ComplexRect(val _1:Double, _2:Double) extends Complex {
^
one error found