Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 338ba0b

Browse files
Merge pull request #306 from SethTisue/charsequence
adapt to scala/scala#9292
2 parents de78aff + 6fc0724 commit 338ba0b

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

‎shared/src/main/scala/scala/util/parsing/input/CharArrayReader.scala‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,5 @@ object CharArrayReader {
3131
* @author Martin Odersky
3232
* @author Adriaan Moors
3333
*/
34-
class CharArrayReader(chars: Array[Char], index: Int) extends CharSequenceReader(chars, index) {
35-
36-
def this(chars: Array[Char]) = this(chars, 0)
37-
38-
}
34+
class CharArrayReader(chars: Array[Char], index: Int = 0)
35+
extends CharSequenceReader(java.nio.CharBuffer.wrap(chars), index)

‎shared/src/main/scala/scala/util/parsing/input/PagedSeqReader.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class PagedSeqReader(seq: PagedSeq[Char],
3434
override val offset: Int) extends Reader[Char] { outer =>
3535
import PagedSeqReader._
3636

37-
override val source: java.lang.CharSequence = seq
37+
override val source: java.lang.CharSequence = newSeqCharSequence(seq)
3838

3939
/** Construct a `PagedSeqReader` with its first element at
4040
* `source(0)` and position `(1,1)`.

‎shared/src/test/scala/scala/util/parsing/combinator/t7483.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.junit.Assert.assertEquals
77

88
class t7483 {
99
val s = "foo\nbar"
10-
val reader = new CharSequenceReader(s.toCharArray(), 0)
10+
val reader = new CharSequenceReader(s, 0)
1111
val p = reader.pos.asInstanceOf[OffsetPosition]
1212

1313
@Test

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /