Merged revisions 20229-20233 via svnmerge from

https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r20229 | odersky | 2009-12-18 16:16:51 +0100 (Fri, 18 Dec 2009) | 1 line

  Closed #1492. review by extempore
........
  r20230 | odersky | 2009-12-18 16:18:44 +0100 (Fri, 18 Dec 2009) | 1 line

  Closed #2779. review by community.
........
  r20231 | odersky | 2009-12-18 16:20:56 +0100 (Fri, 18 Dec 2009) | 1 line

  added test case for #2775 and commented the handling code in Implicits
better. Gilles already had a look so noreview. ........ r20232 |
dubochet | 2009-12-18 16:21:44 +0100 (Fri, 18 Dec 2009) | 1 line

  [scaladoc] Added option "-doc-version" to Scaladoc tool (and
"docversion" attribute to ant task). Both "-doc-version" and
"-doc-title" can be set, but are not yet used in the output. No review.
........ r20233 | odersky | 2009-12-18 16:22:11 +0100 (Fri, 18 Dec 2009)
| 1 line

  Closed #2801. Had to update a couple of files that already exploited
the missing test. ........

6 files changed, 43 insertions, 0 deletions

diff --git a/test/files/neg/t2775.check b/test/files/neg/t2775.check
new file mode 100644
index 0000000000..a30d35fdd9
--- /dev/null
+++ b/test/files/neg/t2775.check
@@ -0,0 +1,4 @@
+t2775.scala:1: error: cannot find class manifest for element type B.this.T
+trait B[S] { type T = S; val c = new Array[T](1) }
+                                 ^
+one error found
diff --git a/test/files/neg/t2775.scala b/test/files/neg/t2775.scala
new file mode 100644
index 0000000000..9e4f2f606d
--- /dev/null
+++ b/test/files/neg/t2775.scala
@@ -0,0 +1 @@
+trait B[S] { type T = S; val c = new Array[T](1) }
diff --git a/test/files/neg/t2779.check b/test/files/neg/t2779.check
new file mode 100644
index 0000000000..4f94a780a1
--- /dev/null
+++ b/test/files/neg/t2779.check
@@ -0,0 +1,4 @@
+t2779.scala:16: error: method f is defined twice
+    override def f = List(M1)
+                 ^
+one error found
diff --git a/test/files/neg/t2779.scala b/test/files/neg/t2779.scala
new file mode 100755
index 0000000000..d025055aa0
--- /dev/null
+++ b/test/files/neg/t2779.scala
@@ -0,0 +1,25 @@
+abstract class M
+{
+    def f: List[M] = Nil
+}
+
+object M1 extends M
+
+object M2 extends M
+{
+    override def f = List(M1)
+}
+
+object M3 extends M
+{
+    override def f = List(M1)
+    override def f = List(M1)
+}
+
+object M4 extends M
+{
+    override def f = List(
+        M3,
+        M2
+    )
+}
diff --git a/test/files/neg/t2801.check b/test/files/neg/t2801.check
new file mode 100644
index 0000000000..25320de5bc
--- /dev/null
+++ b/test/files/neg/t2801.check
@@ -0,0 +1,6 @@
+t2801.scala:2: error: type mismatch;
+ found   : Null(null)
+ required: A
+  def f[A <: AnyRef] = { val a: A = null ; a }
+                                    ^
+one error found
diff --git a/test/files/neg/t2801.scala b/test/files/neg/t2801.scala
new file mode 100644
index 0000000000..d425f58b56
--- /dev/null
+++ b/test/files/neg/t2801.scala
@@ -0,0 +1,3 @@
+object Test {
+  def f[A <: AnyRef] = { val a: A = null ; a }
+}