Merge pull request #353 from eventualbuddha/fix-error-position-reporting

Fix the reported line/column for syntax errors.
michaelficarra · Sep 23, 2015 · 4f71af2 · 4f71af2
2 parents a180874 + 81afe1c
commit 4f71af2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/lib/parser.js b/lib/parser.js
diff --git a/src/grammar.pegcoffee b/src/grammar.pegcoffee
@@ -272,36 +272,37 @@
     return peg$reportedPos - csr$controlCharacterCount;
   }
 
-  function peg$computePosDetails() {
-    function advanceCachedReportedPos() {
-      var ch;
+  function peg$computePosDetails(pos) {
+    function advance(details, startPos, endPos) {
+      var p, ch;
 
-      for (; peg$cachedPos < peg$reportedPos; peg$cachedPos++) {
-        ch = input.charAt(peg$cachedPos);
+      for (p = startPos; p < endPos; p++) {
+        ch = input.charAt(p);
         if (ch === "\n") {
-          if (!peg$cachedPosDetails.seenCR) { peg$cachedPosDetails.line++; }
-          peg$cachedPosDetails.column = 1;
-          peg$cachedPosDetails.seenCR = false;
+          if (!details.seenCR) { details.line++; }
+          details.column = 1;
+          details.seenCR = false;
         } else if (ch === "\r" || ch === "\u2028" || ch === "\u2029") {
-          peg$cachedPosDetails.line++;
-          peg$cachedPosDetails.column = 1;
-          peg$cachedPosDetails.seenCR = true;
+          details.line++;
+          details.column = 1;
+          details.seenCR = true;
         } else if(!/[\uEFEF\uEFFE\uEFFF]/.test(ch)) {
-          peg$cachedPosDetails.column++;
-          peg$cachedPosDetails.seenCR = false;
+          details.column++;
+          details.seenCR = false;
         } else {
           csr$controlCharacterCount++;
         }
       }
     }
 
-    if (peg$cachedPos !== peg$reportedPos) {
-      if (peg$cachedPos > peg$reportedPos) {
+    if (peg$cachedPos !== pos) {
+      if (peg$cachedPos > pos) {
         csr$controlCharacterCount = 0;
         peg$cachedPos = 0;
         peg$cachedPosDetails = { line: 1, column: 1, seenCR: false };
       }
-      advanceCachedReportedPos();
+      advance(peg$cachedPosDetails, peg$cachedPos, pos);
+      peg$cachedPos = pos;
     }
 
     return peg$cachedPosDetails;