Merge pull request #5136 from dotty-staging/fix-EOF-offset

Fix offset of token EOF

Author: allanrenucci

compiler/src/dotty/tools/dotc/parsing/CharArrayReader.scala

@@ -39,12 +39,12 @@ abstract class CharArrayReader { self =>
   final def nextChar(): Unit = {
     val idx = charOffset
     lastCharOffset = idx
+    charOffset = idx + 1
     if (idx >= buf.length) {
       ch = SU
     } else {
       val c = buf(idx)
       ch = c
-      charOffset = idx + 1
       if (c == '\\') potentialUnicode()
       else if (c < ' ') { skipCR(); potentialLineEnd() }
     }
@@ -59,12 +59,12 @@ abstract class CharArrayReader { self =>
   final def nextRawChar(): Unit = {
     val idx = charOffset
     lastCharOffset = idx
+    charOffset = idx + 1
     if (idx >= buf.length) {
       ch = SU
     } else {
-      val c = buf(charOffset)
+      val c = buf(idx)
       ch = c
-      charOffset = idx + 1
       if (c == '\\') potentialUnicode()
     }
   }

compiler/test-resources/repl/i2213

@@ -2,6 +2,8 @@ scala> def x
 1 | def x
   |      ^
   |      missing return type
-1 | def x
+
+scala> def x: Int
+1 | def x: Int
   |     ^
-  |     '=' expected, but eof found
+  |declaration of method x not allowed here: only classes can have declared but undefined members

tests/neg/i2494.scala

@@ -1,2 +1,3 @@
 enum
-object // error // error
+object // error
+// error

tests/neg/i4373a.scala

@@ -1,3 +1,4 @@
 // ==> 040fb47fbaf718cecb11a7d51ac5a48bf4f6a1fe.scala <==
 object x0 {
-  val x0 : _ with // error // error // error
+  val x0 : _ with // error // error
+// error

tests/neg/i4373b.scala

@@ -1,4 +1,5 @@
 // ==> 05bef7805687ba94da37177f7568e3ba7da1f91c.scala <==
 class x0 {
   x1: // error
-      x0 | _ // error // error
+      x0 | _ // error
+// error

tests/neg/i4373c.scala

@@ -1,3 +1,4 @@
 // ==> 18b253a4a89a84c5674165c6fc3efafad535eee3.scala <==
 object x0 {
-  def x1[x2 <:_[ // error // error // error
+  def x1[x2 <:_[ // error // error
+// error

tests/neg/parser-stability-1.scala

@@ -1,3 +1,4 @@
 object x0 {
 x1 match  // error
-def this // error // error
+def this // error
+// error

tests/neg/parser-stability-10.scala

@@ -10,4 +10,5 @@ def unapply(i1: Int)(i6: List[Int]): Int = {
 object i5 {
   import collection.mutable._
   try { ??? mutable { case i1(i5, i3, i4) => i5 }}  // error // error // error
-}  // error
+}
+// error

tests/neg/parser-stability-11.scala

@@ -2,4 +2,5 @@ package x0 {
 case class x0  // error // error
 }
 package x0
-class x0  // error // error
+class x0  // error
+// error

tests/neg/parser-stability-12.scala

@@ -1,3 +1,4 @@
 trait x0[]  // error
      trait x1[x1 <:x0]
-     extends x1[   // error
+     extends x1[
+// error