From e58673295a780ab7e9e2098a907df3466866a300 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Wed, 17 Jun 2009 21:23:05 +0000
Subject: Newly generated Tuple/Product/Function classes ...

Newly generated Tuple/Product/Function classes from new genprod, plus a
couple minor tweaks to genprod to keep tests happy.
---
 src/build/genprod.scala            | 82 +++++++++++++++++++-------------------
 src/library/scala/Function0.scala  |  9 ++---
 src/library/scala/Function1.scala  | 14 +++----
 src/library/scala/Function10.scala | 11 ++---
 src/library/scala/Function11.scala | 11 ++---
 src/library/scala/Function12.scala | 11 ++---
 src/library/scala/Function13.scala | 11 ++---
 src/library/scala/Function14.scala | 11 ++---
 src/library/scala/Function15.scala | 11 ++---
 src/library/scala/Function16.scala | 11 ++---
 src/library/scala/Function17.scala | 11 ++---
 src/library/scala/Function18.scala | 11 ++---
 src/library/scala/Function19.scala | 11 ++---
 src/library/scala/Function2.scala  | 17 ++++----
 src/library/scala/Function20.scala | 11 ++---
 src/library/scala/Function21.scala | 11 ++---
 src/library/scala/Function22.scala | 11 ++---
 src/library/scala/Function3.scala  | 11 ++---
 src/library/scala/Function4.scala  | 11 ++---
 src/library/scala/Function5.scala  | 11 ++---
 src/library/scala/Function6.scala  | 11 ++---
 src/library/scala/Function7.scala  | 11 ++---
 src/library/scala/Function8.scala  | 11 ++---
 src/library/scala/Function9.scala  | 11 ++---
 src/library/scala/Product1.scala   | 10 ++---
 src/library/scala/Product10.scala  | 28 ++++++-------
 src/library/scala/Product11.scala  | 30 +++++++-------
 src/library/scala/Product12.scala  | 32 +++++++--------
 src/library/scala/Product13.scala  | 34 ++++++++--------
 src/library/scala/Product14.scala  | 36 ++++++++---------
 src/library/scala/Product15.scala  | 38 +++++++++---------
 src/library/scala/Product16.scala  | 40 +++++++++----------
 src/library/scala/Product17.scala  | 42 ++++++++++---------
 src/library/scala/Product18.scala  | 44 ++++++++++----------
 src/library/scala/Product19.scala  | 46 ++++++++++-----------
 src/library/scala/Product2.scala   | 12 +++---
 src/library/scala/Product20.scala  | 48 +++++++++++-----------
 src/library/scala/Product21.scala  | 50 +++++++++++------------
 src/library/scala/Product22.scala  | 52 ++++++++++++------------
 src/library/scala/Product3.scala   | 14 +++----
 src/library/scala/Product4.scala   | 16 ++++----
 src/library/scala/Product5.scala   | 18 ++++-----
 src/library/scala/Product6.scala   | 20 +++++-----
 src/library/scala/Product7.scala   | 22 +++++-----
 src/library/scala/Product8.scala   | 24 +++++------
 src/library/scala/Product9.scala   | 26 ++++++------
 src/library/scala/Tuple1.scala     | 15 +++----
 src/library/scala/Tuple10.scala    | 17 ++++----
 src/library/scala/Tuple11.scala    | 17 ++++----
 src/library/scala/Tuple12.scala    | 18 ++++-----
 src/library/scala/Tuple13.scala    | 18 ++++-----
 src/library/scala/Tuple14.scala    | 18 ++++-----
 src/library/scala/Tuple15.scala    | 18 ++++-----
 src/library/scala/Tuple16.scala    | 18 ++++-----
 src/library/scala/Tuple17.scala    | 18 ++++-----
 src/library/scala/Tuple18.scala    | 18 ++++-----
 src/library/scala/Tuple19.scala    | 18 ++++-----
 src/library/scala/Tuple2.scala     | 17 +++-----
 src/library/scala/Tuple20.scala    | 18 ++++-----
 src/library/scala/Tuple21.scala    | 18 ++++-----
 src/library/scala/Tuple22.scala    | 18 ++++-----
 src/library/scala/Tuple3.scala     | 17 ++++----
 src/library/scala/Tuple4.scala     | 17 ++++----
 src/library/scala/Tuple5.scala     | 17 ++++----
 src/library/scala/Tuple6.scala     | 17 ++++----
 src/library/scala/Tuple7.scala     | 17 ++++----
 src/library/scala/Tuple8.scala     | 17 ++++----
 src/library/scala/Tuple9.scala     | 17 ++++----
 68 files changed, 662 insertions(+), 745 deletions(-)

diff --git a/src/build/genprod.scala b/src/build/genprod.scala
index f5dd393d3d..ee3f79c292 100644
--- a/src/build/genprod.scala
+++ b/src/build/genprod.scala
@@ -112,32 +112,30 @@ import genprod._
 zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz */
 
 object FunctionZero extends Function(0) {
-  override def descriptiveComment = functionNTemplate.format("currentSeconds", "anonfun0", """
-  *
-  *    <b>val</b> currentSeconds = () => System.currentTimeMillis() / 1000L
-  *
-  *    <b>val</b> anonfun0 = <b>new</b> Function0[Long] {
-  *      <b>def</b> apply(): Long = System.currentTimeMillis() / 1000L
-  *    }
-  *
-  *    println(currentSeconds())
-  *    println(anonfun0())
-""")
+  override def descriptiveComment = functionNTemplate.format("currentSeconds", "anonfun0",
+""" *
+ *    <b>val</b> currentSeconds = () => System.currentTimeMillis() / 1000L
+ *
+ *    <b>val</b> anonfun0 = <b>new</b> Function0[Long] {
+ *      <b>def</b> apply(): Long = System.currentTimeMillis() / 1000L
+ *    }
+ *
+ *    println(currentSeconds())
+ *    println(anonfun0())""")
   override def moreMethods = ""
 }
 
 object FunctionOne extends Function(1) {
-  override def descriptiveComment = functionNTemplate.format("succ", "anonfun1", """
-  *
-  *    <b>val</b> succ = (x: Int) => x + 1
-  *
-  *    <b>val</b> anonfun1 = <b>new</b> Function1[Int, Int] {
-  *      <b>def</b> apply(x: Int): Int = x + 1
-  *    }
-  *
-  *    println(succ(0))
-  *    println(anonfun1(0))
-""")
+  override def descriptiveComment = functionNTemplate.format("succ", "anonfun1",
+""" *
+ *    <b>val</b> succ = (x: Int) => x + 1
+ *
+ *    <b>val</b> anonfun1 = <b>new</b> Function1[Int, Int] {
+ *      <b>def</b> apply(x: Int): Int = x + 1
+ *    }
+ *
+ *    println(succ(0))
+ *    println(anonfun1(0))""")
 
   override def moreMethods = """
   /** (f compose g)(x) ==  f(g(x))
@@ -151,17 +149,16 @@ object FunctionOne extends Function(1) {
 }
 
 object FunctionTwo extends Function(2) {
-  override def descriptiveComment = functionNTemplate.format("max", "anonfun2", """
-  *
-  *    <b>val</b> max = (x: Int, y: Int) => <b>if</b> (x < y) y <b>else</b> x
-  *
-  *    <b>val</b> anonfun2 = <b>new</b> Function2[Int, Int, Int] {
-  *      <b>def</b> apply(x: Int, y: Int): Int = <b>if</b> (x < y) y <b>else</b> x
-  *    }
-  *
-  *    println(max(0, 1))
-  *    println(anonfun2(0, 1))
-""")
+  override def descriptiveComment = functionNTemplate.format("max", "anonfun2",
+""" *
+ *    <b>val</b> max = (x: Int, y: Int) => <b>if</b> (x < y) y <b>else</b> x
+ *
+ *    <b>val</b> anonfun2 = <b>new</b> Function2[Int, Int, Int] {
+ *      <b>def</b> apply(x: Int, y: Int): Int = <b>if</b> (x < y) y <b>else</b> x
+ *    }
+ *
+ *    println(max(0, 1))
+ *    println(anonfun2(0, 1))""")
 }
 
 object Function
@@ -178,13 +175,14 @@ object Function
 class Function(val i: Int) extends Group("Function") with Arity
 {
   val functionNTemplate = """<p>
-       In the following example the definition of
-  *    <code>%s</code> is a shorthand for the anonymous class
-  *    definition <code>%s</code>:
-  *  </p>
-  *  <pre>
-  *  <b>object</b> Main <b>extends</b> Application { %s
-  *  }</pre>"""
+ * In the following example the definition of
+ *    <code>%s</code> is a shorthand for the anonymous class
+ *    definition <code>%s</code>:
+ *  </p>
+ *  <pre>
+ *  <b>object</b> Main <b>extends</b> Application {
+%s
+ *  }</pre>"""
 
   def toStr() = "\"" + ("<function%d>" format i) + "\""
   def apply() = {
@@ -258,12 +256,12 @@ class Tuple(val i: Int) extends Group("Tuple") with Arity
 {
   // prettifies it a little if it's overlong
   def mkToString() = {
-    def str(xs: List[String]) = xs.mkString(""" + ", " + """)
+    def str(xs: List[String]) = xs.mkString(""" + "," + """)
     if (i <= MAX_ARITY / 2) str(mdefs)
     else {
       val s1 = str(mdefs take (i / 2))
       val s2 = str(mdefs drop (i / 2))
-      s1 + " +\n    \", \" + " + s2
+      s1 + " +\n    \",\" + " + s2
     }
   }
 
diff --git a/src/library/scala/Function0.scala b/src/library/scala/Function0.scala
index 8e213be0ec..fd02993a8c 100644
--- a/src/library/scala/Function0.scala
+++ b/src/library/scala/Function0.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,16 +8,17 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008 (with fancy comment) (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 (with fancy comment)
 
 package scala
 
 
+
 /** <p>
  *    Function with 0 parameters.
  *  </p>
  *  <p>
-      In the following example the definition of
+ * In the following example the definition of
  *    <code>currentSeconds</code> is a shorthand for the anonymous class
  *    definition <code>anonfun0</code>:
  *  </p>
@@ -37,7 +37,6 @@ package scala
  */
 trait Function0[+R] extends AnyRef { self =>
   def apply(): R
-  override def toString() = "<function>"
-
+  override def toString() = "<function0>"
 
 }
diff --git a/src/library/scala/Function1.scala b/src/library/scala/Function1.scala
index e6bd50e519..7cfd32304e 100644
--- a/src/library/scala/Function1.scala
+++ b/src/library/scala/Function1.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,18 +8,19 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008 (with fancy comment) (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 (with fancy comment) (with extra methods)
 
 package scala
 
 
+
 /** <p>
- *    Function with 1 parameters.
+ *    Function with 1 parameter.
  *  </p>
  *  <p>
-      In the following example the definition of
- *    <code>succ</code> is a shorthand for the anonymous class definition
- *    <code>anonfun1</code>:
+ * In the following example the definition of
+ *    <code>succ</code> is a shorthand for the anonymous class
+ *    definition <code>anonfun1</code>:
  *  </p>
  *  <pre>
  *  <b>object</b> Main <b>extends</b> Application {
@@ -37,7 +37,7 @@ package scala
  */
 trait Function1[-T1, +R] extends AnyRef { self =>
   def apply(v1:T1): R
-  override def toString() = "<function>"
+  override def toString() = "<function1>"
 
   /** (f compose g)(x) ==  f(g(x))
    */
diff --git a/src/library/scala/Function10.scala b/src/library/scala/Function10.scala
index b43e514801..4c3437dbb3 100644
--- a/src/library/scala/Function10.scala
+++ b/src/library/scala/Function10.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 10 parameters.
  *  </p>
  *
  */
 trait Function10[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7, v8:T8, v9:T9, v10:T10): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7,v8:T8,v9:T9,v10:T10): R
+  override def toString() = "<function10>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)(x8)(x9)(x10)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => T8 => T9 => T10 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10)).curry
   }
+
 }
diff --git a/src/library/scala/Function11.scala b/src/library/scala/Function11.scala
index 67aff87bc1..0d1f62b017 100644
--- a/src/library/scala/Function11.scala
+++ b/src/library/scala/Function11.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 11 parameters.
  *  </p>
  *
  */
 trait Function11[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7, v8:T8, v9:T9, v10:T10, v11:T11): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7,v8:T8,v9:T9,v10:T10,v11:T11): R
+  override def toString() = "<function11>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)(x8)(x9)(x10)(x11)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => T8 => T9 => T10 => T11 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11)).curry
   }
+
 }
