Commit f809b06

committed

Fix packrat caching with PagedSeqReader

This fixes #45. The problem was that whenever PagedSeqReader is constructed, source is assigned seq (although lazily) but since PagedSeq is not a subclass of java.lang.CharSequence, an implicit conversion takes place via Predef#SeqCharSequence, creating a new object. The problem is that this happens every time PagedSeqReader#rest or drop is called, breaking packrat caching entirely.

1 parent aacfcf8 commit f809b06Copy full SHA for f809b06

File tree

1 file changed

-4

lines changed

src/main/scala/scala/util/parsing/input
- PagedSeqReader.scala

1 file changed

-4

lines changed

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

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@ object PagedSeqReader {`
`30`	`30`	`* @author Martin Odersky`
`31`	`31`	`*/`
`32`	`32`	`class PagedSeqReader(seq: PagedSeq[Char],`
`33`		`- override val offset: Int) extends Reader[Char] {`
	`33`	`+ override val offset: Int) extends Reader[Char] { outer =>`
`34`	`34`	`import PagedSeqReader._`
`35`	`35`
`36`		`- override lazyval source: java.lang.CharSequence = seq`
	`36`	`+ override val source: java.lang.CharSequence = seq`
`37`	`37`
`38`	`38`	/** Construct a `PagedSeqReader` with its first element at
`39`	`39`	* `source(0)` and position `(1,1)`.
`@@ -51,7 +51,9 @@ class PagedSeqReader(seq: PagedSeq[Char],`
`51`	`51`	* otherwise, it's a `PagedSeqReader` containing the rest of input.
`52`	`52`	`*/`
`53`	`53`	`def rest: PagedSeqReader =`
`54`		`- if (seq.isDefinedAt(offset)) new PagedSeqReader(seq, offset + 1)`
	`54`	`+ if (seq.isDefinedAt(offset)) new PagedSeqReader(seq, offset + 1) {`
	`55`	`+ override val source: java.lang.CharSequence = outer.source`
	`56`	`+ }`
`55`	`57`	`else this`
`56`	`58`
`57`	`59`	`/** The position of the first element in the reader.`
`@@ -67,5 +69,7 @@ class PagedSeqReader(seq: PagedSeq[Char],`
`67`	`69`	* `n` elements.
`68`	`70`	`*/`
`69`	`71`	`override def drop(n: Int): PagedSeqReader =`
`70`		`- new PagedSeqReader(seq, offset + n)`
	`72`	`+ new PagedSeqReader(seq, offset + n) {`
	`73`	`+ override val source: java.lang.CharSequence = outer.source`
	`74`	`+ }`
`71`	`75`	`}`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit f809b06

File tree

1 file changed

1 file changed

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

0 commit comments