Change return type of `apply`.

In an enum case like

     case C() extends P1 with ... with Pn ...

apply now returns `P1 & ... & Pn`, where before
it was just P1.

Also, add to Option test.

1 files changed, 4 insertions, 1 deletions

diff --git a/tests/run/enum-Option.scala b/tests/run/enum-Option.scala
index 74e449daf..b9efadf0d 100644
--- a/tests/run/enum-Option.scala
+++ b/tests/run/enum-Option.scala
@@ -2,6 +2,7 @@ enum class Option[+T] extends Serializable {
    def isDefined: Boolean
 }
 object Option {
+  def apply[T](x: T): Option[T] = if (x == null) None else Some(x)
   case Some(x: T) {
      def isDefined = true
   }
@@ -11,6 +12,8 @@ object Option {
 }
 
 object Test {
-  def main(args: Array[String]) =
+  def main(args: Array[String]) = {
     assert(Some(None).isDefined)
+    Option(22) match { case Option.Some(x) => assert(x == 22) }
+  }
 }