Update export declarations to meet the latest estree spec

harmony.js's dropped tests are already covered by the compare-esprima2 tests.
Close estools#278

Author: Constellation

escodegen.js

@@ -1201,30 +1201,33 @@
             return ';';
         },
 
-        ExportDeclaration: function (stmt, flags) {
-            var result = [ 'export' ], bodyFlags, that = this;
+        ExportDefaultDeclaration: function (stmt, flags) {
+            var result = [ 'export' ], bodyFlags;
 
             bodyFlags = (flags & F_SEMICOLON_OPT) ? S_TFFT : S_TFFF;
 
             // export default HoistableDeclaration[Default]
             // export default AssignmentExpression[In] ;
-            if (stmt['default']) {
-                result = join(result, 'default');
-                if (isStatement(stmt.declaration)) {
-                    result = join(result, this.generateStatement(stmt.declaration, bodyFlags));
-                } else {
-                    result = join(result, this.generateExpression(stmt.declaration, Precedence.Assignment, E_TTT) + this.semicolon(flags));
-                }
-                return result;
+            result = join(result, 'default');
+            if (isStatement(stmt.declaration)) {
+                result = join(result, this.generateStatement(stmt.declaration, bodyFlags));
+            } else {
+                result = join(result, this.generateExpression(stmt.declaration, Precedence.Assignment, E_TTT) + this.semicolon(flags));
             }
+            return result;
+        },
+
+        ExportNamedDeclaration: function (stmt, flags) {
+            var result = [ 'export' ], bodyFlags, that = this;
+
+            bodyFlags = (flags & F_SEMICOLON_OPT) ? S_TFFT : S_TFFF;
 
             // export VariableStatement
             // export Declaration[Default]
             if (stmt.declaration) {
                 return join(result, this.generateStatement(stmt.declaration, bodyFlags));
             }
 
-            // export * FromClause ;
             // export ExportClause[NoReference] FromClause ;
             // export ExportClause ;
             if (stmt.specifiers) {
@@ -1265,13 +1268,16 @@
             return result;
         },
 
-        ExportDefaultDeclaration: function (stmt, flags) {
-             stmt.default = true;
-             return this.ExportDeclaration(stmt, flags);
-        },
-
-        ExportNamedDeclaration: function (stmt, flags) {
-            return this.ExportDeclaration(stmt, flags);
+        ExportAllDeclaration: function (stmt, flags) {
+            // export * FromClause ;
+            return [
+                'export' + space,
+                '*' + space,
+                'from' + space,
+                // ModuleSpecifier
+                this.generateExpression(stmt.source, Precedence.Sequence, E_TTT),
+                this.semicolon(flags)
+            ];
         },
 
         ExpressionStatement: function (stmt, flags) {
@@ -1729,7 +1735,7 @@
                 generateAsyncPrefix(stmt, true),
                 'function',
                 generateStarSuffix(stmt) || noEmptySpace(),
-                generateIdentifier(stmt.id),
+                stmt.id ? generateIdentifier(stmt.id) : '',
                 this.generateFunctionBody(stmt)
             ];
         },
@@ -2038,10 +2044,6 @@
             return result;
         },
 
-        ExportBatchSpecifier: function (expr, precedence, flags) {
-            return '*';
-        },
-
         ArrayPattern: function (expr, precedence, flags) {
             return this.ArrayExpression(expr, precedence, flags, true);
         },
@@ -2267,15 +2269,21 @@
         },
 
         ImportSpecifier: function (expr, precedence, flags) {
-            return this.ExportSpecifier(expr, precedence, flags);
+            var imported = expr.imported;
+            var result = [ imported.name ];
+            var local = expr.local;
+            if (local && local.name !== imported.name) {
+                result.push(noEmptySpace() + 'as' + noEmptySpace() + generateIdentifier(local));
+            }
+            return result;
         },
 
         ExportSpecifier: function (expr, precedence, flags) {
-            var name = (expr.id || expr.imported || expr.exported).name;
-            var result = [ name ];
-            var id = expr.name || expr.local;
-            if (id && id.name !== name) {
-                result.push(noEmptySpace() + 'as' + noEmptySpace() + generateIdentifier(id));
+            var local = expr.local;
+            var result = [ local.name ];
+            var exported = expr.exported;
+            if (exported && exported.name !== local.name) {
+                result.push(noEmptySpace() + 'as' + noEmptySpace() + generateIdentifier(exported));
             }
             return result;
         },

test/3rdparty/esprima-2.5.0.js

@@ -25,7 +25,7 @@
 'use strict';
 
 var fs = require('fs'),
-   esprima = require('./3rdparty/esprima-2.5.0'),
+   esprima = require('./3rdparty/esprima-2.7.1'),
    escodegen = require('./loader'),
    chai = require('chai'),
    expect = chai.expect,

test/3rdparty/esprima-2.7.1.js

@@ -11,7 +11,6 @@ export {
     c as d
 };
 export { };
-export default i = 20;
 export function test() {
 }
 export var i = 20;

test/compare-acorn-es6/exports.expected.min.js

@@ -0,0 +1 @@
+export*from'OK';export{name}from'OK';export{a as b,c as d}from'hello';export{a as b,c as d};export{};export function test(){}export var i=20;export let i=42

test/compare-esprima2.js

@@ -3,7 +3,6 @@ export { name } from "OK"
 export { a as b, c as d } from "hello"
 export { a as b, c as d }
 export { }
-export default i = 20
 export function test() { }
 export var i = 20
 export let i = 42