diff --git a/src/library/scala/Function12.scala b/src/library/scala/Function12.scala
index 3dcd885ed5..e4975b03f0 100644
--- a/src/library/scala/Function12.scala
+++ b/src/library/scala/Function12.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 12 parameters.
  *  </p>
  *
  */
 trait Function12[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7, v8:T8, v9:T9, v10:T10, v11:T11, v12:T12): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7,v8:T8,v9:T9,v10:T10,v11:T11,v12:T12): R
+  override def toString() = "<function12>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)(x8)(x9)(x10)(x11)(x12)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => T8 => T9 => T10 => T11 => T12 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12)).curry
   }
+
 }
diff --git a/src/library/scala/Function13.scala b/src/library/scala/Function13.scala
index 14ef529adf..7a05f655d6 100644
--- a/src/library/scala/Function13.scala
+++ b/src/library/scala/Function13.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 13 parameters.
  *  </p>
  *
  */
 trait Function13[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7, v8:T8, v9:T9, v10:T10, v11:T11, v12:T12, v13:T13): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7,v8:T8,v9:T9,v10:T10,v11:T11,v12:T12,v13:T13): R
+  override def toString() = "<function13>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)(x8)(x9)(x10)(x11)(x12)(x13)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => T8 => T9 => T10 => T11 => T12 => T13 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13)).curry
   }
+
 }
diff --git a/src/library/scala/Function14.scala b/src/library/scala/Function14.scala
index 34b02347ce..75cbbe8e3c 100644
--- a/src/library/scala/Function14.scala
+++ b/src/library/scala/Function14.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 14 parameters.
  *  </p>
  *
  */
 trait Function14[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7, v8:T8, v9:T9, v10:T10, v11:T11, v12:T12, v13:T13, v14:T14): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7,v8:T8,v9:T9,v10:T10,v11:T11,v12:T12,v13:T13,v14:T14): R
+  override def toString() = "<function14>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)(x8)(x9)(x10)(x11)(x12)(x13)(x14)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => T8 => T9 => T10 => T11 => T12 => T13 => T14 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14)).curry
   }
+
 }
diff --git a/src/library/scala/Function15.scala b/src/library/scala/Function15.scala
index 7bcfb3d830..6b25c18474 100644
--- a/src/library/scala/Function15.scala
+++ b/src/library/scala/Function15.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 15 parameters.
  *  </p>
  *
  */
 trait Function15[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7, v8:T8, v9:T9, v10:T10, v11:T11, v12:T12, v13:T13, v14:T14, v15:T15): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7,v8:T8,v9:T9,v10:T10,v11:T11,v12:T12,v13:T13,v14:T14,v15:T15): R
+  override def toString() = "<function15>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)(x8)(x9)(x10)(x11)(x12)(x13)(x14)(x15)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => T8 => T9 => T10 => T11 => T12 => T13 => T14 => T15 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15)).curry
   }
+
 }
diff --git a/src/library/scala/Function16.scala b/src/library/scala/Function16.scala
index 0a14cab986..a54ed01be3 100644
--- a/src/library/scala/Function16.scala
+++ b/src/library/scala/Function16.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 16 parameters.
  *  </p>
  *
  */
 trait Function16[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, -T16, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7, v8:T8, v9:T9, v10:T10, v11:T11, v12:T12, v13:T13, v14:T14, v15:T15, v16:T16): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7,v8:T8,v9:T9,v10:T10,v11:T11,v12:T12,v13:T13,v14:T14,v15:T15,v16:T16): R
+  override def toString() = "<function16>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)(x8)(x9)(x10)(x11)(x12)(x13)(x14)(x15)(x16)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => T8 => T9 => T10 => T11 => T12 => T13 => T14 => T15 => T16 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15, x16: T16) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15, x16: T16) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16)).curry
   }
+
 }
diff --git a/src/library/scala/Function17.scala b/src/library/scala/Function17.scala
index 852bd576d6..a20212919b 100644
--- a/src/library/scala/Function17.scala
+++ b/src/library/scala/Function17.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 17 parameters.
  *  </p>
  *
  */
 trait Function17[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, -T16, -T17, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7, v8:T8, v9:T9, v10:T10, v11:T11, v12:T12, v13:T13, v14:T14, v15:T15, v16:T16, v17:T17): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7,v8:T8,v9:T9,v10:T10,v11:T11,v12:T12,v13:T13,v14:T14,v15:T15,v16:T16,v17:T17): R
+  override def toString() = "<function17>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)(x8)(x9)(x10)(x11)(x12)(x13)(x14)(x15)(x16)(x17)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => T8 => T9 => T10 => T11 => T12 => T13 => T14 => T15 => T16 => T17 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15, x16: T16, x17: T17) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15, x16: T16, x17: T17) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17)).curry
   }
+
 }
diff --git a/src/library/scala/Function18.scala b/src/library/scala/Function18.scala
index 1ef43008a3..16b3c8ae03 100644
--- a/src/library/scala/Function18.scala
+++ b/src/library/scala/Function18.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 18 parameters.
  *  </p>
  *
  */
 trait Function18[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, -T16, -T17, -T18, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7, v8:T8, v9:T9, v10:T10, v11:T11, v12:T12, v13:T13, v14:T14, v15:T15, v16:T16, v17:T17, v18:T18): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7,v8:T8,v9:T9,v10:T10,v11:T11,v12:T12,v13:T13,v14:T14,v15:T15,v16:T16,v17:T17,v18:T18): R
+  override def toString() = "<function18>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)(x8)(x9)(x10)(x11)(x12)(x13)(x14)(x15)(x16)(x17)(x18)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => T8 => T9 => T10 => T11 => T12 => T13 => T14 => T15 => T16 => T17 => T18 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15, x16: T16, x17: T17, x18: T18) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15, x16: T16, x17: T17, x18: T18) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18)).curry
   }
+
 }
diff --git a/src/library/scala/Function19.scala b/src/library/scala/Function19.scala
index 1bc5f691cf..85669db978 100644
--- a/src/library/scala/Function19.scala
+++ b/src/library/scala/Function19.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 19 parameters.
  *  </p>
  *
  */
 trait Function19[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, -T16, -T17, -T18, -T19, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7, v8:T8, v9:T9, v10:T10, v11:T11, v12:T12, v13:T13, v14:T14, v15:T15, v16:T16, v17:T17, v18:T18, v19:T19): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7,v8:T8,v9:T9,v10:T10,v11:T11,v12:T12,v13:T13,v14:T14,v15:T15,v16:T16,v17:T17,v18:T18,v19:T19): R
