diff --git a/shared/src/main/scala/scala/util/parsing/input/CharArrayReader.scala b/shared/src/main/scala/scala/util/parsing/input/CharArrayReader.scala index 0469cd11..ae0628b0 100644 --- a/shared/src/main/scala/scala/util/parsing/input/CharArrayReader.scala +++ b/shared/src/main/scala/scala/util/parsing/input/CharArrayReader.scala @@ -25,8 +25,6 @@ object CharArrayReader { * @param chars an array of characters * @param index starting offset into the array; the first element returned will be `source(index)` */ -class CharArrayReader(chars: Array[Char], index: Int) extends CharSequenceReader(chars, index) { - +class CharArrayReader(chars: Array[Char], index: Int) extends CharSequenceReader(java.nio.CharBuffer.wrap(chars), index) { def this(chars: Array[Char]) = this(chars, 0) - } diff --git a/shared/src/main/scala/scala/util/parsing/input/PagedSeqReader.scala b/shared/src/main/scala/scala/util/parsing/input/PagedSeqReader.scala index 85a7e209..4bdd7fd0 100644 --- a/shared/src/main/scala/scala/util/parsing/input/PagedSeqReader.scala +++ b/shared/src/main/scala/scala/util/parsing/input/PagedSeqReader.scala @@ -29,7 +29,7 @@ class PagedSeqReader(seq: PagedSeq[Char], override val offset: Int) extends Reader[Char] { outer => import PagedSeqReader._ - override val source: java.lang.CharSequence = seq + override val source: java.lang.CharSequence = new SeqCharSequence(seq) /** Construct a `PagedSeqReader` with its first element at * `source(0)` and position `(1,1)`. diff --git a/shared/src/test/scala/scala/util/parsing/combinator/t7483.scala b/shared/src/test/scala/scala/util/parsing/combinator/t7483.scala index 55056c27..07cfe395 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/t7483.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/t7483.scala @@ -19,7 +19,7 @@ import org.junit.Assert.assertEquals class t7483 { val s = "foo\nbar" - val reader = new CharSequenceReader(s.toCharArray(), 0) + val reader = new CharSequenceReader(s, 0) val p = reader.pos.asInstanceOf[OffsetPosition] @Test