Fix off-by one error

peggyjs · Jul 7, 2022 · f769eb4 · f769eb4
1 parent 7afbc8e
commit f769eb4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/lib/grammar-location.js b/lib/grammar-location.js
@@ -39,7 +39,7 @@ class GrammarLocation {
    */
   offset(loc) {
     return {
-      line: loc.line + this.start.line,
+      line: loc.line + this.start.line - 1,
       column: (loc.line === 1)
         ? loc.column + this.start.column - 1
         : loc.column,

diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "benchmark": "node ./benchmark/run_bench.js",
     "rollup": "copyfiles package.json build/ts && rollup -c",
     "terser": "npm run terser:peggy && npm run terser:tests && npm run terser:bench",
-    "terser:peggy": "terser -c passes=2 -m --sequences 40 build/rollup/peggy.umd.js -o build/peggy.min.js",
+    "terser:peggy": "terser -c passes=2 -m reserved=['GrammarLocation'] --sequences 40 build/rollup/peggy.umd.js -o build/peggy.min.js",
     "terser:tests": "terser -c passes=2 -m --sequences 40 --module build/rollup/test.umd.js -o build/test-bundle.min.js",
     "terser:bench": "terser -c passes=2 -m --sequences 40 --module build/rollup/benchmark.umd.js -o build/benchmark-bundle.min.js",
     "headers": "node ./tools/header.js build/peggy.min.js build/benchmark-bundle.min.js build/test-bundle.min.js",

diff --git a/test/unit/grammar-error.spec.js b/test/unit/grammar-error.spec.js
@@ -182,30 +182,30 @@ note: Warning Subinfo
           });
           expect(e.format([{ source: gl, text: source.text }])).to.equal(`\
 error: message
- --> foo.peggy:16:8
+ --> foo.peggy:15:8
    |
-16 | some error
+15 | some error
    | ^^^^
 note: Subinfo
- --> foo.peggy:16:13
+ --> foo.peggy:15:13
    |
-16 | some error
+15 | some error
    |      ^^^^^
 note: Column not offset
- --> foo.peggy:17:1
+ --> foo.peggy:16:1
    |
-17 | that
+16 | that
    | ^^^^
 
 warning: Warning message
- --> foo.peggy:16:13
+ --> foo.peggy:15:13
    |
-16 | some error
+15 | some error
    |      ^^^^^
 note: Warning Subinfo
- --> foo.peggy:16:13
+ --> foo.peggy:15:13
    |
-16 | some error
+15 | some error
    |      ^^^^^`);
           location.source = "foo.peggy";
           subSpan.source = "foo.peggy";