+  override def toString() = "<function19>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18,x19)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)(x8)(x9)(x10)(x11)(x12)(x13)(x14)(x15)(x16)(x17)(x18)(x19)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => T8 => T9 => T10 => T11 => T12 => T13 => T14 => T15 => T16 => T17 => T18 => T19 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15, x16: T16, x17: T17, x18: T18, x19: T19) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18,x19)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15, x16: T16, x17: T17, x18: T18, x19: T19) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18,x19)).curry
   }
+
 }
diff --git a/src/library/scala/Function2.scala b/src/library/scala/Function2.scala
index eb10ca938f..8a792b4f0b 100644
--- a/src/library/scala/Function2.scala
+++ b/src/library/scala/Function2.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,18 +8,19 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008 (with fancy comment) (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009 (with fancy comment) (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 2 parameters.
  *  </p>
  *  <p>
-      In the following example the definition of
- *    <code>max</code> is a shorthand for the anonymous class definition
- *    <code>anonfun2</code>:
+ * In the following example the definition of
+ *    <code>max</code> is a shorthand for the anonymous class
+ *    definition <code>anonfun2</code>:
  *  </p>
  *  <pre>
  *  <b>object</b> Main <b>extends</b> Application {
@@ -36,12 +36,13 @@ package scala
  *  }</pre>
  */
 trait Function2[-T1, -T2, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2): R
+  override def toString() = "<function2>"
 
   /** f(x1,x2)  == (f.curry)(x1)(x2)
    */
   def curry: T1 => T2 => R = {
-      (x1: T1) => (x2: T2) => apply(x1,x2)
+    (x1: T1) => (x2: T2) => apply(x1,x2)
   }
+
 }
diff --git a/src/library/scala/Function20.scala b/src/library/scala/Function20.scala
index 4399d9c135..dbae793f1e 100644
--- a/src/library/scala/Function20.scala
+++ b/src/library/scala/Function20.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 20 parameters.
  *  </p>
  *
  */
 trait Function20[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, -T16, -T17, -T18, -T19, -T20, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7, v8:T8, v9:T9, v10:T10, v11:T11, v12:T12, v13:T13, v14:T14, v15:T15, v16:T16, v17:T17, v18:T18, v19:T19, v20:T20): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7,v8:T8,v9:T9,v10:T10,v11:T11,v12:T12,v13:T13,v14:T14,v15:T15,v16:T16,v17:T17,v18:T18,v19:T19,v20:T20): R
+  override def toString() = "<function20>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18,x19,x20)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)(x8)(x9)(x10)(x11)(x12)(x13)(x14)(x15)(x16)(x17)(x18)(x19)(x20)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => T8 => T9 => T10 => T11 => T12 => T13 => T14 => T15 => T16 => T17 => T18 => T19 => T20 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15, x16: T16, x17: T17, x18: T18, x19: T19, x20: T20) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18,x19,x20)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15, x16: T16, x17: T17, x18: T18, x19: T19, x20: T20) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18,x19,x20)).curry
   }
+
 }
diff --git a/src/library/scala/Function21.scala b/src/library/scala/Function21.scala
index 5ce8d529c8..5759319bf2 100644
--- a/src/library/scala/Function21.scala
+++ b/src/library/scala/Function21.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 21 parameters.
  *  </p>
  *
  */
 trait Function21[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, -T16, -T17, -T18, -T19, -T20, -T21, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7, v8:T8, v9:T9, v10:T10, v11:T11, v12:T12, v13:T13, v14:T14, v15:T15, v16:T16, v17:T17, v18:T18, v19:T19, v20:T20, v21:T21): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7,v8:T8,v9:T9,v10:T10,v11:T11,v12:T12,v13:T13,v14:T14,v15:T15,v16:T16,v17:T17,v18:T18,v19:T19,v20:T20,v21:T21): R
+  override def toString() = "<function21>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18,x19,x20,x21)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)(x8)(x9)(x10)(x11)(x12)(x13)(x14)(x15)(x16)(x17)(x18)(x19)(x20)(x21)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => T8 => T9 => T10 => T11 => T12 => T13 => T14 => T15 => T16 => T17 => T18 => T19 => T20 => T21 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15, x16: T16, x17: T17, x18: T18, x19: T19, x20: T20, x21: T21) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18,x19,x20,x21)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15, x16: T16, x17: T17, x18: T18, x19: T19, x20: T20, x21: T21) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18,x19,x20,x21)).curry
   }
+
 }
diff --git a/src/library/scala/Function22.scala b/src/library/scala/Function22.scala
index 0ff38047c6..6233ec07df 100644
--- a/src/library/scala/Function22.scala
+++ b/src/library/scala/Function22.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 22 parameters.
  *  </p>
  *
  */
 trait Function22[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, -T10, -T11, -T12, -T13, -T14, -T15, -T16, -T17, -T18, -T19, -T20, -T21, -T22, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7, v8:T8, v9:T9, v10:T10, v11:T11, v12:T12, v13:T13, v14:T14, v15:T15, v16:T16, v17:T17, v18:T18, v19:T19, v20:T20, v21:T21, v22:T22): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7,v8:T8,v9:T9,v10:T10,v11:T11,v12:T12,v13:T13,v14:T14,v15:T15,v16:T16,v17:T17,v18:T18,v19:T19,v20:T20,v21:T21,v22:T22): R
+  override def toString() = "<function22>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18,x19,x20,x21,x22)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)(x8)(x9)(x10)(x11)(x12)(x13)(x14)(x15)(x16)(x17)(x18)(x19)(x20)(x21)(x22)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => T8 => T9 => T10 => T11 => T12 => T13 => T14 => T15 => T16 => T17 => T18 => T19 => T20 => T21 => T22 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15, x16: T16, x17: T17, x18: T18, x19: T19, x20: T20, x21: T21, x22: T22) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18,x19,x20,x21,x22)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9, x10: T10, x11: T11, x12: T12, x13: T13, x14: T14, x15: T15, x16: T16, x17: T17, x18: T18, x19: T19, x20: T20, x21: T21, x22: T22) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17,x18,x19,x20,x21,x22)).curry
   }
+
 }
diff --git a/src/library/scala/Function3.scala b/src/library/scala/Function3.scala
index 0355973ef2..76c48215a5 100644
--- a/src/library/scala/Function3.scala
+++ b/src/library/scala/Function3.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 3 parameters.
  *  </p>
  *
  */
 trait Function3[-T1, -T2, -T3, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3): R
+  override def toString() = "<function3>"
 
   /** f(x1,x2,x3)  == (f.curry)(x1)(x2)(x3)
    */
   def curry: T1 => T2 => T3 => R = {
-      (x1: T1) => (x2: T2) => (x3: T3) => apply(x1,x2,x3)
+    (x1: T1) => (x2: T2) => (x3: T3) => apply(x1,x2,x3)
   }
+
 }
diff --git a/src/library/scala/Function4.scala b/src/library/scala/Function4.scala
index d28e2b468b..21112a3345 100644
--- a/src/library/scala/Function4.scala
+++ b/src/library/scala/Function4.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 4 parameters.
  *  </p>
  *
  */
 trait Function4[-T1, -T2, -T3, -T4, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4): R
+  override def toString() = "<function4>"
 
   /** f(x1,x2,x3,x4)  == (f.curry)(x1)(x2)(x3)(x4)
    */
   def curry: T1 => T2 => T3 => T4 => R = {
-      (x1: T1) => (x2: T2) => (x3: T3) => (x4: T4) => apply(x1,x2,x3,x4)
+    (x1: T1) => (x2: T2) => (x3: T3) => (x4: T4) => apply(x1,x2,x3,x4)
   }
+
 }
diff --git a/src/library/scala/Function5.scala b/src/library/scala/Function5.scala
index 58cc09f49e..1a310cca83 100644
--- a/src/library/scala/Function5.scala
+++ b/src/library/scala/Function5.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 5 parameters.
  *  </p>
  *
  */
 trait Function5[-T1, -T2, -T3, -T4, -T5, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5): R
+  override def toString() = "<function5>"
 
   /** f(x1,x2,x3,x4,x5)  == (f.curry)(x1)(x2)(x3)(x4)(x5)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5) => self.apply(x1,x2,x3,x4,x5)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5) => self.apply(x1,x2,x3,x4,x5)).curry
   }
+
 }
diff --git a/src/library/scala/Function6.scala b/src/library/scala/Function6.scala
index b6b62d2e6a..9be31515b4 100644
--- a/src/library/scala/Function6.scala
+++ b/src/library/scala/Function6.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 6 parameters.
  *  </p>
  *
  */
 trait Function6[-T1, -T2, -T3, -T4, -T5, -T6, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6): R
+  override def toString() = "<function6>"
 
   /** f(x1,x2,x3,x4,x5,x6)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6) => self.apply(x1,x2,x3,x4,x5,x6)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6) => self.apply(x1,x2,x3,x4,x5,x6)).curry
   }
+
 }
diff --git a/src/library/scala/Function7.scala b/src/library/scala/Function7.scala
index d990177987..ce4e99f749 100644
--- a/src/library/scala/Function7.scala
+++ b/src/library/scala/Function7.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 7 parameters.
  *  </p>
  *
  */
 trait Function7[-T1, -T2, -T3, -T4, -T5, -T6, -T7, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7): R
+  override def toString() = "<function7>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7) => self.apply(x1,x2,x3,x4,x5,x6,x7)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7) => self.apply(x1,x2,x3,x4,x5,x6,x7)).curry
   }
+
 }
diff --git a/src/library/scala/Function8.scala b/src/library/scala/Function8.scala
index 79af3179c2..995af11640 100644
--- a/src/library/scala/Function8.scala
+++ b/src/library/scala/Function8.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 8 parameters.
  *  </p>
  *
  */
 trait Function8[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7, v8:T8): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7,v8:T8): R
+  override def toString() = "<function8>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7,x8)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)(x8)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => T8 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8)).curry
   }
