From 5b72bfcf91a7b73df63b830b15f083307bdb3123 Mon Sep 17 00:00:00 2001
From: Burak Emir <emir@epfl.ch>
Date: Wed, 3 Jan 2007 16:34:59 +0000
Subject: * NodeSeq plays with new Seq[A]

* new starr, because of Tuple/Product change and collections
---
 lib/scala-compiler.jar.desired.sha1 | 2 +-
 lib/scala-library.jar.desired.sha1  | 2 +-
 src/build/genprod.scala             | 4 ++--
 src/library/scala/xml/NodeSeq.scala | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1
index 4d2534ae79..65d8a1d5b4 100644
--- a/lib/scala-compiler.jar.desired.sha1
+++ b/lib/scala-compiler.jar.desired.sha1
@@ -1 +1 @@
-ec4b88451a9818cc047a406419eb2c9a1cc6c1e9 ?scala-compiler.jar
+43925cc038c305e7a2f5867e18c6013ffdfec936 ?scala-compiler.jar
diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1
index 3b8c4b8289..1683c2dc00 100644
--- a/lib/scala-library.jar.desired.sha1
+++ b/lib/scala-library.jar.desired.sha1
@@ -1 +1 @@
-b62a105f4c1d09573e289be0e706c547567d538a ?scala-library.jar
+9726578d5fefdefa025a0ba74c959433be8f7ff1 ?scala-library.jar
diff --git a/src/build/genprod.scala b/src/build/genprod.scala
index 229ef1ae7a..4a888ee852 100644
--- a/src/build/genprod.scala
+++ b/src/build/genprod.scala
@@ -244,7 +244,7 @@ package scala
 
 /** {tupleClassname(i)} is the canonical representation of a @see {productClassname(i)} */
 case class {tupleClassname(i)}{__typeArgs__}({ __fields__ })
-  extends {productClassname(i)}{__typeArgRefs__} {{
+  /*extends {productClassname(i)}{__typeArgRefs__} */ {{
 
    override def toString() = {{
      val sb = new compat.StringBuilder
@@ -291,7 +291,7 @@ package scala
 import Predef._
 
 object {productClassname(i)} {{
-  def unapply{__refArgs__}(x: {productClassname(i)}{__refArgs__}): Some[{productClassname(i)}{__refArgs__}] =
+  def unapply{__refArgs__}(x: {productClassname(i)}{__refArgs__}): Option[{productClassname(i)}{__refArgs__}] =
     Some(x)
 }}
 
diff --git a/src/library/scala/xml/NodeSeq.scala b/src/library/scala/xml/NodeSeq.scala
index abcfe7e33c..3e35cfe56f 100644
--- a/src/library/scala/xml/NodeSeq.scala
+++ b/src/library/scala/xml/NodeSeq.scala
@@ -154,6 +154,7 @@ abstract class NodeSeq extends Seq[Node] {
     (s: String, x: Node) => s + x.toString()
   }
 
+/*
   def map(f: Node => NodeSeq): NodeSeq = flatMap(f)
 
   def flatMap(f: Node => NodeSeq): NodeSeq = {
@@ -165,7 +166,7 @@ abstract class NodeSeq extends Seq[Node] {
     val x = toList filter f
     x
   }
-
+*/
   def text: String = {
     val sb = new compat.StringBuilder()
     val it = elements
-- 
cgit v1.2.3