Merge pull request #65 from liskin/pagedseqreader-packrat

Fix packrat caching with PagedSeqReader

Author: gourlaysama

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

@@ -30,10 +30,10 @@ object PagedSeqReader {
  * @author Martin Odersky
  */
 class PagedSeqReader(seq: PagedSeq[Char],
-                     override val offset: Int) extends Reader[Char] {
+                     override val offset: Int) extends Reader[Char] { outer =>
   import PagedSeqReader._
 
-  override lazy val source: java.lang.CharSequence = seq
+  override val source: java.lang.CharSequence = seq
 
   /** Construct a `PagedSeqReader` with its first element at
    *  `source(0)` and position `(1,1)`.
@@ -51,7 +51,9 @@ class PagedSeqReader(seq: PagedSeq[Char],
    *         otherwise, it's a `PagedSeqReader` containing the rest of input.
    */
   def rest: PagedSeqReader =
-    if (seq.isDefinedAt(offset)) new PagedSeqReader(seq, offset + 1)
+    if (seq.isDefinedAt(offset)) new PagedSeqReader(seq, offset + 1) {
+      override val source: java.lang.CharSequence = outer.source
+    }
     else this
 
   /** The position of the first element in the reader.
@@ -67,5 +69,7 @@ class PagedSeqReader(seq: PagedSeq[Char],
    *  `n` elements.
    */
   override def drop(n: Int): PagedSeqReader =
-    new PagedSeqReader(seq, offset + n)
+    new PagedSeqReader(seq, offset + n) {
+      override val source: java.lang.CharSequence = outer.source
+    }
 }

src/test/scala/scala/util/parsing/combinator/gh45.scala

@@ -0,0 +1,46 @@
+package scala.util.parsing.combinator
+
+import scala.util.parsing.input._
+import scala.collection.immutable.PagedSeq
+
+import org.junit.Test
+import org.junit.Assert.assertTrue
+
+import scala.util.parsing.combinator.syntactical.StandardTokenParsers
+
+class gh45 {
+
+  @Test
+  def test4: Unit = {
+    def check(rd: Reader[Char]): Unit = {
+      val g = new grammar
+      val p = g.phrase(g.script)
+      val parseResult = p(new g.lexical.Scanner(rd))
+      assertTrue(parseResult.isInstanceOf[g.Success[_]])
+    }
+
+    val str = "x once y"
+    check(new CharSequenceReader(str))
+    /* Note that this only tests PagedSeq.rest since neither
+     * PackratReader nor lexical.Scanner override/use the drop method.
+     */
+    check(new PagedSeqReader(PagedSeq.fromStrings(List(str))))
+  }
+
+}
+
+private final class grammar extends StandardTokenParsers with PackratParsers {
+  lexical.reserved ++= List("x", "y", "z", "once")
+
+  var onceCnt: Int = 0
+  lazy val once: PackratParser[String] = memo("once") ^? {
+    case s if onceCnt == 0 =>
+      onceCnt += 1
+      s
+  }
+
+  lazy val script: PackratParser[Any] =
+    ( "x" ~ once ~ "z"
+    | "x" ~ once ~ "y"
+    )
+}