+
 }
diff --git a/src/library/scala/Function9.scala b/src/library/scala/Function9.scala
index 32c15f00b7..ebf8b17954 100644
--- a/src/library/scala/Function9.scala
+++ b/src/library/scala/Function9.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,23 +8,25 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
 
+
 /** <p>
  *    Function with 9 parameters.
  *  </p>
  *
  */
 trait Function9[-T1, -T2, -T3, -T4, -T5, -T6, -T7, -T8, -T9, +R] extends AnyRef { self =>
-  def apply(v1:T1, v2:T2, v3:T3, v4:T4, v5:T5, v6:T6, v7:T7, v8:T8, v9:T9): R
-  override def toString() = "<function>"
+  def apply(v1:T1,v2:T2,v3:T3,v4:T4,v5:T5,v6:T6,v7:T7,v8:T8,v9:T9): R
+  override def toString() = "<function9>"
 
   /** f(x1,x2,x3,x4,x5,x6,x7,x8,x9)  == (f.curry)(x1)(x2)(x3)(x4)(x5)(x6)(x7)(x8)(x9)
    */
   def curry: T1 => T2 => T3 => T4 => T5 => T6 => T7 => T8 => T9 => R = {
-      (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9)).curry
+    (x1: T1) => ((x2: T2, x3: T3, x4: T4, x5: T5, x6: T6, x7: T7, x8: T8, x9: T9) => self.apply(x1,x2,x3,x4,x5,x6,x7,x8,x9)).curry
   }
+
 }
