diff options
author | Burak Emir <emir@epfl.ch> | 2007-01-02 16:51:29 +0000 |
---|---|---|
committer | Burak Emir <emir@epfl.ch> | 2007-01-02 16:51:29 +0000 |
commit | bfea9f20d231bc6b7fb75edbce277d883265b89d (patch) | |
tree | 97d1ad6e319e2dbc96edde4c906ae9668f82c7cb /src/library/scala/Product6.scala | |
parent | 9e3b5c094b4e8b96d418d7498deab78dcb8bf150 (diff) | |
download | scala-bfea9f20d231bc6b7fb75edbce277d883265b89d.tar.gz scala-bfea9f20d231bc6b7fb75edbce277d883265b89d.tar.bz2 scala-bfea9f20d231bc6b7fb75edbce277d883265b89d.zip |
* TupleN extends ProductN, again (genprod updated)
* better comments and parameter names in scala.xml.MetaData typechecker
* now handles special cases (n=0, n=1) for unapply correctly
* * even if one returns a Option[Product1[T]]
* typechecker now handles unapply return types correctly
* * e.g. when returning Option[{A,B}] instead of Option[Product2[A,B]]
Diffstat (limited to 'src/library/scala/Product6.scala')
-rw-r--r-- | src/library/scala/Product6.scala | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/library/scala/Product6.scala b/src/library/scala/Product6.scala index 0e125653c3..4ec0479ae8 100644 --- a/src/library/scala/Product6.scala +++ b/src/library/scala/Product6.scala @@ -7,17 +7,17 @@ ** |/ ** \* */ -// $Id: genprod.scala 9494 2006-12-11 11:35:38Z odersky $ +// $Id$ -// generated by genprod on Tue Dec 12 11:32:13 CET 2006 +// generated by genprod on Tue Jan 02 15:19:32 CET 2007 package scala import Predef._ object Product6 { - def unapply[T1, T2, T3, T4, T5, T6](x:Any): Option[Product6[T1, T2, T3, T4, T5, T6]] = - if(x.isInstanceOf[Product6[T1, T2, T3, T4, T5, T6]]) Some(x.asInstanceOf[Product6[T1, T2, T3, T4, T5, T6]]) else None + def unapply[T1, T2, T3, T4, T5, T6](x: Product6[T1, T2, T3, T4, T5, T6]): Some[Product6[T1, T2, T3, T4, T5, T6]] = + Some(x) } /** Product6 is a cartesian product of 6 components @@ -49,22 +49,22 @@ trait Product6[+T1, +T2, +T3, +T4, +T5, +T6] extends Product { } /** projection of this product */ - def _1:T1 + def _1: T1 - /** projection of this product */ - def _2:T2 +/** projection of this product */ + def _2: T2 - /** projection of this product */ - def _3:T3 +/** projection of this product */ + def _3: T3 - /** projection of this product */ - def _4:T4 +/** projection of this product */ + def _4: T4 - /** projection of this product */ - def _5:T5 +/** projection of this product */ + def _5: T5 - /** projection of this product */ - def _6:T6 +/** projection of this product */ + def _6: T6 } |