diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2014-09-02 15:32:14 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2014-09-02 15:32:14 +0200 |
commit | 3f69314c0fec82e8255a2576db5de8ba7528bb86 (patch) | |
tree | 8f6d6a8dd6217565f8fa8dbe432c96a0acb58d31 /src/library | |
parent | c66b88636149e950983d302cc035fc40d5ed14bf (diff) | |
parent | b5759efa364791a6b66865b05538549078f97aa1 (diff) | |
download | scala-3f69314c0fec82e8255a2576db5de8ba7528bb86.tar.gz scala-3f69314c0fec82e8255a2576db5de8ba7528bb86.tar.bz2 scala-3f69314c0fec82e8255a2576db5de8ba7528bb86.zip |
Merge commit 'b5759ef' into merge/2.10-to-2.11-sept-2
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/runtime/SeqCharSequence.scala | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/library/scala/runtime/SeqCharSequence.scala b/src/library/scala/runtime/SeqCharSequence.scala index ce7d7afc9e..74e67bb9e7 100644 --- a/src/library/scala/runtime/SeqCharSequence.scala +++ b/src/library/scala/runtime/SeqCharSequence.scala @@ -44,5 +44,10 @@ final class ArrayCharSequence(val xs: Array[Char], start: Int, end: Int) extends new ArrayCharSequence(xs, start1, start1 + newlen) } } - override def toString = xs drop start take length mkString "" + override def toString = { + val start = math.max(this.start, 0) + val end = math.min(xs.length, start + length) + + if (start >= end) "" else new String(xs, start, end - start) + } } |