diff --git a/src/library/scala/Product1.scala b/src/library/scala/Product1.scala
index 135d9a4cba..0e27558645 100644
--- a/src/library/scala/Product1.scala
+++ b/src/library/scala/Product1.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product1 {
@@ -20,11 +20,10 @@ object Product1 {
     Some(x)
 }
 
-/** Product1 is a cartesian product of 1 components
+/** Product1 is a cartesian product of 1 component.
  *
  */
 trait Product1[+T1] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 1
@@ -43,12 +42,11 @@ trait Product1[+T1] extends Product {
   override def productElement(n: Int) = n match {
     case 0 => _1
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
 
 
-
 }
diff --git a/src/library/scala/Product10.scala b/src/library/scala/Product10.scala
index 60c5d052ae..f3e5524ddc 100644
--- a/src/library/scala/Product10.scala
+++ b/src/library/scala/Product10.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product10 {
@@ -20,11 +20,10 @@ object Product10 {
     Some(x)
 }
 
-/** Product10 is a cartesian product of 10 components
+/** Product10 is a cartesian product of 10 components.
  *
  */
 trait Product10[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 10
@@ -52,39 +51,38 @@ trait Product10[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10] extends Produ
     case 8 => _9
     case 9 => _10
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
-/** projection of this product */
+  /** projection of this product */
   def _8: T8
 
-/** projection of this product */
+  /** projection of this product */
   def _9: T9
 
-/** projection of this product */
+  /** projection of this product */
   def _10: T10
 
 
 
-
 }
diff --git a/src/library/scala/Product11.scala b/src/library/scala/Product11.scala
index 46fbcf9b99..62701fc3ff 100644
--- a/src/library/scala/Product11.scala
+++ b/src/library/scala/Product11.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product11 {
@@ -20,11 +20,10 @@ object Product11 {
     Some(x)
 }
 
-/** Product11 is a cartesian product of 11 components
+/** Product11 is a cartesian product of 11 components.
  *
  */
 trait Product11[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 11
@@ -53,42 +52,41 @@ trait Product11[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11] extends
     case 9 => _10
     case 10 => _11
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
-/** projection of this product */
+  /** projection of this product */
   def _8: T8
 
-/** projection of this product */
+  /** projection of this product */
   def _9: T9
 
-/** projection of this product */
+  /** projection of this product */
   def _10: T10
 
-/** projection of this product */
+  /** projection of this product */
   def _11: T11
 
 
 
-
 }
diff --git a/src/library/scala/Product12.scala b/src/library/scala/Product12.scala
index 116b19ce18..bc510c657b 100644
--- a/src/library/scala/Product12.scala
+++ b/src/library/scala/Product12.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product12 {
@@ -20,11 +20,10 @@ object Product12 {
     Some(x)
 }
 
-/** Product12 is a cartesian product of 12 components
+/** Product12 is a cartesian product of 12 components.
  *
  */
 trait Product12[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 12
@@ -54,45 +53,44 @@ trait Product12[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12] e
     case 10 => _11
     case 11 => _12
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
-/** projection of this product */
+  /** projection of this product */
   def _8: T8
 
-/** projection of this product */
+  /** projection of this product */
   def _9: T9
 
-/** projection of this product */
+  /** projection of this product */
   def _10: T10
 
-/** projection of this product */
+  /** projection of this product */
   def _11: T11
 
-/** projection of this product */
+  /** projection of this product */
   def _12: T12
 
 
 
-
 }
diff --git a/src/library/scala/Product13.scala b/src/library/scala/Product13.scala
index 942d62fa49..03fcc640c7 100644
--- a/src/library/scala/Product13.scala
+++ b/src/library/scala/Product13.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product13 {
@@ -20,11 +20,10 @@ object Product13 {
     Some(x)
 }
 
-/** Product13 is a cartesian product of 13 components
+/** Product13 is a cartesian product of 13 components.
  *
  */
 trait Product13[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 13
@@ -55,48 +54,47 @@ trait Product13[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
     case 11 => _12
     case 12 => _13
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
-/** projection of this product */
+  /** projection of this product */
   def _8: T8
 
-/** projection of this product */
+  /** projection of this product */
   def _9: T9
 
-/** projection of this product */
+  /** projection of this product */
   def _10: T10
 
-/** projection of this product */
+  /** projection of this product */
   def _11: T11
 
-/** projection of this product */
+  /** projection of this product */
   def _12: T12
 
-/** projection of this product */
+  /** projection of this product */
   def _13: T13
 
 
 
-
 }
diff --git a/src/library/scala/Product14.scala b/src/library/scala/Product14.scala
index a6d103fa68..8f2f67f2d4 100644
--- a/src/library/scala/Product14.scala
+++ b/src/library/scala/Product14.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product14 {
@@ -20,11 +20,10 @@ object Product14 {
     Some(x)
 }
 
-/** Product14 is a cartesian product of 14 components
+/** Product14 is a cartesian product of 14 components.
  *
  */
 trait Product14[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 14
@@ -56,51 +55,50 @@ trait Product14[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
     case 12 => _13
     case 13 => _14
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
-/** projection of this product */
+  /** projection of this product */
   def _8: T8
 
-/** projection of this product */
+  /** projection of this product */
   def _9: T9
 
-/** projection of this product */
+  /** projection of this product */
   def _10: T10
 
-/** projection of this product */
+  /** projection of this product */
   def _11: T11
 
-/** projection of this product */
+  /** projection of this product */
   def _12: T12
 
-/** projection of this product */
+  /** projection of this product */
   def _13: T13
 
-/** projection of this product */
+  /** projection of this product */
   def _14: T14
 
 
 
-
 }
diff --git a/src/library/scala/Product15.scala b/src/library/scala/Product15.scala
index 79c557f681..81ade4e072 100644
--- a/src/library/scala/Product15.scala
+++ b/src/library/scala/Product15.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product15 {
@@ -20,11 +20,10 @@ object Product15 {
     Some(x)
 }
 
-/** Product15 is a cartesian product of 15 components
+/** Product15 is a cartesian product of 15 components.
  *
  */
 trait Product15[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 15
@@ -57,54 +56,53 @@ trait Product15[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
     case 13 => _14
     case 14 => _15
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
-/** projection of this product */
+  /** projection of this product */
   def _8: T8
 
-/** projection of this product */
+  /** projection of this product */
   def _9: T9
 
-/** projection of this product */
+  /** projection of this product */
   def _10: T10
 
-/** projection of this product */
+  /** projection of this product */
   def _11: T11
 
-/** projection of this product */
+  /** projection of this product */
   def _12: T12
 
-/** projection of this product */
+  /** projection of this product */
   def _13: T13
 
-/** projection of this product */
+  /** projection of this product */
   def _14: T14
 
-/** projection of this product */
+  /** projection of this product */
   def _15: T15
 
 
 
-
 }
diff --git a/src/library/scala/Product16.scala b/src/library/scala/Product16.scala
index dc88d7b5b0..9955bb9136 100644
--- a/src/library/scala/Product16.scala
+++ b/src/library/scala/Product16.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product16 {
@@ -20,11 +20,10 @@ object Product16 {
     Some(x)
 }
 
-/** Product16 is a cartesian product of 16 components
+/** Product16 is a cartesian product of 16 components.
  *
  */
 trait Product16[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 16
@@ -58,57 +57,56 @@ trait Product16[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
     case 14 => _15
     case 15 => _16
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
-/** projection of this product */
+  /** projection of this product */
   def _8: T8
 
-/** projection of this product */
+  /** projection of this product */
   def _9: T9
 
-/** projection of this product */
+  /** projection of this product */
   def _10: T10
 
-/** projection of this product */
+  /** projection of this product */
   def _11: T11
 
-/** projection of this product */
+  /** projection of this product */
   def _12: T12
 
-/** projection of this product */
+  /** projection of this product */
   def _13: T13
 
-/** projection of this product */
+  /** projection of this product */
   def _14: T14
 
-/** projection of this product */
+  /** projection of this product */
   def _15: T15
 
-/** projection of this product */
+  /** projection of this product */
   def _16: T16
 
 
 
-
 }
diff --git a/src/library/scala/Product17.scala b/src/library/scala/Product17.scala
index b80badc5fd..a5b283f268 100644
--- a/src/library/scala/Product17.scala
+++ b/src/library/scala/Product17.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product17 {
@@ -20,11 +20,10 @@ object Product17 {
     Some(x)
 }
 
-/** Product17 is a cartesian product of 17 components
+/** Product17 is a cartesian product of 17 components.
  *
  */
 trait Product17[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 17
@@ -59,60 +58,59 @@ trait Product17[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
     case 15 => _16
     case 16 => _17
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
-/** projection of this product */
+  /** projection of this product */
   def _8: T8
 
-/** projection of this product */
+  /** projection of this product */
   def _9: T9
 
-/** projection of this product */
+  /** projection of this product */
   def _10: T10
 
-/** projection of this product */
+  /** projection of this product */
   def _11: T11
 
-/** projection of this product */
+  /** projection of this product */
   def _12: T12
 
-/** projection of this product */
+  /** projection of this product */
   def _13: T13
 
-/** projection of this product */
+  /** projection of this product */
   def _14: T14
 
-/** projection of this product */
+  /** projection of this product */
   def _15: T15
 
-/** projection of this product */
+  /** projection of this product */
   def _16: T16
 
-/** projection of this product */
+  /** projection of this product */
   def _17: T17
 
 
 
-
 }
diff --git a/src/library/scala/Product18.scala b/src/library/scala/Product18.scala
index 1fd32c6e19..4be6c67659 100644
--- a/src/library/scala/Product18.scala
+++ b/src/library/scala/Product18.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product18 {
@@ -20,11 +20,10 @@ object Product18 {
     Some(x)
 }
 
-/** Product18 is a cartesian product of 18 components
+/** Product18 is a cartesian product of 18 components.
  *
  */
 trait Product18[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17, +T18] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 18
@@ -60,63 +59,62 @@ trait Product18[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
     case 16 => _17
     case 17 => _18
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
-/** projection of this product */
+  /** projection of this product */
   def _8: T8
 
-/** projection of this product */
+  /** projection of this product */
   def _9: T9
 
-/** projection of this product */
+  /** projection of this product */
   def _10: T10
 
-/** projection of this product */
+  /** projection of this product */
   def _11: T11
 
-/** projection of this product */
+  /** projection of this product */
   def _12: T12
 
-/** projection of this product */
+  /** projection of this product */
   def _13: T13
 
-/** projection of this product */
+  /** projection of this product */
   def _14: T14
 
-/** projection of this product */
+  /** projection of this product */
   def _15: T15
 
-/** projection of this product */
+  /** projection of this product */
   def _16: T16
 
-/** projection of this product */
+  /** projection of this product */
   def _17: T17
 
-/** projection of this product */
+  /** projection of this product */
   def _18: T18
 
 
 
-
 }
diff --git a/src/library/scala/Product19.scala b/src/library/scala/Product19.scala
index 810d9cd6fb..7d31406e27 100644
--- a/src/library/scala/Product19.scala
+++ b/src/library/scala/Product19.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product19 {
@@ -20,11 +20,10 @@ object Product19 {
     Some(x)
 }
 
-/** Product19 is a cartesian product of 19 components
+/** Product19 is a cartesian product of 19 components.
  *
  */
 trait Product19[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17, +T18, +T19] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 19
@@ -61,66 +60,65 @@ trait Product19[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
     case 17 => _18
     case 18 => _19
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
-/** projection of this product */
+  /** projection of this product */
   def _8: T8
 
-/** projection of this product */
+  /** projection of this product */
   def _9: T9
 
-/** projection of this product */
+  /** projection of this product */
   def _10: T10
 
-/** projection of this product */
+  /** projection of this product */
   def _11: T11
 
-/** projection of this product */
+  /** projection of this product */
   def _12: T12
 
-/** projection of this product */
+  /** projection of this product */
   def _13: T13
 
-/** projection of this product */
+  /** projection of this product */
   def _14: T14
 
-/** projection of this product */
+  /** projection of this product */
   def _15: T15
 
-/** projection of this product */
+  /** projection of this product */
   def _16: T16
 
-/** projection of this product */
+  /** projection of this product */
   def _17: T17
 
-/** projection of this product */
+  /** projection of this product */
   def _18: T18
 
-/** projection of this product */
+  /** projection of this product */
   def _19: T19
 
 
 
-
 }
diff --git a/src/library/scala/Product2.scala b/src/library/scala/Product2.scala
index 6d468ba33a..a2c5ee17ab 100644
--- a/src/library/scala/Product2.scala
+++ b/src/library/scala/Product2.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product2 {
@@ -20,11 +20,10 @@ object Product2 {
     Some(x)
 }
 
-/** Product2 is a cartesian product of 2 components
+/** Product2 is a cartesian product of 2 components.
  *
  */
 trait Product2[+T1, +T2] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 2
@@ -44,15 +43,14 @@ trait Product2[+T1, +T2] extends Product {
     case 0 => _1
     case 1 => _2
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
 
 
-
 }
diff --git a/src/library/scala/Product20.scala b/src/library/scala/Product20.scala
index ed4da144eb..71d000f394 100644
--- a/src/library/scala/Product20.scala
+++ b/src/library/scala/Product20.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product20 {
@@ -20,11 +20,10 @@ object Product20 {
     Some(x)
 }
 
-/** Product20 is a cartesian product of 20 components
+/** Product20 is a cartesian product of 20 components.
  *
  */
 trait Product20[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17, +T18, +T19, +T20] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 20
@@ -62,69 +61,68 @@ trait Product20[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
     case 18 => _19
     case 19 => _20
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
-/** projection of this product */
+  /** projection of this product */
   def _8: T8
 
-/** projection of this product */
+  /** projection of this product */
   def _9: T9
 
-/** projection of this product */
+  /** projection of this product */
   def _10: T10
 
-/** projection of this product */
+  /** projection of this product */
   def _11: T11
 
-/** projection of this product */
+  /** projection of this product */
   def _12: T12
 
-/** projection of this product */
+  /** projection of this product */
   def _13: T13
 
-/** projection of this product */
+  /** projection of this product */
   def _14: T14
 
-/** projection of this product */
+  /** projection of this product */
   def _15: T15
 
-/** projection of this product */
+  /** projection of this product */
   def _16: T16
 
-/** projection of this product */
+  /** projection of this product */
   def _17: T17
 
-/** projection of this product */
+  /** projection of this product */
   def _18: T18
 
-/** projection of this product */
+  /** projection of this product */
   def _19: T19
 
-/** projection of this product */
+  /** projection of this product */
   def _20: T20
 
 
 
-
 }
diff --git a/src/library/scala/Product21.scala b/src/library/scala/Product21.scala
index 70d79656f2..3f169da5c7 100644
--- a/src/library/scala/Product21.scala
+++ b/src/library/scala/Product21.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product21 {
@@ -20,11 +20,10 @@ object Product21 {
     Some(x)
 }
 
-/** Product21 is a cartesian product of 21 components
+/** Product21 is a cartesian product of 21 components.
  *
  */
 trait Product21[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17, +T18, +T19, +T20, +T21] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 21
@@ -63,72 +62,71 @@ trait Product21[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
     case 19 => _20
     case 20 => _21
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
-/** projection of this product */
+  /** projection of this product */
   def _8: T8
 
-/** projection of this product */
+  /** projection of this product */
   def _9: T9
 
-/** projection of this product */
+  /** projection of this product */
   def _10: T10
 
-/** projection of this product */
+  /** projection of this product */
   def _11: T11
 
-/** projection of this product */
+  /** projection of this product */
   def _12: T12
 
-/** projection of this product */
+  /** projection of this product */
   def _13: T13
 
-/** projection of this product */
+  /** projection of this product */
   def _14: T14
 
-/** projection of this product */
+  /** projection of this product */
   def _15: T15
 
-/** projection of this product */
+  /** projection of this product */
   def _16: T16
 
-/** projection of this product */
+  /** projection of this product */
   def _17: T17
 
-/** projection of this product */
+  /** projection of this product */
   def _18: T18
 
-/** projection of this product */
+  /** projection of this product */
   def _19: T19
 
-/** projection of this product */
+  /** projection of this product */
   def _20: T20
 
-/** projection of this product */
+  /** projection of this product */
   def _21: T21
 
 
 
-
 }
diff --git a/src/library/scala/Product22.scala b/src/library/scala/Product22.scala
index 8f5ae90880..8cca0fd174 100644
--- a/src/library/scala/Product22.scala
+++ b/src/library/scala/Product22.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product22 {
@@ -20,11 +20,10 @@ object Product22 {
     Some(x)
 }
 
-/** Product22 is a cartesian product of 22 components
+/** Product22 is a cartesian product of 22 components.
  *
  */
 trait Product22[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17, +T18, +T19, +T20, +T21, +T22] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 22
@@ -64,75 +63,74 @@ trait Product22[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +
     case 20 => _21
     case 21 => _22
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
-/** projection of this product */
+  /** projection of this product */
   def _8: T8
 
-/** projection of this product */
+  /** projection of this product */
   def _9: T9
 
-/** projection of this product */
+  /** projection of this product */
   def _10: T10
 
-/** projection of this product */
+  /** projection of this product */
   def _11: T11
 
-/** projection of this product */
+  /** projection of this product */
   def _12: T12
 
-/** projection of this product */
+  /** projection of this product */
   def _13: T13
 
-/** projection of this product */
+  /** projection of this product */
   def _14: T14
 
-/** projection of this product */
+  /** projection of this product */
   def _15: T15
 
-/** projection of this product */
+  /** projection of this product */
   def _16: T16
 
-/** projection of this product */
+  /** projection of this product */
   def _17: T17
 
-/** projection of this product */
+  /** projection of this product */
   def _18: T18
 
-/** projection of this product */
+  /** projection of this product */
   def _19: T19
 
-/** projection of this product */
+  /** projection of this product */
   def _20: T20
 
-/** projection of this product */
+  /** projection of this product */
   def _21: T21
 
-/** projection of this product */
+  /** projection of this product */
   def _22: T22
 
 
 
-
 }
diff --git a/src/library/scala/Product3.scala b/src/library/scala/Product3.scala
index 614e514872..622888b5dc 100644
--- a/src/library/scala/Product3.scala
+++ b/src/library/scala/Product3.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product3 {
@@ -20,11 +20,10 @@ object Product3 {
     Some(x)
 }
 
-/** Product3 is a cartesian product of 3 components
+/** Product3 is a cartesian product of 3 components.
  *
  */
 trait Product3[+T1, +T2, +T3] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 3
@@ -45,18 +44,17 @@ trait Product3[+T1, +T2, +T3] extends Product {
     case 1 => _2
     case 2 => _3
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
 
 
-
 }
diff --git a/src/library/scala/Product4.scala b/src/library/scala/Product4.scala
index c95b40ffd3..44ce230e98 100644
--- a/src/library/scala/Product4.scala
+++ b/src/library/scala/Product4.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product4 {
@@ -20,11 +20,10 @@ object Product4 {
     Some(x)
 }
 
-/** Product4 is a cartesian product of 4 components
+/** Product4 is a cartesian product of 4 components.
  *
  */
 trait Product4[+T1, +T2, +T3, +T4] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 4
@@ -46,21 +45,20 @@ trait Product4[+T1, +T2, +T3, +T4] extends Product {
     case 2 => _3
     case 3 => _4
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
 
 
-
 }
diff --git a/src/library/scala/Product5.scala b/src/library/scala/Product5.scala
index 7a0add6a51..74b8cc4607 100644
--- a/src/library/scala/Product5.scala
+++ b/src/library/scala/Product5.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product5 {
@@ -20,11 +20,10 @@ object Product5 {
     Some(x)
 }
 
-/** Product5 is a cartesian product of 5 components
+/** Product5 is a cartesian product of 5 components.
  *
  */
 trait Product5[+T1, +T2, +T3, +T4, +T5] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 5
@@ -47,24 +46,23 @@ trait Product5[+T1, +T2, +T3, +T4, +T5] extends Product {
     case 3 => _4
     case 4 => _5
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
 
 
-
 }
diff --git a/src/library/scala/Product6.scala b/src/library/scala/Product6.scala
index fcb1efe057..811d1c0193 100644
--- a/src/library/scala/Product6.scala
+++ b/src/library/scala/Product6.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product6 {
@@ -20,11 +20,10 @@ object Product6 {
     Some(x)
 }
 
-/** Product6 is a cartesian product of 6 components
+/** Product6 is a cartesian product of 6 components.
  *
  */
 trait Product6[+T1, +T2, +T3, +T4, +T5, +T6] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 6
@@ -48,27 +47,26 @@ trait Product6[+T1, +T2, +T3, +T4, +T5, +T6] extends Product {
     case 4 => _5
     case 5 => _6
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
 
 
-
 }
diff --git a/src/library/scala/Product7.scala b/src/library/scala/Product7.scala
index cb942786cb..0adf34ada9 100644
--- a/src/library/scala/Product7.scala
+++ b/src/library/scala/Product7.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product7 {
@@ -20,11 +20,10 @@ object Product7 {
     Some(x)
 }
 
-/** Product7 is a cartesian product of 7 components
+/** Product7 is a cartesian product of 7 components.
  *
  */
 trait Product7[+T1, +T2, +T3, +T4, +T5, +T6, +T7] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 7
@@ -49,30 +48,29 @@ trait Product7[+T1, +T2, +T3, +T4, +T5, +T6, +T7] extends Product {
     case 5 => _6
     case 6 => _7
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
 
 
-
 }
diff --git a/src/library/scala/Product8.scala b/src/library/scala/Product8.scala
index 1fded2fb75..d2ec25eb6d 100644
--- a/src/library/scala/Product8.scala
+++ b/src/library/scala/Product8.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product8 {
@@ -20,11 +20,10 @@ object Product8 {
     Some(x)
 }
 
-/** Product8 is a cartesian product of 8 components
+/** Product8 is a cartesian product of 8 components.
  *
  */
 trait Product8[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 8
@@ -50,33 +49,32 @@ trait Product8[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8] extends Product {
     case 6 => _7
     case 7 => _8
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
-/** projection of this product */
+  /** projection of this product */
   def _8: T8
 
 
 
-
 }
diff --git a/src/library/scala/Product9.scala b/src/library/scala/Product9.scala
index 9fd0ec9392..769c7defd1 100644
--- a/src/library/scala/Product9.scala
+++ b/src/library/scala/Product9.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,10 +8,11 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
 import Predef._
 
 object Product9 {
@@ -20,11 +20,10 @@ object Product9 {
     Some(x)
 }
 
-/** Product9 is a cartesian product of 9 components
+/** Product9 is a cartesian product of 9 components.
  *
  */
 trait Product9[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9] extends Product {
-
   /**
    *  The arity of this product.
    *  @return 9
@@ -51,36 +50,35 @@ trait Product9[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9] extends Product {
     case 7 => _8
     case 8 => _9
     case _ => throw new IndexOutOfBoundsException(n.toString())
-  }
+ }
 
   /** projection of this product */
   def _1: T1
 
-/** projection of this product */
+  /** projection of this product */
   def _2: T2
 
-/** projection of this product */
+  /** projection of this product */
   def _3: T3
 
-/** projection of this product */
+  /** projection of this product */
   def _4: T4
 
-/** projection of this product */
+  /** projection of this product */
   def _5: T5
 
-/** projection of this product */
+  /** projection of this product */
   def _6: T6
 
-/** projection of this product */
+  /** projection of this product */
   def _7: T7
 
-/** projection of this product */
+  /** projection of this product */
   def _8: T8
 
-/** projection of this product */
+  /** projection of this product */
   def _9: T9
 
 
 
-
 }
diff --git a/src/library/scala/Tuple1.scala b/src/library/scala/Tuple1.scala
index ef6043bdd1..050668708e 100644
--- a/src/library/scala/Tuple1.scala
+++ b/src/library/scala/Tuple1.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,18 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple1 is the canonical representation of a @see Product1
  *
  */
 case class Tuple1[+T1](_1:T1)
-  extends Product1[T1]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(",)")
-     sb.toString
-   }
+  extends Product1[T1]
+{
+  override def toString() = "(" + _1 + ")"
 
 }
diff --git a/src/library/scala/Tuple10.scala b/src/library/scala/Tuple10.scala
index 6f2f0e1392..7cd4672255 100644
--- a/src/library/scala/Tuple10.scala
+++ b/src/library/scala/Tuple10.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,18 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple10 is the canonical representation of a @see Product10
  *
  */
-case class Tuple10[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7, _8:T8, _9:T9, _10:T10)
-  extends Product10[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(',').append(_8).append(',').append(_9).append(',').append(_10).append(')')
-     sb.toString
-   }
+case class Tuple10[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7,_8:T8,_9:T9,_10:T10)
+  extends Product10[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + "," + _7 + "," + _8 + "," + _9 + "," + _10 + ")"
 
 }
diff --git a/src/library/scala/Tuple11.scala b/src/library/scala/Tuple11.scala
index 2c047b0f90..84e2d5b07e 100644
--- a/src/library/scala/Tuple11.scala
+++ b/src/library/scala/Tuple11.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,18 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple11 is the canonical representation of a @see Product11
  *
  */
-case class Tuple11[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7, _8:T8, _9:T9, _10:T10, _11:T11)
-  extends Product11[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(',').append(_8).append(',').append(_9).append(',').append(_10).append(',').append(_11).append(')')
-     sb.toString
-   }
+case class Tuple11[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7,_8:T8,_9:T9,_10:T10,_11:T11)
+  extends Product11[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + "," + _7 + "," + _8 + "," + _9 + "," + _10 + "," + _11 + ")"
 
 }
diff --git a/src/library/scala/Tuple12.scala b/src/library/scala/Tuple12.scala
index 43e49af9f7..d768fca65e 100644
--- a/src/library/scala/Tuple12.scala
+++ b/src/library/scala/Tuple12.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,19 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple12 is the canonical representation of a @see Product12
  *
  */
-case class Tuple12[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7, _8:T8, _9:T9, _10:T10, _11:T11, _12:T12)
-  extends Product12[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(',').append(_8).append(',').append(_9).append(',').append(_10).append(',').append(_11).append(',').append(_12).append(')')
-     sb.toString
-   }
+case class Tuple12[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7,_8:T8,_9:T9,_10:T10,_11:T11,_12:T12)
+  extends Product12[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 +
+    "," + _7 + "," + _8 + "," + _9 + "," + _10 + "," + _11 + "," + _12 + ")"
 
 }
diff --git a/src/library/scala/Tuple13.scala b/src/library/scala/Tuple13.scala
index 3118c58173..2a7b17632e 100644
--- a/src/library/scala/Tuple13.scala
+++ b/src/library/scala/Tuple13.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,19 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple13 is the canonical representation of a @see Product13
  *
  */
-case class Tuple13[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7, _8:T8, _9:T9, _10:T10, _11:T11, _12:T12, _13:T13)
-  extends Product13[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(',').append(_8).append(',').append(_9).append(',').append(_10).append(',').append(_11).append(',').append(_12).append(',').append(_13).append(')')
-     sb.toString
-   }
+case class Tuple13[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7,_8:T8,_9:T9,_10:T10,_11:T11,_12:T12,_13:T13)
+  extends Product13[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 +
+    "," + _7 + "," + _8 + "," + _9 + "," + _10 + "," + _11 + "," + _12 + "," + _13 + ")"
 
 }
diff --git a/src/library/scala/Tuple14.scala b/src/library/scala/Tuple14.scala
index 4f7858109c..f88b212a00 100644
--- a/src/library/scala/Tuple14.scala
+++ b/src/library/scala/Tuple14.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,19 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple14 is the canonical representation of a @see Product14
  *
  */
-case class Tuple14[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7, _8:T8, _9:T9, _10:T10, _11:T11, _12:T12, _13:T13, _14:T14)
-  extends Product14[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(',').append(_8).append(',').append(_9).append(',').append(_10).append(',').append(_11).append(',').append(_12).append(',').append(_13).append(',').append(_14).append(')')
-     sb.toString
-   }
+case class Tuple14[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7,_8:T8,_9:T9,_10:T10,_11:T11,_12:T12,_13:T13,_14:T14)
+  extends Product14[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + "," + _7 +
+    "," + _8 + "," + _9 + "," + _10 + "," + _11 + "," + _12 + "," + _13 + "," + _14 + ")"
 
 }
diff --git a/src/library/scala/Tuple15.scala b/src/library/scala/Tuple15.scala
index bc3e4505f0..664b110d4b 100644
--- a/src/library/scala/Tuple15.scala
+++ b/src/library/scala/Tuple15.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,19 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple15 is the canonical representation of a @see Product15
  *
  */
-case class Tuple15[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7, _8:T8, _9:T9, _10:T10, _11:T11, _12:T12, _13:T13, _14:T14, _15:T15)
-  extends Product15[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(',').append(_8).append(',').append(_9).append(',').append(_10).append(',').append(_11).append(',').append(_12).append(',').append(_13).append(',').append(_14).append(',').append(_15).append(')')
-     sb.toString
-   }
+case class Tuple15[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7,_8:T8,_9:T9,_10:T10,_11:T11,_12:T12,_13:T13,_14:T14,_15:T15)
+  extends Product15[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + "," + _7 +
+    "," + _8 + "," + _9 + "," + _10 + "," + _11 + "," + _12 + "," + _13 + "," + _14 + "," + _15 + ")"
 
 }
diff --git a/src/library/scala/Tuple16.scala b/src/library/scala/Tuple16.scala
index 9a2281e793..d3b646fa6a 100644
--- a/src/library/scala/Tuple16.scala
+++ b/src/library/scala/Tuple16.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,19 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple16 is the canonical representation of a @see Product16
  *
  */
-case class Tuple16[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7, _8:T8, _9:T9, _10:T10, _11:T11, _12:T12, _13:T13, _14:T14, _15:T15, _16:T16)
-  extends Product16[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(',').append(_8).append(',').append(_9).append(',').append(_10).append(',').append(_11).append(',').append(_12).append(',').append(_13).append(',').append(_14).append(',').append(_15).append(',').append(_16).append(')')
-     sb.toString
-   }
+case class Tuple16[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7,_8:T8,_9:T9,_10:T10,_11:T11,_12:T12,_13:T13,_14:T14,_15:T15,_16:T16)
+  extends Product16[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + "," + _7 + "," + _8 +
+    "," + _9 + "," + _10 + "," + _11 + "," + _12 + "," + _13 + "," + _14 + "," + _15 + "," + _16 + ")"
 
 }
diff --git a/src/library/scala/Tuple17.scala b/src/library/scala/Tuple17.scala
index cc0382876d..f27ed64e6a 100644
--- a/src/library/scala/Tuple17.scala
+++ b/src/library/scala/Tuple17.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,19 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple17 is the canonical representation of a @see Product17
  *
  */
-case class Tuple17[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7, _8:T8, _9:T9, _10:T10, _11:T11, _12:T12, _13:T13, _14:T14, _15:T15, _16:T16, _17:T17)
-  extends Product17[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(',').append(_8).append(',').append(_9).append(',').append(_10).append(',').append(_11).append(',').append(_12).append(',').append(_13).append(',').append(_14).append(',').append(_15).append(',').append(_16).append(',').append(_17).append(')')
-     sb.toString
-   }
+case class Tuple17[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7,_8:T8,_9:T9,_10:T10,_11:T11,_12:T12,_13:T13,_14:T14,_15:T15,_16:T16,_17:T17)
+  extends Product17[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + "," + _7 + "," + _8 +
+    "," + _9 + "," + _10 + "," + _11 + "," + _12 + "," + _13 + "," + _14 + "," + _15 + "," + _16 + "," + _17 + ")"
 
 }
diff --git a/src/library/scala/Tuple18.scala b/src/library/scala/Tuple18.scala
index b3063ad73d..a66ccabfb8 100644
--- a/src/library/scala/Tuple18.scala
+++ b/src/library/scala/Tuple18.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,19 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple18 is the canonical representation of a @see Product18
  *
  */
-case class Tuple18[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17, +T18](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7, _8:T8, _9:T9, _10:T10, _11:T11, _12:T12, _13:T13, _14:T14, _15:T15, _16:T16, _17:T17, _18:T18)
-  extends Product18[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(',').append(_8).append(',').append(_9).append(',').append(_10).append(',').append(_11).append(',').append(_12).append(',').append(_13).append(',').append(_14).append(',').append(_15).append(',').append(_16).append(',').append(_17).append(',').append(_18).append(')')
-     sb.toString
-   }
+case class Tuple18[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17, +T18](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7,_8:T8,_9:T9,_10:T10,_11:T11,_12:T12,_13:T13,_14:T14,_15:T15,_16:T16,_17:T17,_18:T18)
+  extends Product18[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + "," + _7 + "," + _8 + "," + _9 +
+    "," + _10 + "," + _11 + "," + _12 + "," + _13 + "," + _14 + "," + _15 + "," + _16 + "," + _17 + "," + _18 + ")"
 
 }
diff --git a/src/library/scala/Tuple19.scala b/src/library/scala/Tuple19.scala
index 5c5b4b7e55..e66c4e65c1 100644
--- a/src/library/scala/Tuple19.scala
+++ b/src/library/scala/Tuple19.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,19 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple19 is the canonical representation of a @see Product19
  *
  */
-case class Tuple19[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17, +T18, +T19](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7, _8:T8, _9:T9, _10:T10, _11:T11, _12:T12, _13:T13, _14:T14, _15:T15, _16:T16, _17:T17, _18:T18, _19:T19)
-  extends Product19[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(',').append(_8).append(',').append(_9).append(',').append(_10).append(',').append(_11).append(',').append(_12).append(',').append(_13).append(',').append(_14).append(',').append(_15).append(',').append(_16).append(',').append(_17).append(',').append(_18).append(',').append(_19).append(')')
-     sb.toString
-   }
+case class Tuple19[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17, +T18, +T19](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7,_8:T8,_9:T9,_10:T10,_11:T11,_12:T12,_13:T13,_14:T14,_15:T15,_16:T16,_17:T17,_18:T18,_19:T19)
+  extends Product19[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + "," + _7 + "," + _8 + "," + _9 +
+    "," + _10 + "," + _11 + "," + _12 + "," + _13 + "," + _14 + "," + _15 + "," + _16 + "," + _17 + "," + _18 + "," + _19 + ")"
 
 }
diff --git a/src/library/scala/Tuple2.scala b/src/library/scala/Tuple2.scala
index 89cf68b3b0..bcf30e58aa 100644
--- a/src/library/scala/Tuple2.scala
+++ b/src/library/scala/Tuple2.scala
@@ -1,7 +1,6 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2002-2008, LAMP/EPFL             **
+**    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
 **  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
@@ -9,7 +8,7 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008  (with extra methods)
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009  (with extra methods)
 
 package scala
 
@@ -83,14 +82,10 @@ object Tuple2 {
 /** Tuple2 is the canonical representation of a @see Product2
  *
  */
-case class Tuple2[+T1, +T2](_1:T1, _2:T2)
-  extends Product2[T1, T2]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(')')
-     sb.toString
-   }
+case class Tuple2[+T1, +T2](_1:T1,_2:T2)
+  extends Product2[T1, T2]
+{
+  override def toString() = "(" + _1 + "," + _2 + ")"
 
   /** Swap the elements of the tuple */
   def swap: Tuple2[T2,T1] = Tuple2(_2, _1)
diff --git a/src/library/scala/Tuple20.scala b/src/library/scala/Tuple20.scala
index ac018af36f..fb2e8d6402 100644
--- a/src/library/scala/Tuple20.scala
+++ b/src/library/scala/Tuple20.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,19 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple20 is the canonical representation of a @see Product20
  *
  */
-case class Tuple20[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17, +T18, +T19, +T20](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7, _8:T8, _9:T9, _10:T10, _11:T11, _12:T12, _13:T13, _14:T14, _15:T15, _16:T16, _17:T17, _18:T18, _19:T19, _20:T20)
-  extends Product20[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(',').append(_8).append(',').append(_9).append(',').append(_10).append(',').append(_11).append(',').append(_12).append(',').append(_13).append(',').append(_14).append(',').append(_15).append(',').append(_16).append(',').append(_17).append(',').append(_18).append(',').append(_19).append(',').append(_20).append(')')
-     sb.toString
-   }
+case class Tuple20[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17, +T18, +T19, +T20](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7,_8:T8,_9:T9,_10:T10,_11:T11,_12:T12,_13:T13,_14:T14,_15:T15,_16:T16,_17:T17,_18:T18,_19:T19,_20:T20)
+  extends Product20[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + "," + _7 + "," + _8 + "," + _9 + "," + _10 +
+    "," + _11 + "," + _12 + "," + _13 + "," + _14 + "," + _15 + "," + _16 + "," + _17 + "," + _18 + "," + _19 + "," + _20 + ")"
 
 }
diff --git a/src/library/scala/Tuple21.scala b/src/library/scala/Tuple21.scala
index 272aabef36..a0a2935997 100644
--- a/src/library/scala/Tuple21.scala
+++ b/src/library/scala/Tuple21.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,19 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple21 is the canonical representation of a @see Product21
  *
  */
-case class Tuple21[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17, +T18, +T19, +T20, +T21](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7, _8:T8, _9:T9, _10:T10, _11:T11, _12:T12, _13:T13, _14:T14, _15:T15, _16:T16, _17:T17, _18:T18, _19:T19, _20:T20, _21:T21)
-  extends Product21[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(',').append(_8).append(',').append(_9).append(',').append(_10).append(',').append(_11).append(',').append(_12).append(',').append(_13).append(',').append(_14).append(',').append(_15).append(',').append(_16).append(',').append(_17).append(',').append(_18).append(',').append(_19).append(',').append(_20).append(',').append(_21).append(')')
-     sb.toString
-   }
+case class Tuple21[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17, +T18, +T19, +T20, +T21](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7,_8:T8,_9:T9,_10:T10,_11:T11,_12:T12,_13:T13,_14:T14,_15:T15,_16:T16,_17:T17,_18:T18,_19:T19,_20:T20,_21:T21)
+  extends Product21[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + "," + _7 + "," + _8 + "," + _9 + "," + _10 +
+    "," + _11 + "," + _12 + "," + _13 + "," + _14 + "," + _15 + "," + _16 + "," + _17 + "," + _18 + "," + _19 + "," + _20 + "," + _21 + ")"
 
 }
diff --git a/src/library/scala/Tuple22.scala b/src/library/scala/Tuple22.scala
index 04f90969f0..a1322744e0 100644
--- a/src/library/scala/Tuple22.scala
+++ b/src/library/scala/Tuple22.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,19 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple22 is the canonical representation of a @see Product22
  *
  */
-case class Tuple22[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17, +T18, +T19, +T20, +T21, +T22](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7, _8:T8, _9:T9, _10:T10, _11:T11, _12:T12, _13:T13, _14:T14, _15:T15, _16:T16, _17:T17, _18:T18, _19:T19, _20:T20, _21:T21, _22:T22)
-  extends Product22[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(',').append(_8).append(',').append(_9).append(',').append(_10).append(',').append(_11).append(',').append(_12).append(',').append(_13).append(',').append(_14).append(',').append(_15).append(',').append(_16).append(',').append(_17).append(',').append(_18).append(',').append(_19).append(',').append(_20).append(',').append(_21).append(',').append(_22).append(')')
-     sb.toString
-   }
+case class Tuple22[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9, +T10, +T11, +T12, +T13, +T14, +T15, +T16, +T17, +T18, +T19, +T20, +T21, +T22](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7,_8:T8,_9:T9,_10:T10,_11:T11,_12:T12,_13:T13,_14:T14,_15:T15,_16:T16,_17:T17,_18:T18,_19:T19,_20:T20,_21:T21,_22:T22)
+  extends Product22[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + "," + _7 + "," + _8 + "," + _9 + "," + _10 + "," + _11 +
+    "," + _12 + "," + _13 + "," + _14 + "," + _15 + "," + _16 + "," + _17 + "," + _18 + "," + _19 + "," + _20 + "," + _21 + "," + _22 + ")"
 
 }
diff --git a/src/library/scala/Tuple3.scala b/src/library/scala/Tuple3.scala
index 249cca3f9b..5a12a9eebd 100644
--- a/src/library/scala/Tuple3.scala
+++ b/src/library/scala/Tuple3.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,18 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple3 is the canonical representation of a @see Product3
  *
  */
-case class Tuple3[+T1, +T2, +T3](_1:T1, _2:T2, _3:T3)
-  extends Product3[T1, T2, T3]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(')')
-     sb.toString
-   }
+case class Tuple3[+T1, +T2, +T3](_1:T1,_2:T2,_3:T3)
+  extends Product3[T1, T2, T3]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + ")"
 
 }
diff --git a/src/library/scala/Tuple4.scala b/src/library/scala/Tuple4.scala
index 321f11025d..4c67ee70d3 100644
--- a/src/library/scala/Tuple4.scala
+++ b/src/library/scala/Tuple4.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,18 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple4 is the canonical representation of a @see Product4
  *
  */
-case class Tuple4[+T1, +T2, +T3, +T4](_1:T1, _2:T2, _3:T3, _4:T4)
-  extends Product4[T1, T2, T3, T4]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(')')
-     sb.toString
-   }
+case class Tuple4[+T1, +T2, +T3, +T4](_1:T1,_2:T2,_3:T3,_4:T4)
+  extends Product4[T1, T2, T3, T4]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + ")"
 
 }
diff --git a/src/library/scala/Tuple5.scala b/src/library/scala/Tuple5.scala
index b5cb84d3a4..b7b8d9402f 100644
--- a/src/library/scala/Tuple5.scala
+++ b/src/library/scala/Tuple5.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,18 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple5 is the canonical representation of a @see Product5
  *
  */
-case class Tuple5[+T1, +T2, +T3, +T4, +T5](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5)
-  extends Product5[T1, T2, T3, T4, T5]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(')')
-     sb.toString
-   }
+case class Tuple5[+T1, +T2, +T3, +T4, +T5](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5)
+  extends Product5[T1, T2, T3, T4, T5]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + ")"
 
 }
diff --git a/src/library/scala/Tuple6.scala b/src/library/scala/Tuple6.scala
index d9e4b435da..5263180f14 100644
--- a/src/library/scala/Tuple6.scala
+++ b/src/library/scala/Tuple6.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,18 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple6 is the canonical representation of a @see Product6
  *
  */
-case class Tuple6[+T1, +T2, +T3, +T4, +T5, +T6](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6)
-  extends Product6[T1, T2, T3, T4, T5, T6]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(')')
-     sb.toString
-   }
+case class Tuple6[+T1, +T2, +T3, +T4, +T5, +T6](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6)
+  extends Product6[T1, T2, T3, T4, T5, T6]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + ")"
 
 }
diff --git a/src/library/scala/Tuple7.scala b/src/library/scala/Tuple7.scala
index 035327da63..94e6d12737 100644
--- a/src/library/scala/Tuple7.scala
+++ b/src/library/scala/Tuple7.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,18 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple7 is the canonical representation of a @see Product7
  *
  */
-case class Tuple7[+T1, +T2, +T3, +T4, +T5, +T6, +T7](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7)
-  extends Product7[T1, T2, T3, T4, T5, T6, T7]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(')')
-     sb.toString
-   }
+case class Tuple7[+T1, +T2, +T3, +T4, +T5, +T6, +T7](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7)
+  extends Product7[T1, T2, T3, T4, T5, T6, T7]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + "," + _7 + ")"
 
 }
diff --git a/src/library/scala/Tuple8.scala b/src/library/scala/Tuple8.scala
index 85f6dfe6b6..aed114f431 100644
--- a/src/library/scala/Tuple8.scala
+++ b/src/library/scala/Tuple8.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,18 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple8 is the canonical representation of a @see Product8
  *
  */
-case class Tuple8[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7, _8:T8)
-  extends Product8[T1, T2, T3, T4, T5, T6, T7, T8]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(',').append(_8).append(')')
-     sb.toString
-   }
+case class Tuple8[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7,_8:T8)
+  extends Product8[T1, T2, T3, T4, T5, T6, T7, T8]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + "," + _7 + "," + _8 + ")"
 
 }
diff --git a/src/library/scala/Tuple9.scala b/src/library/scala/Tuple9.scala
index 27b8299054..44a680baca 100644
--- a/src/library/scala/Tuple9.scala
+++ b/src/library/scala/Tuple9.scala
@@ -1,4 +1,3 @@
-
 /*                     __                                               *\
 **     ________ ___   / /  ___     Scala API                            **
 **    / __/ __// _ | / /  / _ |    (c) 2002-2009, LAMP/EPFL             **
@@ -9,20 +8,18 @@
 
 // $Id$
 
-// generated by genprod on Wed Apr 23 10:06:16 CEST 2008
+// generated by genprod on Wed Jun 17 14:10:05 PDT 2009
 
 package scala
 
+
+
 /** Tuple9 is the canonical representation of a @see Product9
  *
  */
-case class Tuple9[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9](_1:T1, _2:T2, _3:T3, _4:T4, _5:T5, _6:T6, _7:T7, _8:T8, _9:T9)
-  extends Product9[T1, T2, T3, T4, T5, T6, T7, T8, T9]  {
-
-   override def toString() = {
-     val sb = new StringBuilder
-     sb.append('(').append(_1).append(',').append(_2).append(',').append(_3).append(',').append(_4).append(',').append(_5).append(',').append(_6).append(',').append(_7).append(',').append(_8).append(',').append(_9).append(')')
-     sb.toString
-   }
+case class Tuple9[+T1, +T2, +T3, +T4, +T5, +T6, +T7, +T8, +T9](_1:T1,_2:T2,_3:T3,_4:T4,_5:T5,_6:T6,_7:T7,_8:T8,_9:T9)
+  extends Product9[T1, T2, T3, T4, T5, T6, T7, T8, T9]
+{
+  override def toString() = "(" + _1 + "," + _2 + "," + _3 + "," + _4 + "," + _5 + "," + _6 + "," + _7 + "," + _8 + "," + _9 + ")"
 
 }
-- 
cgit v1.2.3