summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-05-05 08:37:12 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-05-05 08:37:12 +0000
commitf2acf335edf66454f45f1b69c233abeb74b76282 (patch)
tree1c762c0e4d9de7924e5089dad57a7637cdb58c96 /src/library
parent4e4e1e4c759c14fbc45f92072b692fa3b9540ba0 (diff)
downloadscala-f2acf335edf66454f45f1b69c233abeb74b76282.tar.gz
scala-f2acf335edf66454f45f1b69c233abeb74b76282.tar.bz2
scala-f2acf335edf66454f45f1b69c233abeb74b76282.zip
Merged revisions 21777-21779,21783-21784,21787-...
Merged revisions 21777-21779,21783-21784,21787-21802 via svnmerge from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r21777 | dragos | 2010-05-02 19:41:59 +0200 (Sun, 02 May 2010) | 1 line Properly specialize superclasses of a specialized class. ........ r21778 | dragos | 2010-05-02 19:42:06 +0200 (Sun, 02 May 2010) | 1 line Closes #3382. no review. ........ r21779 | dragos | 2010-05-02 19:42:10 +0200 (Sun, 02 May 2010) | 1 line Fixed private member access, closes #3380. no review. ........ r21783 | dragos | 2010-05-03 09:58:15 +0200 (Mon, 03 May 2010) | 2 lines Renamed Idea project files to have a .SAMPLE suffix. Having to constantly remove them from each commit was too cumbersome. ........ r21784 | phaller | 2010-05-03 11:35:13 +0200 (Mon, 03 May 2010) | 1 line Increased partest per-test timeout in an attempt to fix the windows nightly. ........ r21787 | dragos | 2010-05-04 11:34:50 +0200 (Tue, 04 May 2010) | 3 lines Removed 4-year old println when getModuleOrClass fails. It polluted debug output when -Ydebug was present because now every (successful) compiler run hits a few MissingRequirementErrors, quietly swallowed by getModule2/getClass2. The errors are normal during the transition to 'scala.collection.immutable.List' and 'scala.Seq/Sequence', while definitions are built. No review. ........ r21788 | dragos | 2010-05-04 11:34:55 +0200 (Tue, 04 May 2010) | 1 line Closes #3378. No review. ........ r21789 | dragos | 2010-05-04 11:34:58 +0200 (Tue, 04 May 2010) | 1 line Fixed abstract overrides of specialized methods. Closes #3379, no review. Added test files for latest bug fixes. ........ r21790 | moors | 2010-05-04 15:53:09 +0200 (Tue, 04 May 2010) | 2 lines closes #3373, #3177: validity check of an implicit value should consider the value as well as its accessor review by odersky ........ r21791 | rytz | 2010-05-04 16:01:58 +0200 (Tue, 04 May 2010) | 1 line fix and test where constructor parameter annotations end up. no review ........ r21792 | moors | 2010-05-04 16:03:47 +0200 (Tue, 04 May 2010) | 1 line sorry, last-minute edit broke build: re-added parens ........ r21793 | moors | 2010-05-04 16:36:14 +0200 (Tue, 04 May 2010) | 6 lines Revert r21790: "closes #3373, #3177: validity check of an implicit " value should consider the value as well as its accessor Revert " r21792: "sorry, last-minute edit broke build: re-added parens " will investigate how it broke and why my local pre-commit tests did not catch the failure... no review ........ r21794 | rytz | 2010-05-04 16:40:10 +0200 (Tue, 04 May 2010) | 1 line close #3384. cleaned up constructor defaults. see #3338 see #3344 see #2057 see #3207. no review ........ r21795 | phaller | 2010-05-04 16:54:57 +0200 (Tue, 04 May 2010) | 1 line Some more, hopefully temporary, partest timeout tweaks. No review. ........ r21796 | imaier | 2010-05-04 17:06:23 +0200 (Tue, 04 May 2010) | 1 line Fixed #3274. No review. ........ r21797 | odersky | 2010-05-04 18:00:15 +0200 (Tue, 04 May 2010) | 1 line Fixed StringBuilder#last performance problem. ........ r21798 | moors | 2010-05-04 18:21:13 +0200 (Tue, 04 May 2010) | 2 lines revert commit that probably broke the build due to a bug in closure elimination revert commit that reverted the commit that probably didn't break the build ........ r21799 | dragos | 2010-05-04 18:59:28 +0200 (Tue, 04 May 2010) | 1 line Closes #3387. no review. ........ r21800 | dragos | 2010-05-04 19:07:41 +0200 (Tue, 04 May 2010) | 1 line Fixed broken commit. no review. ........ r21801 | extempore | 2010-05-04 20:33:41 +0200 (Tue, 04 May 2010) | 1 line Fix for #3391. No review. ........ r21802 | dragos | 2010-05-04 23:59:18 +0200 (Tue, 04 May 2010) | 1 line Fixing the conflict between the two private-related bugs, fixing the build. no review. ........
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/collection/mutable/StringBuilder.scala3
-rw-r--r--src/library/scala/runtime/ScalaRunTime.scala5
2 files changed, 6 insertions, 2 deletions
diff --git a/src/library/scala/collection/mutable/StringBuilder.scala b/src/library/scala/collection/mutable/StringBuilder.scala
index f43acdc796..9673e59486 100644
--- a/src/library/scala/collection/mutable/StringBuilder.scala
+++ b/src/library/scala/collection/mutable/StringBuilder.scala
@@ -31,7 +31,8 @@ import StringBuilder._
@SerialVersionUID(0 - 8525408645367278351L)
final class StringBuilder(initCapacity: Int, private val initValue: String)
extends Builder[Char, String]
- with IndexedSeq[Char] {
+ with IndexedSeq[Char]
+ with IndexedSeqOptimized[Char, IndexedSeq[Char]] {
require(initCapacity >= 0)
diff --git a/src/library/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala
index dffebfc892..a0bdd122e6 100644
--- a/src/library/scala/runtime/ScalaRunTime.scala
+++ b/src/library/scala/runtime/ScalaRunTime.scala
@@ -14,7 +14,7 @@ package scala.runtime
import scala.reflect.ClassManifest
import scala.collection.{ Seq, IndexedSeq, TraversableView }
import scala.collection.mutable.WrappedArray
-import scala.collection.immutable.{ List, Stream, Nil, :: }
+import scala.collection.immutable.{ NumericRange, List, Stream, Nil, :: }
import scala.xml.{ Node, MetaData }
import scala.util.control.ControlThrowable
@@ -239,6 +239,9 @@ object ScalaRunTime {
case x: Node => x toString
// Not to mention MetaData extends Iterable[MetaData]
case x: MetaData => x toString
+ // Range/NumericRange have a custom toString to avoid walking a gazillion elements
+ case x: Range => x toString
+ case x: NumericRange[_] => x toString
case x: AnyRef if isArray(x) => WrappedArray make x map inner mkString ("Array(", ", ", ")")
case x: TraversableView[_, _] => x.toString
case x: Traversable[_] if !x.hasDefiniteSize => x.toString