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 af1dcc49..08fc5559 100644 --- a/shared/src/main/scala/scala/util/parsing/input/CharArrayReader.scala +++ b/shared/src/main/scala/scala/util/parsing/input/CharArrayReader.scala @@ -31,8 +31,5 @@ object CharArrayReader { * @author Martin Odersky * @author Adriaan Moors */ -class CharArrayReader(chars: Array[Char], index: Int) extends CharSequenceReader(chars, index) { - - def this(chars: Array[Char]) = this(chars, 0) - -} +class CharArrayReader(chars: Array[Char], index: Int = 0) + extends CharSequenceReader(java.nio.CharBuffer.wrap(chars), index) 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 9df440b7..7ae3777a 100644 --- a/shared/src/main/scala/scala/util/parsing/input/PagedSeqReader.scala +++ b/shared/src/main/scala/scala/util/parsing/input/PagedSeqReader.scala @@ -34,7 +34,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 66f8b1a5..57d6c455 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/t7483.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/t7483.scala @@ -7,7 +7,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