Merge pull request #281 from zjmiller/master
Test with Acorn (not Acorn-6to5) and fix issue with AssignmentPattern
diff --git a/escodegen.js b/escodegen.js
index 0c1b1ae..0360521 100644
--- a/escodegen.js
+++ b/escodegen.js
@@ -2205,7 +2205,7 @@
},
AssignmentPattern: function(expr, precedence, flags) {
- return this.generateAssignment(expr.left, expr.right, expr.operator, precedence, flags);
+ return this.generateAssignment(expr.left, expr.right, '=', precedence, flags);
},
ObjectPattern: function (expr, precedence, flags) {
diff --git a/package.json b/package.json
index d96ec00..d459553 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
"source-map": "~0.2.0"
},
"devDependencies": {
- "acorn-6to5": "^0.11.1-25",
+ "acorn": "^2.7.0",
"bluebird": "^2.3.11",
"bower-registry-client": "^0.2.1",
"chai": "^1.10.0",
diff --git a/test/compare-acorn-es6.js b/test/compare-acorn-es6.js
index 4ecbbc7..6384675 100644
--- a/test/compare-acorn-es6.js
+++ b/test/compare-acorn-es6.js
@@ -25,7 +25,7 @@
'use strict';
var fs = require('fs'),
- acorn = require('acorn-6to5'),
+ acorn = require('acorn'),
escodegen = require('./loader'),
chai = require('chai'),
expect = chai.expect;
@@ -37,11 +37,9 @@
StringObject = String;
options = {
- range: true,
- loc: false,
- tokens: true,
- raw: false,
- ecmaVersion: 7
+ ranges: true,
+ locations: false,
+ ecmaVersion: 6
};
tree = acorn.parse(code, options);
@@ -58,11 +56,9 @@
StringObject = String;
options = {
- range: true,
- loc: false,
- tokens: true,
- raw: false,
- ecmaVersion: 7
+ ranges: true,
+ locations: false,
+ ecmaVersion: 6
};
tree = acorn.parse(code, options);