Merged revisions 21372,21374-21375,21378-21383 ...

Merged revisions 21372,21374-21375,21378-21383 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r21372 | extempore | 2010-04-07 17:50:16 +0200 (Wed, 07 Apr 2010) | 3 lines

  Tore out some unnecessary ambiguity-creating aliases in the XML
package object. I have a feeling we'll be traversing this kind of
territory again. Closes #3264, no review. ........ r21374 | extempore |
2010-04-07 21:06:52 +0200 (Wed, 07 Apr 2010) | 10 lines

  Created a test.suite.clean.checkinit ant target which:

    runs ant all.clean
    builds with -Xcheckinit
    runs the test suite with -Xcheckinit

  Review by cunei? If the nightly is trying to do the above sequence
with command line options, I suggest it be changed to run this target or
a similar one so the logic is not separated from the buildfile. ........
r21375 | extempore | 2010-04-07 21:23:08 +0200 (Wed, 07 Apr 2010) | 4
lines

  Gave Stream a lazy withFilter implementation. Now you too can have a
collection containing all the even numbers in the universe and still be
home in time for tea. Threw in some Stream cleanups for free. Closes
#3265, review by community. ........ r21378 | prokopec | 2010-04-08
14:04:55 +0200 (Thu, 08 Apr 2010) | 1 line

  Some typos in collections. Review by odersky.
........
  r21379 | prokopec | 2010-04-08 15:05:33 +0200 (Thu, 08 Apr 2010) | 1 line

  Mostly some undocumented stuff in JavaConversions. Review by
milessabin. ........ r21380 | dubochet | 2010-04-08 15:20:58 +0200 (Thu,
08 Apr 2010) | 1 line

  [scaladoc] Fixed filter method in template page (inherited filtering
works again). No review. Fixed whitespace in sources. ........ r21381 |
prokopec | 2010-04-08 16:16:31 +0200 (Thu, 08 Apr 2010) | 1 line

  Another set of typos fixed. Scan* added to TraversableMethods
interface. Review by odersky. ........ r21382 | prokopec | 2010-04-08
18:09:24 +0200 (Thu, 08 Apr 2010) | 1 line

  More cleanups in docs. Review by odersky.
........
  r21383 | extempore | 2010-04-08 20:12:34 +0200 (Thu, 08 Apr 2010) | 1 line

  Fix and test for Iterator corner case. Closes #3269, no review.
........

4 files changed, 27 insertions, 0 deletions

diff --git a/test/files/run/bug3269.check b/test/files/run/bug3269.check
new file mode 100644
index 0000000000..c25611c15c
--- /dev/null
+++ b/test/files/run/bug3269.check
@@ -0,0 +1,2 @@
+1
+Hello
diff --git a/test/files/run/bug3269.scala b/test/files/run/bug3269.scala
new file mode 100644
index 0000000000..17e42cdb0e
--- /dev/null
+++ b/test/files/run/bug3269.scala
@@ -0,0 +1,9 @@
+object Test {
+  def main(args: Array[String]): Unit = {
+    val it = List(1).iterator ++ { println("Hello"); Iterator.empty }
+    println(it.next)
+    it.hasNext
+    it.hasNext
+    it.hasNext
+  }
+}
diff --git a/test/files/run/streamWithFilter.check b/test/files/run/streamWithFilter.check
new file mode 100644
index 0000000000..6b0e91a147
--- /dev/null
+++ b/test/files/run/streamWithFilter.check
@@ -0,0 +1,5 @@
+15
+30
+45
+60
+75
diff --git a/test/files/run/streamWithFilter.scala b/test/files/run/streamWithFilter.scala
new file mode 100644
index 0000000000..cb919d4f55
--- /dev/null
+++ b/test/files/run/streamWithFilter.scala
@@ -0,0 +1,11 @@
+object Test {
+  val nums = Stream.from(1)
+  def isFizz(x: Int) = x % 3 == 0
+  def isBuzz(x: Int) = x % 5 == 0
+  // next line will run forever if withFilter isn't doing its thing.
+  val fizzbuzzes = for (n <- nums ; if isFizz(n) ; if isBuzz(n)) yield n
+
+  def main(args: Array[String]): Unit = {
+    fizzbuzzes take 5 foreach println
+  }
+}