Fixes needed for new lazy val overriding rules.

Author: odersky

src/library/scala/collection/IterableViewLike.scala

@@ -83,15 +83,15 @@ trait IterableViewLike[+A,
   }
 
   trait ZippedI[B] extends TransformedI[(A, B)] {
-    protected[this] val other: GenIterable[B]
+    protected[this] lazy val other: GenIterable[B]
     def iterator: Iterator[(A, B)] = self.iterator zip other.iterator
     final override protected[this] def viewIdentifier = "Z"
   }
 
   trait ZippedAllI[A1 >: A, B] extends TransformedI[(A1, B)] {
-    protected[this] val other: GenIterable[B]
-    protected[this] val thisElem: A1
-    protected[this] val thatElem: B
+    protected[this] lazy val other: GenIterable[B]
+    protected[this] lazy val thisElem: A1
+    protected[this] lazy val thatElem: B
     final override protected[this] def viewIdentifier = "Z"
     def iterator: Iterator[(A1, B)] =
       self.iterator.zipAll(other.iterator, thisElem, thatElem)

src/library/scala/collection/SeqViewLike.scala

@@ -159,9 +159,9 @@ trait SeqViewLike[+A,
   // Must also take care to allow patching inside an infinite stream
   // (patching in an infinite stream is not okay)
   trait PatchedS[B >: A] extends TransformedS[B] {
-    protected[this] val from: Int
-    protected[this] val patch: GenSeq[B]
-    protected[this] val replaced: Int
+    protected[this] lazy val from: Int
+    protected[this] lazy val patch: GenSeq[B]
+    protected[this] lazy val replaced: Int
     private lazy val plen = patch.length
     override def iterator: Iterator[B] = self.iterator patch (from, patch.iterator, replaced)
     def length: Int = {
@@ -180,7 +180,7 @@ trait SeqViewLike[+A,
   }
 
   trait PrependedS[B >: A] extends TransformedS[B] {
-    protected[this] val fst: B
+    protected[this] lazy val fst: B
     override def iterator: Iterator[B] = Iterator.single(fst) ++ self.iterator
     def length: Int = 1 + self.length
     def apply(idx: Int): B =

src/library/scala/collection/TraversableViewLike.scala

@@ -137,13 +137,13 @@ trait TraversableViewLike[+A,
    *  on it. Used for those operations which do not naturally lend themselves to a view
    */
   trait ForcedT[B] extends TransformedT[B] {
-    protected[this] val forced: GenSeq[B]
+    protected[this] lazy val forced: GenSeq[B]
     def foreach[U](f: B => U) = forced foreach f
     final override protected[this] def viewIdentifier = "C"
   }
 
   trait SlicedT extends TransformedT[A] {
-    protected[this] val endpoints: SliceInterval
+    protected[this] lazy val endpoints: SliceInterval
     protected[this] def from  = endpoints.from
     protected[this] def until = endpoints.until
     // protected def newSliced(_endpoints: SliceInterval): TransformedT[A] =
@@ -163,7 +163,7 @@ trait TraversableViewLike[+A,
   }
 
   trait MappedT[B] extends TransformedT[B] {
-    protected[this] val mapping: A => B
+    protected[this] lazy val mapping: A => B
     def foreach[U](f: B => U) {
       for (x <- self)
         f(mapping(x))
@@ -172,7 +172,7 @@ trait TraversableViewLike[+A,
   }
 
   trait FlatMappedT[B] extends TransformedT[B] {
-    protected[this] val mapping: A => GenTraversableOnce[B]
+    protected[this] lazy val mapping: A => GenTraversableOnce[B]
     def foreach[U](f: B => U) {
       for (x <- self)
         for (y <- mapping(x).seq)
@@ -182,7 +182,7 @@ trait TraversableViewLike[+A,
   }
 
   trait AppendedT[B >: A] extends TransformedT[B] {
-    protected[this] val rest: GenTraversable[B]
+    protected[this] lazy val rest: GenTraversable[B]
     def foreach[U](f: B => U) {
       self foreach f
       rest foreach f
@@ -191,7 +191,7 @@ trait TraversableViewLike[+A,
   }
 
   trait FilteredT extends TransformedT[A] {
-    protected[this] val pred: A => Boolean
+    protected[this] lazy val pred: A => Boolean
     def foreach[U](f: A => U) {
       for (x <- self)
         if (pred(x)) f(x)
@@ -200,7 +200,7 @@ trait TraversableViewLike[+A,
   }
 
   trait TakenWhileT extends TransformedT[A] {
-    protected[this] val pred: A => Boolean
+    protected[this] lazy val pred: A => Boolean
     def foreach[U](f: A => U) {
       for (x <- self) {
         if (!pred(x)) return
@@ -211,7 +211,7 @@ trait TraversableViewLike[+A,
   }
 
   trait DroppedWhileT extends TransformedT[A] {
-    protected[this] val pred: A => Boolean
+    protected[this] lazy val pred: A => Boolean
     def foreach[U](f: A => U) {
       var go = false
       for (x <- self) {