Merge commit 'cabf626bbc' into wip/fresh-merge2

paulp · paulp · commit d5c3a9acf1ba · 2013-02-01T17:41:05.000-08:00
diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala
@@ -305,6 +305,9 @@ sealed abstract class List[+A] extends AbstractSeq[A]
     }
     result
   }
+  
+  override def foldRight[B](z: B)(op: (A, B) => B): B =
+    reverse.foldLeft(z)((right, left) => op(left, right))
 
   override def stringPrefix = "List"
 
diff --git a/test/files/pos/t6601/PrivateValueClass_1.scala b/test/files/pos/t6601/PrivateValueClass_1.scala
@@ -0,0 +1 @@
+class V private (val a: Any) extends AnyVal
diff --git a/test/files/pos/t6601/UsePrivateValueClass_2.scala b/test/files/pos/t6601/UsePrivateValueClass_2.scala
@@ -0,0 +1,10 @@
+object Test {
+	// After the first attempt to make seprately compiled value
+	// classes respect the privacy of constructors, we got:
+	//
+	//   exception when typing v.a().==(v.a())/class scala.reflect.internal.Trees$Apply
+  //   constructor V in class V cannot be accessed in object Test in file test/files/pos/t6601/UsePrivateValueClass_2.scala
+  //   scala.reflect.internal.Types$TypeError: constructor V in class V cannot be accessed in object Test
+  def foo(v: V) = v.a == v.a
+  def bar(v: V) = v == v
+}
diff --git a/test/files/run/t2818.check b/test/files/run/t2818.check
@@ -0,0 +1,4 @@
+105
+499999500000
+0
+1
diff --git a/test/files/run/t2818.scala b/test/files/run/t2818.scala
@@ -0,0 +1,6 @@
+object Test extends App {
+  println((List.range(1L, 15L) :\ 0L) (_ + _))
+  println((List.range(1L, 1000000L) :\ 0L) (_ + _))
+  println((List.fill(5)(1) :\ 1) (_ - _)) 
+  println((List.fill(1000000)(1) :\ 1) (_ - _)) 
+}

Original file line number	Diff line number	Diff line change
`@@ -305,6 +305,9 @@ sealed abstract class List[+A] extends AbstractSeq[A]`
`305`	`305`	`}`
`306`	`306`	`result`
`307`	`307`	`}`
	`308`	`+`
	`309`	`+ override def foldRight[B](z: B)(op: (A, B) => B): B =`
	`310`	`+ reverse.foldLeft(z)((right, left) => op(left, right))`
`308`	`311`
`309`	`312`	`override def stringPrefix = "List"`
`310`	`313`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+class V private (val a: Any) extends AnyVal`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +105
 +499999500000
 +0
 +1