Merge pull request #703 from sethkinast/peg-0.9

Upgrade to peg.js 0.9
linkedin · Sep 24, 2015 · 3fc12ef · 3fc12ef
2 parents c1d9e21 + 2310047
commit 3fc12ef
Show file tree

Hide file tree

Showing 5 changed files with 678 additions and 654 deletions.
diff --git a/lib/compiler.js b/lib/compiler.js
@@ -25,13 +25,11 @@
     try {
       var ast = filterAST(parse(source));
       return compile(ast, name);
-    }
-    catch (err)
-    {
-      if (!err.line || !err.column) {
+    } catch (err) {
+      if (!err.location) {
         throw err;
       }
-      throw new SyntaxError(err.message + ' At line : ' + err.line + ', column : ' + err.column);
+      throw new SyntaxError(err.message + ' [' + name + ':' + err.location.start.line + ':' + err.location.start.column + ']');
     }
   };