Fix esprima error column number and parsing lambdas

repos-javascript-compilers · May 31, 2012 · 37aa78d · 37aa78d
1 parent e4c369e
commit 37aa78d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/esprima.js b/src/esprima.js
@@ -3184,8 +3184,8 @@
     var token, id = null, firstRestricted, message, param, paramType, params = [], body, previousStrict, paramSet, paramTypes, returnType;
 
     expectKeyword('function');
-    returnType = parseInlineableType();
     if (!match('(')) {
+      returnType = parseInlineableType();
       token = lookahead();
       id = parseVariableIdentifier();
       if (strict) {

diff --git a/src/ljc.js b/src/ljc.js
@@ -192,7 +192,7 @@
 
       if (e.index) {
         // Esprima error, make a loc out of it.
-        var lc = { line: e.lineNumber, column: e.column };
+        var lc = { line: e.lineNumber, column: e.column - 1 };
         e.loc = { start: lc, end: lc };
         logger.error(e.message, { start: lc, end: lc });
         logger.flush();