summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2010-02-26 10:00:49 +0000
committerAdriaan Moors <adriaan.moors@epfl.ch>2010-02-26 10:00:49 +0000
commit0dd2f30edbb44d526be60676fef9ba05a9e3dfbf (patch)
tree0ead0bf99cc0076722dd446aa7992ac002ec5c7b /src
parent93f8dd3a4ee6b16221f77c19c0589154f83507b9 (diff)
downloadscala-0dd2f30edbb44d526be60676fef9ba05a9e3dfbf.tar.gz
scala-0dd2f30edbb44d526be60676fef9ba05a9e3dfbf.tar.bz2
scala-0dd2f30edbb44d526be60676fef9ba05a9e3dfbf.zip
see #2634: updated docs to indicate zipped is s...
see #2634: updated docs to indicate zipped is strict
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/Tuple2.scala5
-rw-r--r--src/library/scala/Tuple3.scala5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/library/scala/Tuple2.scala b/src/library/scala/Tuple2.scala
index 2a4797ab5a..8c4e5973c5 100644
--- a/src/library/scala/Tuple2.scala
+++ b/src/library/scala/Tuple2.scala
@@ -42,6 +42,11 @@ case class Tuple2[+T1, +T2](_1:T1,_2:T2)
b1.result
}
+ /** Wraps a tuple in a `Zipped`, which supports 2-ary generalisations of map, flatMap, filter,...
+ *
+ * @see Zipped
+ * $willNotTerminateInf
+ */
def zipped[Repr1, El1, Repr2, El2](implicit w1: T1 => TraversableLike[El1, Repr1], w2: T2 => IterableLike[El2, Repr2]): Zipped[Repr1, El1, Repr2, El2]
= new Zipped[Repr1, El1, Repr2, El2](_1, _2)
diff --git a/src/library/scala/Tuple3.scala b/src/library/scala/Tuple3.scala
index b70310db3f..a1fca95e4d 100644
--- a/src/library/scala/Tuple3.scala
+++ b/src/library/scala/Tuple3.scala
@@ -41,6 +41,11 @@ case class Tuple3[+T1, +T2, +T3](_1:T1,_2:T2,_3:T3)
b1.result
}
+ /** Wraps a tuple in a `Zipped`, which supports 3-ary generalisations of map, flatMap, filter,...
+ *
+ * @see Zipped
+ * $willNotTerminateInf
+ */
def zipped[Repr1, El1, Repr2, El2, Repr3, El3](implicit w1: T1 => TraversableLike[El1, Repr1],
w2: T2 => IterableLike[El2, Repr2],
w3: T3 => IterableLike[El3, Repr3]): Zipped[Repr1, El1, Repr2, El2, Repr3, El3]