Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions shared/src/main/scala/scala/util/parsing/input/PagedSeq.scala
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,8 @@ object PagedSeq {
fromIterator(source.iterator)

/** Constructs a paged character sequence from a string iterator */
def fromStrings(source: Iterator[String]): PagedSeq[Char] = {
var current: String = ""
def more(data: Array[Char], start: Int, len: Int): Int =
if (current.length != 0) {
val cnt = current.length min len
current.getChars(0, cnt, data, start)
current = current.substring(cnt)
if (cnt == len) cnt
else (more(data, start + cnt, len - cnt) max 0) + cnt
} else if (source.hasNext) {
current = source.next()
more(data, start, len)
} else -1
new PagedSeq(more(_: Array[Char], _: Int, _: Int))
}
def fromStrings(source: Iterator[String]): PagedSeq[Char] =
fromIterator(source.flatMap(_.iterator))

/** Constructs a paged character sequence from a string iterable */
def fromStrings(source: Iterable[String]): PagedSeq[Char] =
Expand Down
15 changes: 15 additions & 0 deletions shared/src/test/scala/scala/util/parsing/input/gh178.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package scala.util.parsing.input

import org.junit.Assert.assertEquals
import org.junit.Test

class gh178 {

@Test
def test: Unit = {
val len = 100000
val i = Iterator.fill(len)("A")
val pagedSeq = PagedSeq.fromStrings(i)
assertEquals(len, pagedSeq.slice(0).length) // should not fail with StackOverflowError
}
}