Merged revisions 24525-24539 via svnmerge from

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

........
  r24525 | kzys | 2011-03-21 13:24:48 +0100 (Mon, 21 Mar 2011) | 1 line

  [scaladoc] Add HtmlFactoryTest and reorganize directory structure.
Reviewed by pedrofurla. ........ r24526 | kzys | 2011-03-21 13:44:20
+0100 (Mon, 21 Mar 2011) | 2 lines

  [scaladoc] Add a test for #4361.
........
  r24527 | plocinic | 2011-03-21 14:37:53 +0100 (Mon, 21 Mar 2011) | 1 line

  Closes #4202 again, closes #4363. if someone can enlighten me why we
actually had that exclusion for companion objects in the first place I
would be grateful. review by odersky ........ r24528 | kzys | 2011-03-21
14:47:57 +0100 (Mon, 21 Mar 2011) | 2 lines

  [scaladoc] Add a test for #4306. Review by pedrofurla. ........ r24529
| extempore | 2011-03-21 17:19:33 +0100 (Mon, 21 Mar 2011) | 2 lines

  One hundred! One hundred times slower on windows! Ah, ha, ha! Adjusted
test case, no review. ........ r24530 | cunei | 2011-03-21 18:08:00
+0100 (Mon, 21 Mar 2011) | 2 lines

  license files
........
  r24531 | cunei | 2011-03-21 18:13:20 +0100 (Mon, 21 Mar 2011) | 2 lines

  license files.
........
  r24532 | cunei | 2011-03-21 18:47:44 +0100 (Mon, 21 Mar 2011) | 5 lines

  removed gpl

  Some javascript utils are dual licensed under gpl and mit. We already
include the mit ones. ........ r24533 | extempore | 2011-03-21 23:25:40
+0100 (Mon, 21 Mar 2011) | 20 lines

  [I'm laptop only so there's some chance this will incur temporary
  breakage, but it needs committing.]

  Heading off gratuitous complications which haven't yet shipped, I
  eliminated the -jar startup option in favor of doing what we already
  do, figuring it out. So now all these things work.

    scala foo/bar.scala // if file is a script or has one main method
    scala foo.Bar // if it has a legal main method scala foo.jar // if
    it has a legal MainClass attribute

  Also changed "-savecompiled" to "-save" and given scala source called
  foo.scala, generate foo.jar rather than foo.scala.jar. Cleaned up a
  bunch of related code and further polished the scala startup message.
  And unbroke choice settings and improved that error too, which closes
  #3849.

  While trying to write a test for the choice setting, was reminded that
partest just discards invalid flags files. Made it fail instead, which
closes #3712. Fixed the new failures that revealed. No review. ........
r24534 | extempore | 2011-03-21 23:46:53 +0100 (Mon, 21 Mar 2011) | 2
lines

  We need a successful build, not sure why this hasn't been disabled
yet. Disabled failing coder test, no review. ........ r24535 | extempore
| 2011-03-22 01:06:44 +0100 (Tue, 22 Mar 2011) | 3 lines

  Oh the irony, disabling the failing test made the build fail, because
another test is hardcoded to use its paths. Disabled that test too.
We'll put humpty back together again. No review. ........ r24536 |
extempore | 2011-03-22 05:28:21 +0100 (Tue, 22 Mar 2011) | 6 lines

  Not yet learned my lesson about partest and empty directories. Rather
than reapply that bandaid, went after partest. Attempts to make partest
ignore empty directories. Discover directory tests aren't run when
the command line tool is used, make them run like everyone else. Find
more tests which due to misplacement are silently ignored, move them
into tested locations. No review. ........ r24537 | kzys | 2011-03-22
15:10:25 +0100 (Tue, 22 Mar 2011) | 2 lines

  [scaladoc] Closes #4366. Review by pedrofurla.
........
  r24538 | moors | 2011-03-22 15:31:36 +0100 (Tue, 22 Mar 2011) | 1 line

  closes #4205: quick&dirty fix to force loading of info's and thus
avoid order-dependency until we fix unsafeTypeParams for good. no review
........ r24539 | moors | 2011-03-22 16:43:28 +0100 (Tue, 22 Mar 2011) |
1 line

  closes #4345. skip variance checks for calls to super accessor. no
review ........

13 files changed, 52 insertions, 5 deletions

