Merge branch 'bigint_and_numeric_separators_support'

Author: sanex3339

escodegen.js

@@ -2385,6 +2385,11 @@
               return '/' + expr.regex.pattern + '/' + expr.regex.flags;
             }
 
+            // BigInt, eg: 1n
+            if (typeof expr.bigint === 'string' && expr.raw) {
+                return expr.raw;
+            }
+
             if (expr.value === null) {
                 return 'null';
             }
@@ -2394,6 +2399,11 @@
             }
 
             if (typeof expr.value === 'number') {
+                // Has Numeric Separator
+                if (expr.raw && expr.raw.indexOf('_') !== -1) {
+                    return expr.raw;
+                }
+
                 return generateNumber(expr.value);
             }
 

test/compare-acorn-es2020/bigint.expected.js

@@ -0,0 +1,6 @@
+0n;
+2n;
+0x2n;
+0o2n;
+0b10n;
+-0xbf2ed51ff75d380fd3be813ec6185780n;

test/compare-acorn-es2020/bigint.expected.min.js

@@ -0,0 +1 @@
+0n;2n;0x2n;0o2n;0b10n;-0xbf2ed51ff75d380fd3be813ec6185780n

test/compare-acorn-es2020/bigint.js

@@ -0,0 +1,6 @@
+0n;
+2n;
+0x2n;
+0o2n;
+0b10n;
+-0xbf2ed51ff75d380fd3be813ec6185780n;

test/compare-acorn-es2021.js

@@ -0,0 +1,95 @@
+/*
+  Copyright (C) 2012-2013 Yusuke Suzuki <[email protected]>
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+'use strict';
+
+var fs = require('fs'),
+    acorn = require('acorn'),
+    escodegen = require('./loader'),
+    chai = require('chai'),
+    chaiExclude = require('chai-exclude'),
+    expect = chai.expect;
+
+chai.use(chaiExclude);
+
+function test(code, expected) {
+    var tree, actual, actualTree, options;
+
+    options = {
+        ranges: false,
+        locations: false,
+        ecmaVersion: 12
+    };
+
+    tree = acorn.parse(code, options);
+
+    // for UNIX text comment
+    actual = escodegen.generate(tree);
+    actualTree = acorn.parse(actual, options);
+
+    expect(actual).to.be.equal(expected);
+    expect(tree).excludingEvery(['start', 'end']).to.deep.equal(actualTree);
+}
+
+function testMin(code, expected) {
+    var tree, actual, actualTree, options;
+
+    options = {
+        ranges: false,
+        locations: false,
+        ecmaVersion: 12
+    };
+
+    tree = acorn.parse(code, options);
+
+    // for UNIX text comment
+    actual = escodegen.generate(tree, {
+        format: escodegen.FORMAT_MINIFY,
+        raw: false
+    }).replace(/[\n\r]$/, '') + '\n';
+    actualTree = acorn.parse(actual, options);
+
+    expect(actual).to.be.equal(expected);
+    expect(tree).excludingEvery(['start', 'end']).to.deep.equal(actualTree);
+}
+
+describe('compare acorn es2021 test', function () {
+    fs.readdirSync(__dirname + '/compare-acorn-es2021').sort().forEach(function(file) {
+        var code, expected, exp, min;
+        if (/\.js$/.test(file) && !/expected\.js$/.test(file) && !/expected\.min\.js$/.test(file)) {
+            it(file, function () {
+                exp = file.replace(/\.js$/, '.expected.js');
+                min = file.replace(/\.js$/, '.expected.min.js');
+                code = fs.readFileSync(__dirname + '/compare-acorn-es2021/' + file, 'utf-8');
+                expected = fs.readFileSync(__dirname + '/compare-acorn-es2021/' + exp, 'utf-8');
+                test(code, expected);
+                if (fs.existsSync(__dirname + '/compare-acorn-es2021/' + min)) {
+                    expected = fs.readFileSync(__dirname + '/compare-acorn-es2021/' + min, 'utf-8');
+                    testMin(code, expected);
+                }
+            });
+        }
+    });
+});
+/* vim: set sw=4 ts=4 et tw=80 : */

test/compare-acorn-es2021/numeric-separators.expected.js

@@ -0,0 +1,7 @@
+123_456;
+123_456.123_456e+123_456;
+0b1010_0001;
+0xDEAD_BEAF;
+0o755_666;
+123_456n;
+.012_345;

test/compare-acorn-es2021/numeric-separators.expected.min.js

@@ -0,0 +1 @@
+123_456;123_456.123_456e+123_456;0b1010_0001;0xDEAD_BEAF;0o755_666;123_456n;.012_345

test/compare-acorn-es2021/numeric-separators.js

@@ -0,0 +1,7 @@
+123_456;
+123_456.123_456e+123_456;
+0b1010_0001;
+0xDEAD_BEAF;
+0o755_666;
+123_456n;
+.012_345;