diff --git a/test/files/pos/bug3938/Parent.java b/test/files/pos/bug3938/Parent.java
new file mode 100644
index 0000000000..08fae330bb
--- /dev/null
+++ b/test/files/pos/bug3938/Parent.java
@@ -0,0 +1,9 @@
+public class Parent<A>{
+    class I1 {}
+    class I2 extends Parent.I1 {}
+
+    // OKAY:
+    class I3 extends I1 {}
+    static class I4 {}
+    static class I5 extends Parent.I4 {}
+}
diff --git a/test/files/pos/bug3938/UseParent.scala b/test/files/pos/bug3938/UseParent.scala
new file mode 100644
index 0000000000..685d1a03a8
--- /dev/null
+++ b/test/files/pos/bug3938/UseParent.scala
@@ -0,0 +1,7 @@
+object UseParent {
+  classOf[Parent[AnyRef]#I2]
+
+  // OKAY
+  classOf[Parent[AnyRef]#I3]
+  classOf[Parent.I5]
+}
diff --git a/test/files/pos/switchUnbox-pos.log b/test/files/pos/switchUnbox-pos.log
new file mode 100644
index 0000000000..9c146726d7
--- /dev/null
+++ b/test/files/pos/switchUnbox-pos.log
@@ -0,0 +1,2 @@
+partest error: bad flags: -Ysqueeze:on
+one error found
diff --git a/test/files/pos/switchUnbox.flags b/test/files/pos/switchUnbox.flags
deleted file mode 100644
index cdf5f84ede..0000000000
--- a/test/files/pos/switchUnbox.flags
+++ /dev/null
@@ -1 +0,0 @@
--Ysqueeze:on
diff --git a/test/files/pos/switchUnbox.scala b/test/files/pos/switchUnbox.scala
index 4f5467de29..1d4b742ff9 100644
--- a/test/files/pos/switchUnbox.scala
+++ b/test/files/pos/switchUnbox.scala
@@ -1,6 +1,3 @@
-// this test has accompanying .flags file
-//  that contains -Xsqueeze:on
-//
 object Foo {
   var xyz: (Int, String) = (1, "abc")
   xyz._1 match {
diff --git a/test/files/pos/t3622/test/AsyncTask.java b/test/files/pos/t3622/AsyncTask.java
index cfcea3fe1a..cfcea3fe1a 100644
--- a/test/files/pos/t3622/test/AsyncTask.java
+++ b/test/files/pos/t3622/AsyncTask.java
diff --git a/test/files/pos/t3622/test/MyAsyncTask.java b/test/files/pos/t3622/MyAsyncTask.java
index 9ef4947052..9ef4947052 100644
--- a/test/files/pos/t3622/test/MyAsyncTask.java
+++ b/test/files/pos/t3622/MyAsyncTask.java
diff --git a/test/files/pos/t3622/test/Test.scala b/test/files/pos/t3622/Test.scala
index fb82c581f9..fb82c581f9 100644
--- a/test/files/pos/t3622/test/Test.scala
+++ b/test/files/pos/t3622/Test.scala
diff --git a/test/files/pos/t4202.scala b/test/files/pos/t4202.scala
index dbedd0bf79..b2a0c0120a 100644
--- a/test/files/pos/t4202.scala
+++ b/test/files/pos/t4202.scala
@@ -1,7 +1,18 @@
-object t4202 {
+object t4202_1 {
   () => {
     trait T {
       def t = ()
     }
   }
 }
+
+object t4202_2 {
+  () => {
+    trait T {
+      def t = ()
+    }
+    object T2 extends T {
+      t
+    }
+  }
+}
diff --git a/test/files/pos/t4205/1.scala b/test/files/pos/t4205/1.scala
new file mode 100644
index 0000000000..4dad790376
--- /dev/null
+++ b/test/files/pos/t4205/1.scala
@@ -0,0 +1,3 @@
+trait A[OUT[_]] {
+  null.asInstanceOf[B[OUT]].b1("")
+}
\ No newline at end of file
diff --git a/test/files/pos/t4205/2.scala b/test/files/pos/t4205/2.scala
new file mode 100644
index 0000000000..398fbdecc5
--- /dev/null
+++ b/test/files/pos/t4205/2.scala
@@ -0,0 +1,4 @@
+trait B[OUT[_]] {
+  def b1[A](a: A) = b2[OUT]
+  def b2[OUT1[_]] = ()
+}
diff --git a/test/files/pos/t4345.scala b/test/files/pos/t4345.scala
new file mode 100644
index 0000000000..59de1eadd3
--- /dev/null
+++ b/test/files/pos/t4345.scala
@@ -0,0 +1,7 @@
+trait C1[+A, +CC[X]] {
+  protected[this] def f: A => CC[A] = sys.error("")
+}
+
+trait C2[+A, +CC[X]] extends C1[A, CC] {
+  override protected[this] def f = super.f
+}
\ No newline at end of file
diff --git a/test/files/pos/t4363.scala b/test/files/pos/t4363.scala
new file mode 100644
index 0000000000..64cdcd9356
--- /dev/null
+++ b/test/files/pos/t4363.scala
@@ -0,0 +1,8 @@
+object Test {
+  trait Suite { def bar() = () }
+
+  () => {
+    trait FunkySuite extends Suite { override def bar() = () }
+    class MySuite extends FunkySuite { }
+  }
+}