aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-09-20 22:37:22 -0700
committerGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-09-20 22:37:22 -0700
commitab565f1a3ca2d9a320c958786fb3a9df3392ceae (patch)
treeda5d9dbf6fd6b0371661ae8355e664fe909ec406
parent90cd3bf4cbe06b1795cd47bcae670d5970564abd (diff)
downloadbun-ab565f1a3ca2d9a320c958786fb3a9df3392ceae.tar.gz
bun-ab565f1a3ca2d9a320c958786fb3a9df3392ceae.tar.zst
bun-ab565f1a3ca2d9a320c958786fb3a9df3392ceae.zip
Fix parsing/printing unicode identifiers, switch to UTF-8 for prefilled strings, remove eagerly loading identifier_name
-rw-r--r--integration/scripts/browser.js2
-rw-r--r--integration/snapshots-no-hmr/string-escapes.js34
-rw-r--r--integration/snapshots-no-hmr/unicode-identifiers.js7
-rw-r--r--integration/snapshots/string-escapes.js57
-rw-r--r--integration/snapshots/unicode-identifiers.js30
-rw-r--r--integration/snippets/string-escapes.js35
-rw-r--r--integration/snippets/unicode-identifiers.js15
-rw-r--r--misctools/gen-unicode-table.js138
-rw-r--r--misctools/package.json10
-rw-r--r--src/js_lexer.zig99
-rw-r--r--src/js_lexer/range_table.zig136
-rw-r--r--src/js_lexer/unicode.zig1374
-rw-r--r--src/js_lexer_tables.zig3
-rw-r--r--src/js_parser/js_parser.zig22
-rw-r--r--src/js_printer.zig66
-rw-r--r--src/logger.zig11
-rw-r--r--src/string_immutable.zig166
17 files changed, 2032 insertions, 173 deletions
diff --git a/integration/scripts/browser.js b/integration/scripts/browser.js
index 7fe9e8f4c..d062f93ca 100644
--- a/integration/scripts/browser.js
+++ b/integration/scripts/browser.js
@@ -95,6 +95,8 @@ async function main() {
"/ts-fallback-rewrite-works.js",
"/tsx-fallback-rewrite-works.js",
"/lodash-regexp.js",
+ "/unicode-identifiers.js",
+ "/string-escapes.js",
];
tests.reverse();
diff --git a/integration/snapshots-no-hmr/string-escapes.js b/integration/snapshots-no-hmr/string-escapes.js
new file mode 100644
index 000000000..05d9c4ce2
--- /dev/null
+++ b/integration/snapshots-no-hmr/string-escapes.js
@@ -0,0 +1,34 @@
+var tab = "\t";
+var シ = "wow";
+var f = "";
+var obj = {
+ "\r\n": "\r\n",
+ "\n": "\n",
+ "\t": "\t",
+ "\u2028": "\u2028",
+ "\u2029": "\u2029",
+ "😊": "😊",
+ "😃": "😃",
+ "㋡": "㋡",
+ "☺": "☺",
+ シ: "シ",
+ f,
+ "☹": "☹",
+ "☻": "☻",
+ children: 123
+};
+const foo = () => {
+};
+const Bar = foo("a", {
+ children: 123
+});
+const carriage = obj["\r\n"];
+const newline = obj["\n"];
+
+export {obj};
+export function test() {
+ console.assert(carriage === "\r\n");
+ console.assert(newline === "\n");
+ console.assert(tab === "\t");
+ return testDone(import.meta.url);
+}
diff --git a/integration/snapshots-no-hmr/unicode-identifiers.js b/integration/snapshots-no-hmr/unicode-identifiers.js
new file mode 100644
index 000000000..c495d69f6
--- /dev/null
+++ b/integration/snapshots-no-hmr/unicode-identifiers.js
@@ -0,0 +1,7 @@
+var ε = 1.0e-06, ε2 = ε * ε, π = Math.PI, τ = 2 * π, τε = τ - ε, halfπ = π / 2, d3_radians = π / 180, d3_degrees = 180 / π;
+
+export {d3_radians};
+export function test() {
+ console.assert(ε === 1.0e-06);
+ return testDone(import.meta.url);
+}
diff --git a/integration/snapshots/string-escapes.js b/integration/snapshots/string-escapes.js
new file mode 100644
index 000000000..9231cb6cf
--- /dev/null
+++ b/integration/snapshots/string-escapes.js
@@ -0,0 +1,57 @@
+import {
+__HMRModule as HMR
+} from "http://localhost:8080/__runtime.js";
+import {
+__HMRClient as Bun
+} from "http://localhost:8080/__runtime.js";
+Bun.activate(false);
+
+var hmr = new HMR(2482749838, "string-escapes.js"), exports = hmr.exports;
+(hmr._load = function() {
+ var tab = "\t";
+ var シ = "wow";
+ var f = "";
+ var obj = {
+ "\r\n": "\r\n",
+ "\n": "\n",
+ "\t": "\t",
+ "\u2028": "\u2028",
+ "\u2029": "\u2029",
+ "😊": "😊",
+ "😃": "😃",
+ "㋡": "㋡",
+ "☺": "☺",
+ シ: "シ",
+ f,
+ "☹": "☹",
+ "☻": "☻",
+ children: 123
+ };
+ const foo = () => {
+ };
+ const Bar = foo("a", {
+ children: 123
+ });
+ const carriage = obj["\r\n"];
+ const newline = obj["\n"];
+ function test() {
+ console.assert(carriage === "\r\n");
+ console.assert(newline === "\n");
+ console.assert(tab === "\t");
+ return testDone(import.meta.url);
+ }
+ hmr.exportAll({
+ obj: () => obj,
+ test: () => test
+ });
+})();
+var $$hmr_obj = hmr.exports.obj, $$hmr_test = hmr.exports.test;
+hmr._update = function(exports) {
+ $$hmr_obj = exports.obj;
+ $$hmr_test = exports.test;
+};
+
+export {
+ $$hmr_obj as obj,
+ $$hmr_test as test
+};
diff --git a/integration/snapshots/unicode-identifiers.js b/integration/snapshots/unicode-identifiers.js
new file mode 100644
index 000000000..5d465d559
--- /dev/null
+++ b/integration/snapshots/unicode-identifiers.js
@@ -0,0 +1,30 @@
+import {
+__HMRModule as HMR
+} from "http://localhost:8080/__runtime.js";
+import {
+__HMRClient as Bun
+} from "http://localhost:8080/__runtime.js";
+Bun.activate(false);
+
+var hmr = new HMR(1398361736, "unicode-identifiers.js"), exports = hmr.exports;
+(hmr._load = function() {
+ var ε = 1.0e-06, ε2 = ε * ε, π = Math.PI, τ = 2 * π, τε = τ - ε, halfπ = π / 2, d3_radians = π / 180, d3_degrees = 180 / π;
+ function test() {
+ console.assert(ε === 1.0e-06);
+ return testDone(import.meta.url);
+ }
+ hmr.exportAll({
+ d3_radians: () => d3_radians,
+ test: () => test
+ });
+})();
+var $$hmr_d3_radians = hmr.exports.d3_radians, $$hmr_test = hmr.exports.test;
+hmr._update = function(exports) {
+ $$hmr_d3_radians = exports.d3_radians;
+ $$hmr_test = exports.test;
+};
+
+export {
+ $$hmr_d3_radians as d3_radians,
+ $$hmr_test as test
+};
diff --git a/integration/snippets/string-escapes.js b/integration/snippets/string-escapes.js
new file mode 100644
index 000000000..dc5c7cff9
--- /dev/null
+++ b/integration/snippets/string-escapes.js
@@ -0,0 +1,35 @@
+var tab = "\t";
+var シ = "wow";
+var f = "";
+var obj = {
+ "\r\n": "\r\n",
+ "\n": "\n",
+ "\t": "\t",
+ "\u2028": "\u2028",
+ "\u2029": "\u2029",
+ "😊": "😊",
+ "😃": "😃",
+ "㋡": "㋡",
+ "☺": "☺",
+ シ: "シ",
+ f: f,
+ "☹": "☹",
+ "☻": "☻",
+ children: 123,
+};
+const foo = () => {};
+const Bar = foo("a", {
+ children: 123,
+});
+
+const carriage = obj["\r\n"];
+const newline = obj["\n"];
+
+export { obj };
+
+export function test() {
+ console.assert(carriage === "\r\n");
+ console.assert(newline === "\n");
+ console.assert(tab === "\t");
+ return testDone(import.meta.url);
+}
diff --git a/integration/snippets/unicode-identifiers.js b/integration/snippets/unicode-identifiers.js
new file mode 100644
index 000000000..5b602f49b
--- /dev/null
+++ b/integration/snippets/unicode-identifiers.js
@@ -0,0 +1,15 @@
+var ε = 1e-6,
+ ε2 = ε * ε,
+ π = Math.PI,
+ τ = 2 * π,
+ τε = τ - ε,
+ halfπ = π / 2,
+ d3_radians = π / 180,
+ d3_degrees = 180 / π;
+
+export { d3_radians };
+
+export function test() {
+ console.assert(ε === 1e-6);
+ return testDone(import.meta.url);
+}
diff --git a/misctools/gen-unicode-table.js b/misctools/gen-unicode-table.js
new file mode 100644
index 000000000..6ee02f5e8
--- /dev/null
+++ b/misctools/gen-unicode-table.js
@@ -0,0 +1,138 @@
+// Thank you @evanw for this code!!!
+const fs = require("fs");
+const path = require("path");
+
+// ES5 reference: https://es5.github.io/
+//
+// A conforming implementation of this International standard shall interpret
+// characters in conformance with the Unicode Standard, Version 3.0 or later
+// and ISO/IEC 10646-1 with either UCS-2 or UTF-16 as the adopted encoding
+// form, implementation level 3. If the adopted ISO/IEC 10646-1 subset is not
+// otherwise specified, it is presumed to be the BMP subset, collection 300.
+//
+// UnicodeLetter: any character in the Unicode categories “Uppercase letter (Lu)”,
+// “Lowercase letter (Ll)”, “Titlecase letter (Lt)”, “Modifier letter (Lm)”,
+// “Other letter (Lo)”, or “Letter number (Nl)”.
+const idStartES5 = []
+ .concat(
+ require("@unicode/unicode-3.0.0/General_Category/Uppercase_Letter/code-points"),
+ require("@unicode/unicode-3.0.0/General_Category/Lowercase_Letter/code-points"),
+ require("@unicode/unicode-3.0.0/General_Category/Titlecase_Letter/code-points"),
+ require("@unicode/unicode-3.0.0/General_Category/Modifier_Letter/code-points"),
+ require("@unicode/unicode-3.0.0/General_Category/Other_Letter/code-points")
+
+ // The "letter number" category is not included because old versions of Safari
+ // had a bug where they didn't include it. This means it does not match ES5.
+ // We need to make sure we escape these characters so Safari can read them.
+ // See https://github.com/evanw/esbuild/issues/1349 for more information.
+ // require('@unicode/unicode-3.0.0/General_Category/Letter_Number/code-points'),
+ )
+ .sort((a, b) => a - b);
+
+// UnicodeCombiningMark: any character in the Unicode categories “Non-spacing mark (Mn)”
+// or “Combining spacing mark (Mc)”
+// UnicodeDigit: any character in the Unicode category “Decimal number (Nd)”
+// UnicodeConnectorPunctuation: any character in the Unicode category “Connector punctuation (Pc)”
+const idContinueES5 = idStartES5
+ .concat(
+ require("@unicode/unicode-3.0.0/General_Category/Nonspacing_Mark/code-points"),
+ require("@unicode/unicode-3.0.0/General_Category/Spacing_Mark/code-points"),
+ require("@unicode/unicode-3.0.0/General_Category/Decimal_Number/code-points"),
+ require("@unicode/unicode-3.0.0/General_Category/Connector_Punctuation/code-points")
+ )
+ .sort((a, b) => a - b);
+
+// ESNext reference: https://tc39.es/ecma262/
+//
+// A conforming implementation of ECMAScript must interpret source text input
+// in conformance with the Unicode Standard, Version 5.1.0 or later and ISO/IEC
+// 10646. If the adopted ISO/IEC 10646-1 subset is not otherwise specified, it
+// is presumed to be the Unicode set, collection 10646.
+//
+// UnicodeIDStart: any Unicode code point with the Unicode property “ID_Start”
+const idStartESNext = require("@unicode/unicode-13.0.0/Binary_Property/ID_Start/code-points");
+const idStartESNextSet = new Set(idStartESNext);
+
+// UnicodeIDContinue: any Unicode code point with the Unicode property “ID_Continue”
+const idContinueESNext = require("@unicode/unicode-13.0.0/Binary_Property/ID_Continue/code-points");
+const idContinueESNextSet = new Set(idContinueESNext);
+
+// These identifiers are valid in both ES5 and ES6+ (i.e. an intersection of both)
+const idStartES5AndESNext = idStartES5.filter((n) => idStartESNextSet.has(n));
+const idContinueES5AndESNext = idContinueES5.filter((n) =>
+ idContinueESNextSet.has(n)
+);
+
+// These identifiers are valid in either ES5 or ES6+ (i.e. a union of both)
+const idStartES5OrESNext = [...new Set(idStartES5.concat(idStartESNext))].sort(
+ (a, b) => a - b
+);
+const idContinueES5OrESNext = [
+ ...new Set(idContinueES5.concat(idContinueESNext)),
+].sort((a, b) => a - b);
+
+function generateRangeTable(codePoints) {
+ let lines = [];
+ let index = 0;
+ let latinOffset = 0;
+
+ while (latinOffset < codePoints.length && codePoints[latinOffset] <= 0xff) {
+ latinOffset++;
+ }
+
+ lines.push(`RangeTable.init(`, ` ${latinOffset},`, ` &[_]R16Range{`);
+
+ // 16-bit code points
+ while (index < codePoints.length && codePoints[index] < 0x1000) {
+ let start = codePoints[index];
+ index++;
+ while (
+ index < codePoints.length &&
+ codePoints[index] < 0x1000 &&
+ codePoints[index] === codePoints[index - 1] + 1
+ ) {
+ index++;
+ }
+ let end = codePoints[index - 1];
+ lines.push(` .{0x${start.toString(16)}, 0x${end.toString(16)}},`);
+ }
+
+ lines.push(` },`, `&[_]R32Range{`);
+
+ // 32-bit code points
+ while (index < codePoints.length) {
+ let start = codePoints[index];
+ index++;
+ while (
+ index < codePoints.length &&
+ codePoints[index] === codePoints[index - 1] + 1
+ ) {
+ index++;
+ }
+ let end = codePoints[index - 1];
+ lines.push(` .{0x${start.toString(16)}, 0x${end.toString(16)}},`);
+ }
+
+ lines.push(` },`, `);`);
+ return lines.join("\n");
+}
+
+fs.writeFileSync(
+ path.join(__dirname, "..", "src", "js_lexer", "unicode.zig"),
+ `// This file was automatically generated by ${path.basename(
+ __filename
+ )}. Do not edit.
+
+ const RangeTable = @import("./range_table.zig");
+
+
+// ES5 || ESNext
+pub const id_start = ${generateRangeTable(idStartES5OrESNext)}
+
+// ES5 || ESNext
+pub const id_continue = ${generateRangeTable(idContinueES5OrESNext)}
+
+pub const printable_id_start = ${generateRangeTable(idStartESNext)}
+pub const printable_id_continue = ${generateRangeTable(idContinueESNext)}
+`
+);
diff --git a/misctools/package.json b/misctools/package.json
new file mode 100644
index 000000000..b03b5e908
--- /dev/null
+++ b/misctools/package.json
@@ -0,0 +1,10 @@
+{
+ "name": "misctools",
+ "version": "1.0.0",
+ "main": "index.js",
+ "license": "MIT",
+ "devDependencies": {
+ "@unicode/unicode-13.0.0": "^1.2.1",
+ "@unicode/unicode-3.0.0": "^1.2.1"
+ }
+}
diff --git a/src/js_lexer.zig b/src/js_lexer.zig
index 687d20409..2cfc0f732 100644
--- a/src/js_lexer.zig
+++ b/src/js_lexer.zig
@@ -29,6 +29,7 @@ pub var emptyJavaScriptString = ([_]u16{0});
pub const JSONOptions = struct {
allow_comments: bool = false,
allow_trailing_commas: bool = false,
+ starts_with_string: bool = false,
};
pub const Lexer = struct {
@@ -524,7 +525,7 @@ pub const Lexer = struct {
pub const InnerStringLiteral = packed struct { suffix_len: u3, needs_slow_path: bool };
fn parseStringLiteralInnter(lexer: *LexerType, comptime quote: CodePoint) !InnerStringLiteral {
var needs_slow_path = false;
- var suffix_len: u3 = 1;
+ var suffix_len: u3 = if (comptime quote == 0) 0 else 1;
stringLiteral: while (true) {
@setRuntimeSafety(false);
@@ -533,7 +534,7 @@ pub const Lexer = struct {
try lexer.step();
// Handle Windows CRLF
- if (lexer.code_point == '\r' and lexer.json_options != null) {
+ if (lexer.code_point == 'r' and lexer.json_options != null) {
try lexer.step();
if (lexer.code_point == '\n') {
try lexer.step();
@@ -541,17 +542,24 @@ pub const Lexer = struct {
continue :stringLiteral;
}
- // Skip slow path for a handful of common escaped characters that don't need UTf16 handling
- needs_slow_path = switch (lexer.code_point) {
- // if it was previously marked as needing slow path, then keep it
- 'n', '`', '\'', '0', '"' => needs_slow_path,
- else => true,
- };
+ switch (lexer.code_point) {
+ 't', 'r', 'n', '`', '\'', '0', '"', 0x2028, 0x2029 => {
+ try lexer.step();
+ continue :stringLiteral;
+ },
+ else => {
+ needs_slow_path = true;
+ },
+ }
},
// This indicates the end of the file
-1 => {
- try lexer.addDefaultError("Unterminated string literal");
+ if (comptime quote != 0) {
+ try lexer.addDefaultError("Unterminated string literal");
+ }
+
+ break :stringLiteral;
},
'\r' => {
@@ -564,8 +572,17 @@ pub const Lexer = struct {
},
'\n' => {
- if (comptime quote != '`') {
- try lexer.addDefaultError("Unterminated string literal");
+
+ // Implicitly-quoted strings end when they reach a newline OR end of file
+ // This only applies to .env
+ switch (comptime quote) {
+ 0 => {
+ break :stringLiteral;
+ },
+ '`' => {},
+ else => {
+ try lexer.addDefaultError("Unterminated string literal");
+ },
}
},
@@ -608,27 +625,23 @@ pub const Lexer = struct {
return InnerStringLiteral{ .needs_slow_path = needs_slow_path, .suffix_len = suffix_len };
}
- fn parseStringLiteral(lexer: *LexerType) !void {
- var quote: CodePoint = lexer.code_point;
-
- if (quote != '`') {
+ pub fn parseStringLiteral(lexer: *LexerType, comptime quote: CodePoint) !void {
+ if (comptime quote != '`') {
lexer.token = T.t_string_literal;
} else if (lexer.rescan_close_brace_as_template_token) {
lexer.token = T.t_template_tail;
} else {
lexer.token = T.t_no_substitution_template_literal;
}
+ // quote is 0 when parsing JSON from .env
+ // .env values may not always be quoted.
try lexer.step();
- var string_literal_details = switch (quote) {
- '`' => try lexer.parseStringLiteralInnter('`'),
- '\'' => try lexer.parseStringLiteralInnter('\''),
- '"' => try lexer.parseStringLiteralInnter('"'),
- else => unreachable,
- };
+ var string_literal_details = try lexer.parseStringLiteralInnter(quote);
// Reset string literal
- lexer.string_literal_slice = lexer.source.contents[lexer.start + 1 .. lexer.end - string_literal_details.suffix_len];
+ const base = if (comptime quote == 0) lexer.start else lexer.start + 1;
+ lexer.string_literal_slice = lexer.source.contents[base .. lexer.end - string_literal_details.suffix_len];
lexer.string_literal_is_ascii = !string_literal_details.needs_slow_path;
lexer.string_literal_buffer.shrinkRetainingCapacity(0);
if (string_literal_details.needs_slow_path) {
@@ -1499,8 +1512,14 @@ pub const Lexer = struct {
}
},
- '\'', '"', '`' => {
- try lexer.parseStringLiteral();
+ '\'' => {
+ try lexer.parseStringLiteral('\'');
+ },
+ '"' => {
+ try lexer.parseStringLiteral('"');
+ },
+ '`' => {
+ try lexer.parseStringLiteral('`');
},
'_', '$', 'a'...'z', 'A'...'Z' => {
@@ -1778,7 +1797,6 @@ pub const Lexer = struct {
return utf16ToString(lexer, js);
}
- // TODO: use wtf-8 encoding.
pub fn utf16ToString(lexer: *LexerType, js: JavascriptString) string {
var temp: [4]u8 = undefined;
var list = std.ArrayList(u8).initCapacity(lexer.allocator, js.len) catch unreachable;
@@ -2595,16 +2613,32 @@ pub const Lexer = struct {
pub fn isIdentifierStart(codepoint: CodePoint) bool {
@setRuntimeSafety(false);
+ switch (codepoint) {
+ 'a'...'z', 'A'...'Z', '_', '$' => return true,
+ else => {},
+ }
+
+ if (codepoint < 127) return false;
+
return switch (codepoint) {
- 'a'...'z', 'A'...'Z', '_', '$' => true,
+ std.math.max(tables.id_start.r16_min, tables.id_start.latin_offset)...tables.id_start.r16_max => tables.id_start.inRange16(@intCast(u16, codepoint)),
+ tables.id_start.r32_min...tables.id_start.r32_max => tables.id_start.inRange32(@intCast(u32, codepoint)),
else => false,
};
}
pub fn isIdentifierContinue(codepoint: CodePoint) bool {
@setRuntimeSafety(false);
+ switch (codepoint) {
+ 'a'...'z', 'A'...'Z', '_', '$', '0'...'9' => return true,
+ else => {},
+ }
+
+ if (codepoint < 127) return false;
+
return switch (codepoint) {
- 'a'...'z', 'A'...'Z', '_', '$', '0'...'9', 0x200C, 0x200D => true,
+ std.math.max(tables.id_continue.r16_min, tables.id_continue.latin_offset)...tables.id_continue.r16_max => tables.id_continue.inRange16(@intCast(u16, codepoint)),
+ tables.id_continue.r32_min...tables.id_continue.r32_max => tables.id_continue.inRange32(@intCast(u32, codepoint)),
else => false,
};
}
@@ -2643,13 +2677,16 @@ pub fn isIdentifier(text: string) bool {
return false;
}
- var iter = std.unicode.Utf8Iterator{ .bytes = text, .i = 0 };
- if (!isIdentifierStart(iter.nextCodepoint() orelse unreachable)) {
+ var iter = strings.CodepointIterator{ .i = 0, .bytes = text };
+
+ if (!isIdentifierStart(iter.nextCodepoint())) {
return false;
}
- while (iter.nextCodepoint()) |codepoint| {
- if (!isIdentifierContinue(@intCast(CodePoint, codepoint))) {
+ iter.nextCodepointNoReturn();
+
+ while (iter.c > -1) : (iter.nextCodepointNoReturn()) {
+ if (!isIdentifierContinue(iter.c)) {
return false;
}
}
diff --git a/src/js_lexer/range_table.zig b/src/js_lexer/range_table.zig
new file mode 100644
index 000000000..72a9d842a
--- /dev/null
+++ b/src/js_lexer/range_table.zig
@@ -0,0 +1,136 @@
+const std = @import("std");
+
+const RangeTable = @This();
+
+pub const R16Range = [2]u16;
+pub const R32Range = [2]u32;
+
+latin_offset: u8 = 0,
+
+r16_max: u16 = 0xFFFF,
+r16_min: u16 = 256,
+r16: []const R16Range = &[_]R16Range{},
+r32: []const R32Range = &[_]R32Range{},
+r32_max: u32 = std.math.maxInt(u32),
+r32_min: u32 = std.math.maxInt(u16) + 1,
+
+pub fn init(
+ comptime latin_offset: u8,
+ comptime r16: []const R16Range,
+ comptime r32: []const R32Range,
+) RangeTable {
+ return comptime brk: {
+ @setEvalBranchQuota(9999);
+ var min_16: u16 = std.math.maxInt(u16);
+ var max_16: u16 = 0;
+
+ var min_32: u32 = std.math.maxInt(u32);
+ var max_32: u32 = 0;
+
+ for (r16) |group, i| {
+ min_16 = std.math.max(std.math.min(min_16, group[0]), latin_offset);
+ max_16 = std.math.max(max_16, group[1]);
+ }
+
+ for (r32) |group, i| {
+ min_32 = std.math.min(min_32, group[0]);
+ max_32 = std.math.max(max_32, group[1]);
+ }
+
+ break :brk RangeTable{
+ .latin_offset = latin_offset,
+ .r16_min = min_16,
+
+ .r16_max = max_16,
+ .r16 = r16,
+ .r32 = r32,
+ .r32_min = min_32,
+ .r32_max = max_32,
+ };
+ };
+}
+
+pub fn inRange16(this: *const RangeTable, value: u16) bool {
+ const slice = this.r16[this.latin_offset..];
+ var lo: u16 = 0;
+ var hi: u16 = @intCast(u16, slice.len);
+ while (lo < hi) {
+ const mid = (lo + hi) / 2;
+ const range = slice[mid];
+ if (value <= range[0] and value <= range[1]) {
+ return true;
+ }
+ hi = if (value < range[0]) mid else hi;
+ lo = if (!(value < range[0])) mid else lo;
+ }
+
+ return false;
+}
+
+pub fn inRange32(this: *const RangeTable, value: u32) bool {
+ const slice = this.r32;
+ var lo: u16 = 0;
+ var hi: u16 = @intCast(u16, slice.len);
+ while (lo < hi) {
+ const mid = (lo + hi) / 2;
+ const range = slice[mid];
+ if (value <= range[0] and value <= range[1]) {
+ return true;
+ }
+ hi = if (value < range[0]) mid else hi;
+ lo = if (!(value < range[0])) mid else lo;
+ }
+
+ return false;
+}
+
+pub fn includes(this: *const RangeTable, comptime width: u3, comptime ValueType: type, value: ValueType) bool {
+ switch (comptime width) {
+ 0 => @compileError("dont use this"),
+ 1 => @compileError("dont use this"),
+ 2 => {
+ if (value < this.r16_min or value > this.r16_max) return false;
+ return this.inRange16(@intCast(u16, value));
+ },
+ else => {
+ if (value < this.r32_min or value > this.r32_max) return false;
+
+ return this.inRange32(@intCast(u32, value));
+ },
+ }
+}
+
+test "in16" {
+ const u16range: []const R16Range = &[_]R16Range{
+ R16Range{ 0x2c6, 0x2d1 },
+ R16Range{ 0x2e0, 0x2e4 },
+ R16Range{ 0x2ec, 0x2ec },
+ R16Range{ 0x2ee, 0x2ee },
+ R16Range{ 0x370, 0x374 },
+ R16Range{ 0x376, 0x377 },
+ R16Range{ 0x37a, 0x37d },
+ R16Range{ 0x37f, 0x37f },
+ R16Range{ 0x386, 0x386 },
+ R16Range{ 0x388, 0x38a },
+ R16Range{ 0x38c, 0x38c },
+ R16Range{ 0x38e, 0x3a1 },
+ R16Range{ 0x3a3, 0x3f5 },
+ R16Range{ 0x3f7, 0x481 },
+ R16Range{ 0x48a, 0x52f },
+ R16Range{ 0x531, 0x556 },
+ R16Range{ 0x559, 0x559 },
+ };
+ const table = init(
+ 0,
+ u16range,
+ &.{},
+ );
+
+ const bytes: []const u8 = &[_]u8{ 205, 189 };
+ var decoded = try std.unicode.utf8Decode(bytes);
+ try std.testing.expect(table.includes(2, @TypeOf(decoded), decoded));
+
+ const bytes2: []const u8 = &[_]u8{ 213, 153 };
+ decoded = try std.unicode.utf8Decode(bytes2);
+ try std.testing.expect(!table.includes(3, @TypeOf(decoded), decoded));
+}
diff --git a/src/js_lexer/unicode.zig b/src/js_lexer/unicode.zig
new file mode 100644
index 000000000..e142e2206
--- /dev/null
+++ b/src/js_lexer/unicode.zig
@@ -0,0 +1,1374 @@
+// This file was automatically generated by gen-unicode-table.js. Do not edit.
+
+const RangeTable = @import("./range_table.zig");
+const R16Range = RangeTable.R16Range;
+const R32Range = RangeTable.R32Range;
+
+// ES5 || ESNext
+pub const id_start = RangeTable.init(
+ 117,
+ &[_]R16Range{
+ .{ 0x41, 0x5a },
+ .{ 0x61, 0x7a },
+ .{ 0xaa, 0xaa },
+ .{ 0xb5, 0xb5 },
+ .{ 0xba, 0xba },
+ .{ 0xc0, 0xd6 },
+ .{ 0xd8, 0xf6 },
+ .{ 0xf8, 0x2c1 },
+ .{ 0x2c6, 0x2d1 },
+ .{ 0x2e0, 0x2e4 },
+ .{ 0x2ec, 0x2ec },
+ .{ 0x2ee, 0x2ee },
+ .{ 0x370, 0x374 },
+ .{ 0x376, 0x377 },
+ .{ 0x37a, 0x37d },
+ .{ 0x37f, 0x37f },
+ .{ 0x386, 0x386 },
+ .{ 0x388, 0x38a },
+ .{ 0x38c, 0x38c },
+ .{ 0x38e, 0x3a1 },
+ .{ 0x3a3, 0x3f5 },
+ .{ 0x3f7, 0x481 },
+ .{ 0x48a, 0x52f },
+ .{ 0x531, 0x556 },
+ .{ 0x559, 0x559 },
+ .{ 0x560, 0x588 },
+ .{ 0x5d0, 0x5ea },
+ .{ 0x5ef, 0x5f2 },
+ .{ 0x620, 0x64a },
+ .{ 0x66e, 0x66f },
+ .{ 0x671, 0x6d3 },
+ .{ 0x6d5, 0x6d5 },
+ .{ 0x6e5, 0x6e6 },
+ .{ 0x6ee, 0x6ef },
+ .{ 0x6fa, 0x6fc },
+ .{ 0x6ff, 0x6ff },
+ .{ 0x710, 0x710 },
+ .{ 0x712, 0x72f },
+ .{ 0x74d, 0x7a5 },
+ .{ 0x7b1, 0x7b1 },
+ .{ 0x7ca, 0x7ea },
+ .{ 0x7f4, 0x7f5 },
+ .{ 0x7fa, 0x7fa },
+ .{ 0x800, 0x815 },
+ .{ 0x81a, 0x81a },
+ .{ 0x824, 0x824 },
+ .{ 0x828, 0x828 },
+ .{ 0x840, 0x858 },
+ .{ 0x860, 0x86a },
+ .{ 0x8a0, 0x8b4 },
+ .{ 0x8b6, 0x8c7 },
+ .{ 0x904, 0x939 },
+ .{ 0x93d, 0x93d },
+ .{ 0x950, 0x950 },
+ .{ 0x958, 0x961 },
+ .{ 0x971, 0x980 },
+ .{ 0x985, 0x98c },
+ .{ 0x98f, 0x990 },
+ .{ 0x993, 0x9a8 },
+ .{ 0x9aa, 0x9b0 },
+ .{ 0x9b2, 0x9b2 },
+ .{ 0x9b6, 0x9b9 },
+ .{ 0x9bd, 0x9bd },
+ .{ 0x9ce, 0x9ce },
+ .{ 0x9dc, 0x9dd },
+ .{ 0x9df, 0x9e1 },
+ .{ 0x9f0, 0x9f1 },
+ .{ 0x9fc, 0x9fc },
+ .{ 0xa05, 0xa0a },
+ .{ 0xa0f, 0xa10 },
+ .{ 0xa13, 0xa28 },
+ .{ 0xa2a, 0xa30 },
+ .{ 0xa32, 0xa33 },
+ .{ 0xa35, 0xa36 },
+ .{ 0xa38, 0xa39 },
+ .{ 0xa59, 0xa5c },
+ .{ 0xa5e, 0xa5e },
+ .{ 0xa72, 0xa74 },
+ .{ 0xa85, 0xa8d },
+ .{ 0xa8f, 0xa91 },
+ .{ 0xa93, 0xaa8 },
+ .{ 0xaaa, 0xab0 },
+ .{ 0xab2, 0xab3 },
+ .{ 0xab5, 0xab9 },
+ .{ 0xabd, 0xabd },
+ .{ 0xad0, 0xad0 },
+ .{ 0xae0, 0xae1 },
+ .{ 0xaf9, 0xaf9 },
+ .{ 0xb05, 0xb0c },
+ .{ 0xb0f, 0xb10 },
+ .{ 0xb13, 0xb28 },
+ .{ 0xb2a, 0xb30 },
+ .{ 0xb32, 0xb33 },
+ .{ 0xb35, 0xb39 },
+ .{ 0xb3d, 0xb3d },
+ .{ 0xb5c, 0xb5d },
+ .{ 0xb5f, 0xb61 },
+ .{ 0xb71, 0xb71 },
+ .{ 0xb83, 0xb83 },
+ .{ 0xb85, 0xb8a },
+ .{ 0xb8e, 0xb90 },
+ .{ 0xb92, 0xb95 },
+ .{ 0xb99, 0xb9a },
+ .{ 0xb9c, 0xb9c },
+ .{ 0xb9e, 0xb9f },
+ .{ 0xba3, 0xba4 },
+ .{ 0xba8, 0xbaa },
+ .{ 0xbae, 0xbb9 },
+ .{ 0xbd0, 0xbd0 },
+ .{ 0xc05, 0xc0c },
+ .{ 0xc0e, 0xc10 },
+ .{ 0xc12, 0xc28 },
+ .{ 0xc2a, 0xc39 },
+ .{ 0xc3d, 0xc3d },
+ .{ 0xc58, 0xc5a },
+ .{ 0xc60, 0xc61 },
+ .{ 0xc80, 0xc80 },
+ .{ 0xc85, 0xc8c },
+ .{ 0xc8e, 0xc90 },
+ .{ 0xc92, 0xca8 },
+ .{ 0xcaa, 0xcb3 },
+ .{ 0xcb5, 0xcb9 },
+ .{ 0xcbd, 0xcbd },
+ .{ 0xcde, 0xcde },
+ .{ 0xce0, 0xce1 },
+ .{ 0xcf1, 0xcf2 },
+ .{ 0xd04, 0xd0c },
+ .{ 0xd0e, 0xd10 },
+ .{ 0xd12, 0xd3a },
+ .{ 0xd3d, 0xd3d },
+ .{ 0xd4e, 0xd4e },
+ .{ 0xd54, 0xd56 },
+ .{ 0xd5f, 0xd61 },
+ .{ 0xd7a, 0xd7f },
+ .{ 0xd85, 0xd96 },
+ .{ 0xd9a, 0xdb1 },
+ .{ 0xdb3, 0xdbb },
+ .{ 0xdbd, 0xdbd },
+ .{ 0xdc0, 0xdc6 },
+ .{ 0xe01, 0xe30 },
+ .{ 0xe32, 0xe33 },
+ .{ 0xe40, 0xe46 },
+ .{ 0xe81, 0xe82 },
+ .{ 0xe84, 0xe84 },
+ .{ 0xe86, 0xe8a },
+ .{ 0xe8c, 0xea3 },
+ .{ 0xea5, 0xea5 },
+ .{ 0xea7, 0xeb0 },
+ .{ 0xeb2, 0xeb3 },
+ .{ 0xebd, 0xebd },
+ .{ 0xec0, 0xec4 },
+ .{ 0xec6, 0xec6 },
+ .{ 0xedc, 0xedf },
+ .{ 0xf00, 0xf00 },
+ .{ 0xf40, 0xf47 },
+ .{ 0xf49, 0xf6c },
+ .{ 0xf88, 0xf8c },
+ },
+ &[_]R32Range{
+ .{ 0x1000, 0x102a },
+ .{ 0x103f, 0x103f },
+ .{ 0x1050, 0x1055 },
+ .{ 0x105a, 0x105d },
+ .{ 0x1061, 0x1061 },
+ .{ 0x1065, 0x1066 },
+ .{ 0x106e, 0x1070 },
+ .{ 0x1075, 0x1081 },
+ .{ 0x108e, 0x108e },
+ .{ 0x10a0, 0x10c5 },
+ .{ 0x10c7, 0x10c7 },
+ .{ 0x10cd, 0x10cd },
+ .{ 0x10d0, 0x10fa },
+ .{ 0x10fc, 0x1248 },
+ .{ 0x124a, 0x124d },
+ .{ 0x1250, 0x1256 },
+ .{ 0x1258, 0x1258 },
+ .{ 0x125a, 0x125d },
+ .{ 0x1260, 0x1288 },
+ .{ 0x128a, 0x128d },
+ .{ 0x1290, 0x12b0 },
+ .{ 0x12b2, 0x12b5 },
+ .{ 0x12b8, 0x12be },
+ .{ 0x12c0, 0x12c0 },
+ .{ 0x12c2, 0x12c5 },
+ .{ 0x12c8, 0x12d6 },
+ .{ 0x12d8, 0x1310 },
+ .{ 0x1312, 0x1315 },
+ .{ 0x1318, 0x135a },
+ .{ 0x1380, 0x138f },
+ .{ 0x13a0, 0x13f5 },
+ .{ 0x13f8, 0x13fd },
+ .{ 0x1401, 0x166c },
+ .{ 0x166f, 0x167f },
+ .{ 0x1681, 0x169a },
+ .{ 0x16a0, 0x16ea },
+ .{ 0x16ee, 0x16f8 },
+ .{ 0x1700, 0x170c },
+ .{ 0x170e, 0x1711 },
+ .{ 0x1720, 0x1731 },
+ .{ 0x1740, 0x1751 },
+ .{ 0x1760, 0x176c },
+ .{ 0x176e, 0x1770 },
+ .{ 0x1780, 0x17b3 },
+ .{ 0x17d7, 0x17d7 },
+ .{ 0x17dc, 0x17dc },
+ .{ 0x1820, 0x1878 },
+ .{ 0x1880, 0x18a8 },
+ .{ 0x18aa, 0x18aa },
+ .{ 0x18b0, 0x18f5 },
+ .{ 0x1900, 0x191e },
+ .{ 0x1950, 0x196d },
+ .{ 0x1970, 0x1974 },
+ .{ 0x1980, 0x19ab },
+ .{ 0x19b0, 0x19c9 },
+ .{ 0x1a00, 0x1a16 },
+ .{ 0x1a20, 0x1a54 },
+ .{ 0x1aa7, 0x1aa7 },
+ .{ 0x1b05, 0x1b33 },
+ .{ 0x1b45, 0x1b4b },
+ .{ 0x1b83, 0x1ba0 },
+ .{ 0x1bae, 0x1baf },
+ .{ 0x1bba, 0x1be5 },
+ .{ 0x1c00, 0x1c23 },
+ .{ 0x1c4d, 0x1c4f },
+ .{ 0x1c5a, 0x1c7d },
+ .{ 0x1c80, 0x1c88 },
+ .{ 0x1c90, 0x1cba },
+ .{ 0x1cbd, 0x1cbf },
+ .{ 0x1ce9, 0x1cec },
+ .{ 0x1cee, 0x1cf3 },
+ .{ 0x1cf5, 0x1cf6 },
+ .{ 0x1cfa, 0x1cfa },
+ .{ 0x1d00, 0x1dbf },
+ .{ 0x1e00, 0x1f15 },
+ .{ 0x1f18, 0x1f1d },
+ .{ 0x1f20, 0x1f45 },
+ .{ 0x1f48, 0x1f4d },
+ .{ 0x1f50, 0x1f57 },
+ .{ 0x1f59, 0x1f59 },
+ .{ 0x1f5b, 0x1f5b },
+ .{ 0x1f5d, 0x1f5d },
+ .{ 0x1f5f, 0x1f7d },
+ .{ 0x1f80, 0x1fb4 },
+ .{ 0x1fb6, 0x1fbc },
+ .{ 0x1fbe, 0x1fbe },
+ .{ 0x1fc2, 0x1fc4 },
+ .{ 0x1fc6, 0x1fcc },
+ .{ 0x1fd0, 0x1fd3 },
+ .{ 0x1fd6, 0x1fdb },
+ .{ 0x1fe0, 0x1fec },
+ .{ 0x1ff2, 0x1ff4 },
+ .{ 0x1ff6, 0x1ffc },
+ .{ 0x2071, 0x2071 },
+ .{ 0x207f, 0x207f },
+ .{ 0x2090, 0x209c },
+ .{ 0x2102, 0x2102 },
+ .{ 0x2107, 0x2107 },
+ .{ 0x210a, 0x2113 },
+ .{ 0x2115, 0x2115 },
+ .{ 0x2118, 0x211d },
+ .{ 0x2124, 0x2124 },
+ .{ 0x2126, 0x2126 },
+ .{ 0x2128, 0x2128 },
+ .{ 0x212a, 0x2139 },
+ .{ 0x213c, 0x213f },
+ .{ 0x2145, 0x2149 },
+ .{ 0x214e, 0x214e },
+ .{ 0x2160, 0x2188 },
+ .{ 0x2c00, 0x2c2e },
+ .{ 0x2c30, 0x2c5e },
+ .{ 0x2c60, 0x2ce4 },
+ .{ 0x2ceb, 0x2cee },
+ .{ 0x2cf2, 0x2cf3 },
+ .{ 0x2d00, 0x2d25 },
+ .{ 0x2d27, 0x2d27 },
+ .{ 0x2d2d, 0x2d2d },
+ .{ 0x2d30, 0x2d67 },
+ .{ 0x2d6f, 0x2d6f },
+ .{ 0x2d80, 0x2d96 },
+ .{ 0x2da0, 0x2da6 },
+ .{ 0x2da8, 0x2dae },
+ .{ 0x2db0, 0x2db6 },
+ .{ 0x2db8, 0x2dbe },
+ .{ 0x2dc0, 0x2dc6 },
+ .{ 0x2dc8, 0x2dce },
+ .{ 0x2dd0, 0x2dd6 },
+ .{ 0x2dd8, 0x2dde },
+ .{ 0x3005, 0x3007 },
+ .{ 0x3021, 0x3029 },
+ .{ 0x3031, 0x3035 },
+ .{ 0x3038, 0x303c },
+ .{ 0x3041, 0x3096 },
+ .{ 0x309b, 0x309f },
+ .{ 0x30a1, 0x30fa },
+ .{ 0x30fc, 0x30ff },
+ .{ 0x3105, 0x312f },
+ .{ 0x3131, 0x318e },
+ .{ 0x31a0, 0x31bf },
+ .{ 0x31f0, 0x31ff },
+ .{ 0x3400, 0x4dbf },
+ .{ 0x4e00, 0x9ffc },
+ .{ 0xa000, 0xa48c },
+ .{ 0xa4d0, 0xa4fd },
+ .{ 0xa500, 0xa60c },
+ .{ 0xa610, 0xa61f },
+ .{ 0xa62a, 0xa62b },
+ .{ 0xa640, 0xa66e },
+ .{ 0xa67f, 0xa69d },
+ .{ 0xa6a0, 0xa6ef },
+ .{ 0xa717, 0xa71f },
+ .{ 0xa722, 0xa788 },
+ .{ 0xa78b, 0xa7bf },
+ .{ 0xa7c2, 0xa7ca },
+ .{ 0xa7f5, 0xa801 },
+ .{ 0xa803, 0xa805 },
+ .{ 0xa807, 0xa80a },
+ .{ 0xa80c, 0xa822 },
+ .{ 0xa840, 0xa873 },
+ .{ 0xa882, 0xa8b3 },
+ .{ 0xa8f2, 0xa8f7 },
+ .{ 0xa8fb, 0xa8fb },
+ .{ 0xa8fd, 0xa8fe },
+ .{ 0xa90a, 0xa925 },
+ .{ 0xa930, 0xa946 },
+ .{ 0xa960, 0xa97c },
+ .{ 0xa984, 0xa9b2 },
+ .{ 0xa9cf, 0xa9cf },
+ .{ 0xa9e0, 0xa9e4 },
+ .{ 0xa9e6, 0xa9ef },
+ .{ 0xa9fa, 0xa9fe },
+ .{ 0xaa00, 0xaa28 },
+ .{ 0xaa40, 0xaa42 },
+ .{ 0xaa44, 0xaa4b },
+ .{ 0xaa60, 0xaa76 },
+ .{ 0xaa7a, 0xaa7a },
+ .{ 0xaa7e, 0xaaaf },
+ .{ 0xaab1, 0xaab1 },
+ .{ 0xaab5, 0xaab6 },
+ .{ 0xaab9, 0xaabd },
+ .{ 0xaac0, 0xaac0 },
+ .{ 0xaac2, 0xaac2 },
+ .{ 0xaadb, 0xaadd },
+ .{ 0xaae0, 0xaaea },
+ .{ 0xaaf2, 0xaaf4 },
+ .{ 0xab01, 0xab06 },
+ .{ 0xab09, 0xab0e },
+ .{ 0xab11, 0xab16 },
+ .{ 0xab20, 0xab26 },
+ .{ 0xab28, 0xab2e },
+ .{ 0xab30, 0xab5a },
+ .{ 0xab5c, 0xab69 },
+ .{ 0xab70, 0xabe2 },
+ .{ 0xac00, 0xd7a3 },
+ .{ 0xd7b0, 0xd7c6 },
+ .{ 0xd7cb, 0xd7fb },
+ .{ 0xf900, 0xfa6d },
+ .{ 0xfa70, 0xfad9 },
+ .{ 0xfb00, 0xfb06 },
+ .{ 0xfb13, 0xfb17 },
+ .{ 0xfb1d, 0xfb1d },
+ .{ 0xfb1f, 0xfb28 },
+ .{ 0xfb2a, 0xfb36 },
+ .{ 0xfb38, 0xfb3c },
+ .{ 0xfb3e, 0xfb3e },
+ .{ 0xfb40, 0xfb41 },
+ .{ 0xfb43, 0xfb44 },
+ .{ 0xfb46, 0xfbb1 },
+ .{ 0xfbd3, 0xfd3d },
+ .{ 0xfd50, 0xfd8f },
+ .{ 0xfd92, 0xfdc7 },
+ .{ 0xfdf0, 0xfdfb },
+ .{ 0xfe70, 0xfe74 },
+ .{ 0xfe76, 0xfefc },
+ .{ 0xff21, 0xff3a },
+ .{ 0xff41, 0xff5a },
+ .{ 0xff66, 0xffbe },
+ .{ 0xffc2, 0xffc7 },
+ .{ 0xffca, 0xffcf },
+ .{ 0xffd2, 0xffd7 },
+ .{ 0xffda, 0xffdc },
+ .{ 0x10000, 0x1000b },
+ .{ 0x1000d, 0x10026 },
+ .{ 0x10028, 0x1003a },
+ .{ 0x1003c, 0x1003d },
+ .{ 0x1003f, 0x1004d },
+ .{ 0x10050, 0x1005d },
+ .{ 0x10080, 0x100fa },
+ .{ 0x10140, 0x10174 },
+ .{ 0x10280, 0x1029c },
+ .{ 0x102a0, 0x102d0 },
+ .{ 0x10300, 0x1031f },
+ .{ 0x1032d, 0x1034a },
+ .{ 0x10350, 0x10375 },
+ .{ 0x10380, 0x1039d },
+ .{ 0x103a0, 0x103c3 },
+ .{ 0x103c8, 0x103cf },
+ .{ 0x103d1, 0x103d5 },
+ .{ 0x10400, 0x1049d },
+ .{ 0x104b0, 0x104d3 },
+ .{ 0x104d8, 0x104fb },
+ .{ 0x10500, 0x10527 },
+ .{ 0x10530, 0x10563 },
+ .{ 0x10600, 0x10736 },
+ .{ 0x10740, 0x10755 },
+ .{ 0x10760, 0x10767 },
+ .{ 0x10800, 0x10805 },
+ .{ 0x10808, 0x10808 },
+ .{ 0x1080a, 0x10835 },
+ .{ 0x10837, 0x10838 },
+ .{ 0x1083c, 0x1083c },
+ .{ 0x1083f, 0x10855 },
+ .{ 0x10860, 0x10876 },
+ .{ 0x10880, 0x1089e },
+ .{ 0x108e0, 0x108f2 },
+ .{ 0x108f4, 0x108f5 },
+ .{ 0x10900, 0x10915 },
+ .{ 0x10920, 0x10939 },
+ .{ 0x10980, 0x109b7 },
+ .{ 0x109be, 0x109bf },
+ .{ 0x10a00, 0x10a00 },
+ .{ 0x10a10, 0x10a13 },
+ .{ 0x10a15, 0x10a17 },
+ .{ 0x10a19, 0x10a35 },
+ .{ 0x10a60, 0x10a7c },
+ .{ 0x10a80, 0x10a9c },
+ .{ 0x10ac0, 0x10ac7 },
+ .{ 0x10ac9, 0x10ae4 },
+ .{ 0x10b00, 0x10b35 },
+ .{ 0x10b40, 0x10b55 },
+ .{ 0x10b60, 0x10b72 },
+ .{ 0x10b80, 0x10b91 },
+ .{ 0x10c00, 0x10c48 },
+ .{ 0x10c80, 0x10cb2 },
+ .{ 0x10cc0, 0x10cf2 },
+ .{ 0x10d00, 0x10d23 },
+ .{ 0x10e80, 0x10ea9 },
+ .{ 0x10eb0, 0x10eb1 },
+ .{ 0x10f00, 0x10f1c },
+ .{ 0x10f27, 0x10f27 },
+ .{ 0x10f30, 0x10f45 },
+ .{ 0x10fb0, 0x10fc4 },
+ .{ 0x10fe0, 0x10ff6 },
+ .{ 0x11003, 0x11037 },
+ .{ 0x11083, 0x110af },
+ .{ 0x110d0, 0x110e8 },
+ .{ 0x11103, 0x11126 },
+ .{ 0x11144, 0x11144 },
+ .{ 0x11147, 0x11147 },
+ .{ 0x11150, 0x11172 },
+ .{ 0x11176, 0x11176 },
+ .{ 0x11183, 0x111b2 },
+ .{ 0x111c1, 0x111c4 },
+ .{ 0x111da, 0x111da },
+ .{ 0x111dc, 0x111dc },
+ .{ 0x11200, 0x11211 },
+ .{ 0x11213, 0x1122b },
+ .{ 0x11280, 0x11286 },
+ .{ 0x11288, 0x11288 },
+ .{ 0x1128a, 0x1128d },
+ .{ 0x1128f, 0x1129d },
+ .{ 0x1129f, 0x112a8 },
+ .{ 0x112b0, 0x112de },
+ .{ 0x11305, 0x1130c },
+ .{ 0x1130f, 0x11310 },
+ .{ 0x11313, 0x11328 },
+ .{ 0x1132a, 0x11330 },
+ .{ 0x11332, 0x11333 },
+ .{ 0x11335, 0x11339 },
+ .{ 0x1133d, 0x1133d },
+ .{ 0x11350, 0x11350 },
+ .{ 0x1135d, 0x11361 },
+ .{ 0x11400, 0x11434 },
+ .{ 0x11447, 0x1144a },
+ .{ 0x1145f, 0x11461 },
+ .{ 0x11480, 0x114af },
+ .{ 0x114c4, 0x114c5 },
+ .{ 0x114c7, 0x114c7 },
+ .{ 0x11580, 0x115ae },
+ .{ 0x115d8, 0x115db },
+ .{ 0x11600, 0x1162f },
+ .{ 0x11644, 0x11644 },
+ .{ 0x11680, 0x116aa },
+ .{ 0x116b8, 0x116b8 },
+ .{ 0x11700, 0x1171a },
+ .{ 0x11800, 0x1182b },
+ .{ 0x118a0, 0x118df },
+ .{ 0x118ff, 0x11906 },
+ .{ 0x11909, 0x11909 },
+ .{ 0x1190c, 0x11913 },
+ .{ 0x11915, 0x11916 },
+ .{ 0x11918, 0x1192f },
+ .{ 0x1193f, 0x1193f },
+ .{ 0x11941, 0x11941 },
+ .{ 0x119a0, 0x119a7 },
+ .{ 0x119aa, 0x119d0 },
+ .{ 0x119e1, 0x119e1 },
+ .{ 0x119e3, 0x119e3 },
+ .{ 0x11a00, 0x11a00 },
+ .{ 0x11a0b, 0x11a32 },
+ .{ 0x11a3a, 0x11a3a },
+ .{ 0x11a50, 0x11a50 },
+ .{ 0x11a5c, 0x11a89 },
+ .{ 0x11a9d, 0x11a9d },
+ .{ 0x11ac0, 0x11af8 },
+ .{ 0x11c00, 0x11c08 },
+ .{ 0x11c0a, 0x11c2e },
+ .{ 0x11c40, 0x11c40 },
+ .{ 0x11c72, 0x11c8f },
+ .{ 0x11d00, 0x11d06 },
+ .{ 0x11d08, 0x11d09 },
+ .{ 0x11d0b, 0x11d30 },
+ .{ 0x11d46, 0x11d46 },
+ .{ 0x11d60, 0x11d65 },
+ .{ 0x11d67, 0x11d68 },
+ .{ 0x11d6a, 0x11d89 },
+ .{ 0x11d98, 0x11d98 },
+ .{ 0x11ee0, 0x11ef2 },
+ .{ 0x11fb0, 0x11fb0 },
+ .{ 0x12000, 0x12399 },
+ .{ 0x12400, 0x1246e },
+ .{ 0x12480, 0x12543 },
+ .{ 0x13000, 0x1342e },
+ .{ 0x14400, 0x14646 },
+ .{ 0x16800, 0x16a38 },
+ .{ 0x16a40, 0x16a5e },
+ .{ 0x16ad0, 0x16aed },
+ .{ 0x16b00, 0x16b2f },
+ .{ 0x16b40, 0x16b43 },
+ .{ 0x16b63, 0x16b77 },
+ .{ 0x16b7d, 0x16b8f },
+ .{ 0x16e40, 0x16e7f },
+ .{ 0x16f00, 0x16f4a },
+ .{ 0x16f50, 0x16f50 },
+ .{ 0x16f93, 0x16f9f },
+ .{ 0x16fe0, 0x16fe1 },
+ .{ 0x16fe3, 0x16fe3 },
+ .{ 0x17000, 0x187f7 },
+ .{ 0x18800, 0x18cd5 },
+ .{ 0x18d00, 0x18d08 },
+ .{ 0x1b000, 0x1b11e },
+ .{ 0x1b150, 0x1b152 },
+ .{ 0x1b164, 0x1b167 },
+ .{ 0x1b170, 0x1b2fb },
+ .{ 0x1bc00, 0x1bc6a },
+ .{ 0x1bc70, 0x1bc7c },
+ .{ 0x1bc80, 0x1bc88 },
+ .{ 0x1bc90, 0x1bc99 },
+ .{ 0x1d400, 0x1d454 },
+ .{ 0x1d456, 0x1d49c },
+ .{ 0x1d49e, 0x1d49f },
+ .{ 0x1d4a2, 0x1d4a2 },
+ .{ 0x1d4a5, 0x1d4a6 },
+ .{ 0x1d4a9, 0x1d4ac },
+ .{ 0x1d4ae, 0x1d4b9 },
+ .{ 0x1d4bb, 0x1d4bb },
+ .{ 0x1d4bd, 0x1d4c3 },
+ .{ 0x1d4c5, 0x1d505 },
+ .{ 0x1d507, 0x1d50a },
+ .{ 0x1d50d, 0x1d514 },
+ .{ 0x1d516, 0x1d51c },
+ .{ 0x1d51e, 0x1d539 },
+ .{ 0x1d53b, 0x1d53e },
+ .{ 0x1d540, 0x1d544 },
+ .{ 0x1d546, 0x1d546 },
+ .{ 0x1d54a, 0x1d550 },
+ .{ 0x1d552, 0x1d6a5 },
+ .{ 0x1d6a8, 0x1d6c0 },
+ .{ 0x1d6c2, 0x1d6da },
+ .{ 0x1d6dc, 0x1d6fa },
+ .{ 0x1d6fc, 0x1d714 },
+ .{ 0x1d716, 0x1d734 },
+ .{ 0x1d736, 0x1d74e },
+ .{ 0x1d750, 0x1d76e },
+ .{ 0x1d770, 0x1d788 },
+ .{ 0x1d78a, 0x1d7a8 },
+ .{ 0x1d7aa, 0x1d7c2 },
+ .{ 0x1d7c4, 0x1d7cb },
+ .{ 0x1e100, 0x1e12c },
+ .{ 0x1e137, 0x1e13d },
+ .{ 0x1e14e, 0x1e14e },
+ .{ 0x1e2c0, 0x1e2eb },
+ .{ 0x1e800, 0x1e8c4 },
+ .{ 0x1e900, 0x1e943 },
+ .{ 0x1e94b, 0x1e94b },
+ .{ 0x1ee00, 0x1ee03 },
+ .{ 0x1ee05, 0x1ee1f },
+ .{ 0x1ee21, 0x1ee22 },
+ .{ 0x1ee24, 0x1ee24 },
+ .{ 0x1ee27, 0x1ee27 },
+ .{ 0x1ee29, 0x1ee32 },
+ .{ 0x1ee34, 0x1ee37 },
+ .{ 0x1ee39, 0x1ee39 },
+ .{ 0x1ee3b, 0x1ee3b },
+ .{ 0x1ee42, 0x1ee42 },
+ .{ 0x1ee47, 0x1ee47 },
+ .{ 0x1ee49, 0x1ee49 },
+ .{ 0x1ee4b, 0x1ee4b },
+ .{ 0x1ee4d, 0x1ee4f },
+ .{ 0x1ee51, 0x1ee52 },
+ .{ 0x1ee54, 0x1ee54 },
+ .{ 0x1ee57, 0x1ee57 },
+ .{ 0x1ee59, 0x1ee59 },
+ .{ 0x1ee5b, 0x1ee5b },
+ .{ 0x1ee5d, 0x1ee5d },
+ .{ 0x1ee5f, 0x1ee5f },
+ .{ 0x1ee61, 0x1ee62 },
+ .{ 0x1ee64, 0x1ee64 },
+ .{ 0x1ee67, 0x1ee6a },
+ .{ 0x1ee6c, 0x1ee72 },
+ .{ 0x1ee74, 0x1ee77 },
+ .{ 0x1ee79, 0x1ee7c },
+ .{ 0x1ee7e, 0x1ee7e },
+ .{ 0x1ee80, 0x1ee89 },
+ .{ 0x1ee8b, 0x1ee9b },
+ .{ 0x1eea1, 0x1eea3 },
+ .{ 0x1eea5, 0x1eea9 },
+ .{ 0x1eeab, 0x1eebb },
+ .{ 0x20000, 0x2a6dd },
+ .{ 0x2a700, 0x2b734 },
+ .{ 0x2b740, 0x2b81d },
+ .{ 0x2b820, 0x2cea1 },
+ .{ 0x2ceb0, 0x2ebe0 },
+ .{ 0x2f800, 0x2fa1d },
+ .{ 0x30000, 0x3134a },
+ },
+);
+
+// ES5 || ESNext
+pub const id_continue = RangeTable.init(
+ 129,
+ &[_]R16Range{
+ .{ 0x30, 0x39 },
+ .{ 0x41, 0x5a },
+ .{ 0x5f, 0x5f },
+ .{ 0x61, 0x7a },
+ .{ 0xaa, 0xaa },
+ .{ 0xb5, 0xb5 },
+ .{ 0xb7, 0xb7 },
+ .{ 0xba, 0xba },
+ .{ 0xc0, 0xd6 },
+ .{ 0xd8, 0xf6 },
+ .{ 0xf8, 0x2c1 },
+ .{ 0x2c6, 0x2d1 },
+ .{ 0x2e0, 0x2e4 },
+ .{ 0x2ec, 0x2ec },
+ .{ 0x2ee, 0x2ee },
+ .{ 0x300, 0x374 },
+ .{ 0x376, 0x377 },
+ .{ 0x37a, 0x37d },
+ .{ 0x37f, 0x37f },
+ .{ 0x386, 0x38a },
+ .{ 0x38c, 0x38c },
+ .{ 0x38e, 0x3a1 },
+ .{ 0x3a3, 0x3f5 },
+ .{ 0x3f7, 0x481 },
+ .{ 0x483, 0x487 },
+ .{ 0x48a, 0x52f },
+ .{ 0x531, 0x556 },
+ .{ 0x559, 0x559 },
+ .{ 0x560, 0x588 },
+ .{ 0x591, 0x5bd },
+ .{ 0x5bf, 0x5bf },
+ .{ 0x5c1, 0x5c2 },
+ .{ 0x5c4, 0x5c5 },
+ .{ 0x5c7, 0x5c7 },
+ .{ 0x5d0, 0x5ea },
+ .{ 0x5ef, 0x5f2 },
+ .{ 0x610, 0x61a },
+ .{ 0x620, 0x669 },
+ .{ 0x66e, 0x6d3 },
+ .{ 0x6d5, 0x6dc },
+ .{ 0x6df, 0x6e8 },
+ .{ 0x6ea, 0x6fc },
+ .{ 0x6ff, 0x6ff },
+ .{ 0x710, 0x74a },
+ .{ 0x74d, 0x7b1 },
+ .{ 0x7c0, 0x7f5 },
+ .{ 0x7fa, 0x7fa },
+ .{ 0x7fd, 0x7fd },
+ .{ 0x800, 0x82d },
+ .{ 0x840, 0x85b },
+ .{ 0x860, 0x86a },
+ .{ 0x8a0, 0x8b4 },
+ .{ 0x8b6, 0x8c7 },
+ .{ 0x8d3, 0x8e1 },
+ .{ 0x8e3, 0x963 },
+ .{ 0x966, 0x96f },
+ .{ 0x971, 0x983 },
+ .{ 0x985, 0x98c },
+ .{ 0x98f, 0x990 },
+ .{ 0x993, 0x9a8 },
+ .{ 0x9aa, 0x9b0 },
+ .{ 0x9b2, 0x9b2 },
+ .{ 0x9b6, 0x9b9 },
+ .{ 0x9bc, 0x9c4 },
+ .{ 0x9c7, 0x9c8 },
+ .{ 0x9cb, 0x9ce },
+ .{ 0x9d7, 0x9d7 },
+ .{ 0x9dc, 0x9dd },
+ .{ 0x9df, 0x9e3 },
+ .{ 0x9e6, 0x9f1 },
+ .{ 0x9fc, 0x9fc },
+ .{ 0x9fe, 0x9fe },
+ .{ 0xa01, 0xa03 },
+ .{ 0xa05, 0xa0a },
+ .{ 0xa0f, 0xa10 },
+ .{ 0xa13, 0xa28 },
+ .{ 0xa2a, 0xa30 },
+ .{ 0xa32, 0xa33 },
+ .{ 0xa35, 0xa36 },
+ .{ 0xa38, 0xa39 },
+ .{ 0xa3c, 0xa3c },
+ .{ 0xa3e, 0xa42 },
+ .{ 0xa47, 0xa48 },
+ .{ 0xa4b, 0xa4d },
+ .{ 0xa51, 0xa51 },
+ .{ 0xa59, 0xa5c },
+ .{ 0xa5e, 0xa5e },
+ .{ 0xa66, 0xa75 },
+ .{ 0xa81, 0xa83 },
+ .{ 0xa85, 0xa8d },
+ .{ 0xa8f, 0xa91 },
+ .{ 0xa93, 0xaa8 },
+ .{ 0xaaa, 0xab0 },
+ .{ 0xab2, 0xab3 },
+ .{ 0xab5, 0xab9 },
+ .{ 0xabc, 0xac5 },
+ .{ 0xac7, 0xac9 },
+ .{ 0xacb, 0xacd },
+ .{ 0xad0, 0xad0 },
+ .{ 0xae0, 0xae3 },
+ .{ 0xae6, 0xaef },
+ .{ 0xaf9, 0xaff },
+ .{ 0xb01, 0xb03 },
+ .{ 0xb05, 0xb0c },
+ .{ 0xb0f, 0xb10 },
+ .{ 0xb13, 0xb28 },
+ .{ 0xb2a, 0xb30 },
+ .{ 0xb32, 0xb33 },
+ .{ 0xb35, 0xb39 },
+ .{ 0xb3c, 0xb44 },
+ .{ 0xb47, 0xb48 },
+ .{ 0xb4b, 0xb4d },
+ .{ 0xb55, 0xb57 },
+ .{ 0xb5c, 0xb5d },
+ .{ 0xb5f, 0xb63 },
+ .{ 0xb66, 0xb6f },
+ .{ 0xb71, 0xb71 },
+ .{ 0xb82, 0xb83 },
+ .{ 0xb85, 0xb8a },
+ .{ 0xb8e, 0xb90 },
+ .{ 0xb92, 0xb95 },
+ .{ 0xb99, 0xb9a },
+ .{ 0xb9c, 0xb9c },
+ .{ 0xb9e, 0xb9f },
+ .{ 0xba3, 0xba4 },
+ .{ 0xba8, 0xbaa },
+ .{ 0xbae, 0xbb9 },
+ .{ 0xbbe, 0xbc2 },
+ .{ 0xbc6, 0xbc8 },
+ .{ 0xbca, 0xbcd },
+ .{ 0xbd0, 0xbd0 },
+ .{ 0xbd7, 0xbd7 },
+ .{ 0xbe6, 0xbef },
+ .{ 0xc00, 0xc0c },
+ .{ 0xc0e, 0xc10 },
+ .{ 0xc12, 0xc28 },
+ .{ 0xc2a, 0xc39 },
+ .{ 0xc3d, 0xc44 },
+ .{ 0xc46, 0xc48 },
+ .{ 0xc4a, 0xc4d },
+ .{ 0xc55, 0xc56 },
+ .{ 0xc58, 0xc5a },
+ .{ 0xc60, 0xc63 },
+ .{ 0xc66, 0xc6f },
+ .{ 0xc80, 0xc83 },
+ .{ 0xc85, 0xc8c },
+ .{ 0xc8e, 0xc90 },
+ .{ 0xc92, 0xca8 },
+ .{ 0xcaa, 0xcb3 },
+ .{ 0xcb5, 0xcb9 },
+ .{ 0xcbc, 0xcc4 },
+ .{ 0xcc6, 0xcc8 },
+ .{ 0xcca, 0xccd },
+ .{ 0xcd5, 0xcd6 },
+ .{ 0xcde, 0xcde },
+ .{ 0xce0, 0xce3 },
+ .{ 0xce6, 0xcef },
+ .{ 0xcf1, 0xcf2 },
+ .{ 0xd00, 0xd0c },
+ .{ 0xd0e, 0xd10 },
+ .{ 0xd12, 0xd44 },
+ .{ 0xd46, 0xd48 },
+ .{ 0xd4a, 0xd4e },
+ .{ 0xd54, 0xd57 },
+ .{ 0xd5f, 0xd63 },
+ .{ 0xd66, 0xd6f },
+ .{ 0xd7a, 0xd7f },
+ .{ 0xd81, 0xd83 },
+ .{ 0xd85, 0xd96 },
+ .{ 0xd9a, 0xdb1 },
+ .{ 0xdb3, 0xdbb },
+ .{ 0xdbd, 0xdbd },
+ .{ 0xdc0, 0xdc6 },
+ .{ 0xdca, 0xdca },
+ .{ 0xdcf, 0xdd4 },
+ .{ 0xdd6, 0xdd6 },
+ .{ 0xdd8, 0xddf },
+ .{ 0xde6, 0xdef },
+ .{ 0xdf2, 0xdf3 },
+ .{ 0xe01, 0xe3a },
+ .{ 0xe40, 0xe4e },
+ .{ 0xe50, 0xe59 },
+ .{ 0xe81, 0xe82 },
+ .{ 0xe84, 0xe84 },
+ .{ 0xe86, 0xe8a },
+ .{ 0xe8c, 0xea3 },
+ .{ 0xea5, 0xea5 },
+ .{ 0xea7, 0xebd },
+ .{ 0xec0, 0xec4 },
+ .{ 0xec6, 0xec6 },
+ .{ 0xec8, 0xecd },
+ .{ 0xed0, 0xed9 },
+ .{ 0xedc, 0xedf },
+ .{ 0xf00, 0xf00 },
+ .{ 0xf18, 0xf19 },
+ .{ 0xf20, 0xf29 },
+ .{ 0xf35, 0xf35 },
+ .{ 0xf37, 0xf37 },
+ .{ 0xf39, 0xf39 },
+ .{ 0xf3e, 0xf47 },
+ .{ 0xf49, 0xf6c },
+ .{ 0xf71, 0xf84 },
+ .{ 0xf86, 0xf97 },
+ .{ 0xf99, 0xfbc },
+ .{ 0xfc6, 0xfc6 },
+ },
+ &[_]R32Range{
+ .{ 0x1000, 0x1049 },
+ .{ 0x1050, 0x109d },
+ .{ 0x10a0, 0x10c5 },
+ .{ 0x10c7, 0x10c7 },
+ .{ 0x10cd, 0x10cd },
+ .{ 0x10d0, 0x10fa },
+ .{ 0x10fc, 0x1248 },
+ .{ 0x124a, 0x124d },
+ .{ 0x1250, 0x1256 },
+ .{ 0x1258, 0x1258 },
+ .{ 0x125a, 0x125d },
+ .{ 0x1260, 0x1288 },
+ .{ 0x128a, 0x128d },
+ .{ 0x1290, 0x12b0 },
+ .{ 0x12b2, 0x12b5 },
+ .{ 0x12b8, 0x12be },
+ .{ 0x12c0, 0x12c0 },
+ .{ 0x12c2, 0x12c5 },
+ .{ 0x12c8, 0x12d6 },
+ .{ 0x12d8, 0x1310 },
+ .{ 0x1312, 0x1315 },
+ .{ 0x1318, 0x135a },
+ .{ 0x135d, 0x135f },
+ .{ 0x1369, 0x1371 },
+ .{ 0x1380, 0x138f },
+ .{ 0x13a0, 0x13f5 },
+ .{ 0x13f8, 0x13fd },
+ .{ 0x1401, 0x166c },
+ .{ 0x166f, 0x167f },
+ .{ 0x1681, 0x169a },
+ .{ 0x16a0, 0x16ea },
+ .{ 0x16ee, 0x16f8 },
+ .{ 0x1700, 0x170c },
+ .{ 0x170e, 0x1714 },
+ .{ 0x1720, 0x1734 },
+ .{ 0x1740, 0x1753 },
+ .{ 0x1760, 0x176c },
+ .{ 0x176e, 0x1770 },
+ .{ 0x1772, 0x1773 },
+ .{ 0x1780, 0x17d3 },
+ .{ 0x17d7, 0x17d7 },
+ .{ 0x17dc, 0x17dd },
+ .{ 0x17e0, 0x17e9 },
+ .{ 0x180b, 0x180d },
+ .{ 0x1810, 0x1819 },
+ .{ 0x1820, 0x1878 },
+ .{ 0x1880, 0x18aa },
+ .{ 0x18b0, 0x18f5 },
+ .{ 0x1900, 0x191e },
+ .{ 0x1920, 0x192b },
+ .{ 0x1930, 0x193b },
+ .{ 0x1946, 0x196d },
+ .{ 0x1970, 0x1974 },
+ .{ 0x1980, 0x19ab },
+ .{ 0x19b0, 0x19c9 },
+ .{ 0x19d0, 0x19da },
+ .{ 0x1a00, 0x1a1b },
+ .{ 0x1a20, 0x1a5e },
+ .{ 0x1a60, 0x1a7c },
+ .{ 0x1a7f, 0x1a89 },
+ .{ 0x1a90, 0x1a99 },
+ .{ 0x1aa7, 0x1aa7 },
+ .{ 0x1ab0, 0x1abd },
+ .{ 0x1abf, 0x1ac0 },
+ .{ 0x1b00, 0x1b4b },
+ .{ 0x1b50, 0x1b59 },
+ .{ 0x1b6b, 0x1b73 },
+ .{ 0x1b80, 0x1bf3 },
+ .{ 0x1c00, 0x1c37 },
+ .{ 0x1c40, 0x1c49 },
+ .{ 0x1c4d, 0x1c7d },
+ .{ 0x1c80, 0x1c88 },
+ .{ 0x1c90, 0x1cba },
+ .{ 0x1cbd, 0x1cbf },
+ .{ 0x1cd0, 0x1cd2 },
+ .{ 0x1cd4, 0x1cfa },
+ .{ 0x1d00, 0x1df9 },
+ .{ 0x1dfb, 0x1f15 },
+ .{ 0x1f18, 0x1f1d },
+ .{ 0x1f20, 0x1f45 },
+ .{ 0x1f48, 0x1f4d },
+ .{ 0x1f50, 0x1f57 },
+ .{ 0x1f59, 0x1f59 },
+ .{ 0x1f5b, 0x1f5b },
+ .{ 0x1f5d, 0x1f5d },
+ .{ 0x1f5f, 0x1f7d },
+ .{ 0x1f80, 0x1fb4 },
+ .{ 0x1fb6, 0x1fbc },
+ .{ 0x1fbe, 0x1fbe },
+ .{ 0x1fc2, 0x1fc4 },
+ .{ 0x1fc6, 0x1fcc },
+ .{ 0x1fd0, 0x1fd3 },
+ .{ 0x1fd6, 0x1fdb },
+ .{ 0x1fe0, 0x1fec },
+ .{ 0x1ff2, 0x1ff4 },
+ .{ 0x1ff6, 0x1ffc },
+ .{ 0x203f, 0x2040 },
+ .{ 0x2054, 0x2054 },
+ .{ 0x2071, 0x2071 },
+ .{ 0x207f, 0x207f },
+ .{ 0x2090, 0x209c },
+ .{ 0x20d0, 0x20dc },
+ .{ 0x20e1, 0x20e1 },
+ .{ 0x20e5, 0x20f0 },
+ .{ 0x2102, 0x2102 },
+ .{ 0x2107, 0x2107 },
+ .{ 0x210a, 0x2113 },
+ .{ 0x2115, 0x2115 },
+ .{ 0x2118, 0x211d },
+ .{ 0x2124, 0x2124 },
+ .{ 0x2126, 0x2126 },
+ .{ 0x2128, 0x2128 },
+ .{ 0x212a, 0x2139 },
+ .{ 0x213c, 0x213f },
+ .{ 0x2145, 0x2149 },
+ .{ 0x214e, 0x214e },
+ .{ 0x2160, 0x2188 },
+ .{ 0x2c00, 0x2c2e },
+ .{ 0x2c30, 0x2c5e },
+ .{ 0x2c60, 0x2ce4 },
+ .{ 0x2ceb, 0x2cf3 },
+ .{ 0x2d00, 0x2d25 },
+ .{ 0x2d27, 0x2d27 },
+ .{ 0x2d2d, 0x2d2d },
+ .{ 0x2d30, 0x2d67 },
+ .{ 0x2d6f, 0x2d6f },
+ .{ 0x2d7f, 0x2d96 },
+ .{ 0x2da0, 0x2da6 },
+ .{ 0x2da8, 0x2dae },
+ .{ 0x2db0, 0x2db6 },
+ .{ 0x2db8, 0x2dbe },
+ .{ 0x2dc0, 0x2dc6 },
+ .{ 0x2dc8, 0x2dce },
+ .{ 0x2dd0, 0x2dd6 },
+ .{ 0x2dd8, 0x2dde },
+ .{ 0x2de0, 0x2dff },
+ .{ 0x3005, 0x3007 },
+ .{ 0x3021, 0x302f },
+ .{ 0x3031, 0x3035 },
+ .{ 0x3038, 0x303c },
+ .{ 0x3041, 0x3096 },
+ .{ 0x3099, 0x309f },
+ .{ 0x30a1, 0x30ff },
+ .{ 0x3105, 0x312f },
+ .{ 0x3131, 0x318e },
+ .{ 0x31a0, 0x31bf },
+ .{ 0x31f0, 0x31ff },
+ .{ 0x3400, 0x4dbf },
+ .{ 0x4e00, 0x9ffc },
+ .{ 0xa000, 0xa48c },
+ .{ 0xa4d0, 0xa4fd },
+ .{ 0xa500, 0xa60c },
+ .{ 0xa610, 0xa62b },
+ .{ 0xa640, 0xa66f },
+ .{ 0xa674, 0xa67d },
+ .{ 0xa67f, 0xa6f1 },
+ .{ 0xa717, 0xa71f },
+ .{ 0xa722, 0xa788 },
+ .{ 0xa78b, 0xa7bf },
+ .{ 0xa7c2, 0xa7ca },
+ .{ 0xa7f5, 0xa827 },
+ .{ 0xa82c, 0xa82c },
+ .{ 0xa840, 0xa873 },
+ .{ 0xa880, 0xa8c5 },
+ .{ 0xa8d0, 0xa8d9 },
+ .{ 0xa8e0, 0xa8f7 },
+ .{ 0xa8fb, 0xa8fb },
+ .{ 0xa8fd, 0xa92d },
+ .{ 0xa930, 0xa953 },
+ .{ 0xa960, 0xa97c },
+ .{ 0xa980, 0xa9c0 },
+ .{ 0xa9cf, 0xa9d9 },
+ .{ 0xa9e0, 0xa9fe },
+ .{ 0xaa00, 0xaa36 },
+ .{ 0xaa40, 0xaa4d },
+ .{ 0xaa50, 0xaa59 },
+ .{ 0xaa60, 0xaa76 },
+ .{ 0xaa7a, 0xaac2 },
+ .{ 0xaadb, 0xaadd },
+ .{ 0xaae0, 0xaaef },
+ .{ 0xaaf2, 0xaaf6 },
+ .{ 0xab01, 0xab06 },
+ .{ 0xab09, 0xab0e },
+ .{ 0xab11, 0xab16 },
+ .{ 0xab20, 0xab26 },
+ .{ 0xab28, 0xab2e },
+ .{ 0xab30, 0xab5a },
+ .{ 0xab5c, 0xab69 },
+ .{ 0xab70, 0xabea },
+ .{ 0xabec, 0xabed },
+ .{ 0xabf0, 0xabf9 },
+ .{ 0xac00, 0xd7a3 },
+ .{ 0xd7b0, 0xd7c6 },
+ .{ 0xd7cb, 0xd7fb },
+ .{ 0xf900, 0xfa6d },
+ .{ 0xfa70, 0xfad9 },
+ .{ 0xfb00, 0xfb06 },
+ .{ 0xfb13, 0xfb17 },
+ .{ 0xfb1d, 0xfb28 },
+ .{ 0xfb2a, 0xfb36 },
+ .{ 0xfb38, 0xfb3c },
+ .{ 0xfb3e, 0xfb3e },
+ .{ 0xfb40, 0xfb41 },
+ .{ 0xfb43, 0xfb44 },
+ .{ 0xfb46, 0xfbb1 },
+ .{ 0xfbd3, 0xfd3d },
+ .{ 0xfd50, 0xfd8f },
+ .{ 0xfd92, 0xfdc7 },
+ .{ 0xfdf0, 0xfdfb },
+ .{ 0xfe00, 0xfe0f },
+ .{ 0xfe20, 0xfe2f },
+ .{ 0xfe33, 0xfe34 },
+ .{ 0xfe4d, 0xfe4f },
+ .{ 0xfe70, 0xfe74 },
+ .{ 0xfe76, 0xfefc },
+ .{ 0xff10, 0xff19 },
+ .{ 0xff21, 0xff3a },
+ .{ 0xff3f, 0xff3f },
+ .{ 0xff41, 0xff5a },
+ .{ 0xff65, 0xffbe },
+ .{ 0xffc2, 0xffc7 },
+ .{ 0xffca, 0xffcf },
+ .{ 0xffd2, 0xffd7 },
+ .{ 0xffda, 0xffdc },
+ .{ 0x10000, 0x1000b },
+ .{ 0x1000d, 0x10026 },
+ .{ 0x10028, 0x1003a },
+ .{ 0x1003c, 0x1003d },
+ .{ 0x1003f, 0x1004d },
+ .{ 0x10050, 0x1005d },
+ .{ 0x10080, 0x100fa },
+ .{ 0x10140, 0x10174 },
+ .{ 0x101fd, 0x101fd },
+ .{ 0x10280, 0x1029c },
+ .{ 0x102a0, 0x102d0 },
+ .{ 0x102e0, 0x102e0 },
+ .{ 0x10300, 0x1031f },
+ .{ 0x1032d, 0x1034a },
+ .{ 0x10350, 0x1037a },
+ .{ 0x10380, 0x1039d },
+ .{ 0x103a0, 0x103c3 },
+ .{ 0x103c8, 0x103cf },
+ .{ 0x103d1, 0x103d5 },
+ .{ 0x10400, 0x1049d },
+ .{ 0x104a0, 0x104a9 },
+ .{ 0x104b0, 0x104d3 },
+ .{ 0x104d8, 0x104fb },
+ .{ 0x10500, 0x10527 },
+ .{ 0x10530, 0x10563 },
+ .{ 0x10600, 0x10736 },
+ .{ 0x10740, 0x10755 },
+ .{ 0x10760, 0x10767 },
+ .{ 0x10800, 0x10805 },
+ .{ 0x10808, 0x10808 },
+ .{ 0x1080a, 0x10835 },
+ .{ 0x10837, 0x10838 },
+ .{ 0x1083c, 0x1083c },
+ .{ 0x1083f, 0x10855 },
+ .{ 0x10860, 0x10876 },
+ .{ 0x10880, 0x1089e },
+ .{ 0x108e0, 0x108f2 },
+ .{ 0x108f4, 0x108f5 },
+ .{ 0x10900, 0x10915 },
+ .{ 0x10920, 0x10939 },
+ .{ 0x10980, 0x109b7 },
+ .{ 0x109be, 0x109bf },
+ .{ 0x10a00, 0x10a03 },
+ .{ 0x10a05, 0x10a06 },
+ .{ 0x10a0c, 0x10a13 },
+ .{ 0x10a15, 0x10a17 },
+ .{ 0x10a19, 0x10a35 },
+ .{ 0x10a38, 0x10a3a },
+ .{ 0x10a3f, 0x10a3f },
+ .{ 0x10a60, 0x10a7c },
+ .{ 0x10a80, 0x10a9c },
+ .{ 0x10ac0, 0x10ac7 },
+ .{ 0x10ac9, 0x10ae6 },
+ .{ 0x10b00, 0x10b35 },
+ .{ 0x10b40, 0x10b55 },
+ .{ 0x10b60, 0x10b72 },
+ .{ 0x10b80, 0x10b91 },
+ .{ 0x10c00, 0x10c48 },
+ .{ 0x10c80, 0x10cb2 },
+ .{ 0x10cc0, 0x10cf2 },
+ .{ 0x10d00, 0x10d27 },
+ .{ 0x10d30, 0x10d39 },
+ .{ 0x10e80, 0x10ea9 },
+ .{ 0x10eab, 0x10eac },
+ .{ 0x10eb0, 0x10eb1 },
+ .{ 0x10f00, 0x10f1c },
+ .{ 0x10f27, 0x10f27 },
+ .{ 0x10f30, 0x10f50 },
+ .{ 0x10fb0, 0x10fc4 },
+ .{ 0x10fe0, 0x10ff6 },
+ .{ 0x11000, 0x11046 },
+ .{ 0x11066, 0x1106f },
+ .{ 0x1107f, 0x110ba },
+ .{ 0x110d0, 0x110e8 },
+ .{ 0x110f0, 0x110f9 },
+ .{ 0x11100, 0x11134 },
+ .{ 0x11136, 0x1113f },
+ .{ 0x11144, 0x11147 },
+ .{ 0x11150, 0x11173 },
+ .{ 0x11176, 0x11176 },
+ .{ 0x11180, 0x111c4 },
+ .{ 0x111c9, 0x111cc },
+ .{ 0x111ce, 0x111da },
+ .{ 0x111dc, 0x111dc },
+ .{ 0x11200, 0x11211 },
+ .{ 0x11213, 0x11237 },
+ .{ 0x1123e, 0x1123e },
+ .{ 0x11280, 0x11286 },
+ .{ 0x11288, 0x11288 },
+ .{ 0x1128a, 0x1128d },
+ .{ 0x1128f, 0x1129d },
+ .{ 0x1129f, 0x112a8 },
+ .{ 0x112b0, 0x112ea },
+ .{ 0x112f0, 0x112f9 },
+ .{ 0x11300, 0x11303 },
+ .{ 0x11305, 0x1130c },
+ .{ 0x1130f, 0x11310 },
+ .{ 0x11313, 0x11328 },
+ .{ 0x1132a, 0x11330 },
+ .{ 0x11332, 0x11333 },
+ .{ 0x11335, 0x11339 },
+ .{ 0x1133b, 0x11344 },
+ .{ 0x11347, 0x11348 },
+ .{ 0x1134b, 0x1134d },
+ .{ 0x11350, 0x11350 },
+ .{ 0x11357, 0x11357 },
+ .{ 0x1135d, 0x11363 },
+ .{ 0x11366, 0x1136c },
+ .{ 0x11370, 0x11374 },
+ .{ 0x11400, 0x1144a },
+ .{ 0x11450, 0x11459 },
+ .{ 0x1145e, 0x11461 },
+ .{ 0x11480, 0x114c5 },
+ .{ 0x114c7, 0x114c7 },
+ .{ 0x114d0, 0x114d9 },
+ .{ 0x11580, 0x115b5 },
+ .{ 0x115b8, 0x115c0 },
+ .{ 0x115d8, 0x115dd },
+ .{ 0x11600, 0x11640 },
+ .{ 0x11644, 0x11644 },
+ .{ 0x11650, 0x11659 },
+ .{ 0x11680, 0x116b8 },
+ .{ 0x116c0, 0x116c9 },
+ .{ 0x11700, 0x1171a },
+ .{ 0x1171d, 0x1172b },
+ .{ 0x11730, 0x11739 },
+ .{ 0x11800, 0x1183a },
+ .{ 0x118a0, 0x118e9 },
+ .{ 0x118ff, 0x11906 },
+ .{ 0x11909, 0x11909 },
+ .{ 0x1190c, 0x11913 },
+ .{ 0x11915, 0x11916 },
+ .{ 0x11918, 0x11935 },
+ .{ 0x11937, 0x11938 },
+ .{ 0x1193b, 0x11943 },
+ .{ 0x11950, 0x11959 },
+ .{ 0x119a0, 0x119a7 },
+ .{ 0x119aa, 0x119d7 },
+ .{ 0x119da, 0x119e1 },
+ .{ 0x119e3, 0x119e4 },
+ .{ 0x11a00, 0x11a3e },
+ .{ 0x11a47, 0x11a47 },
+ .{ 0x11a50, 0x11a99 },
+ .{ 0x11a9d, 0x11a9d },
+ .{ 0x11ac0, 0x11af8 },
+ .{ 0x11c00, 0x11c08 },
+ .{ 0x11c0a, 0x11c36 },
+ .{ 0x11c38, 0x11c40 },
+ .{ 0x11c50, 0x11c59 },
+ .{ 0x11c72, 0x11c8f },
+ .{ 0x11c92, 0x11ca7 },
+ .{ 0x11ca9, 0x11cb6 },
+ .{ 0x11d00, 0x11d06 },
+ .{ 0x11d08, 0x11d09 },
+ .{ 0x11d0b, 0x11d36 },
+ .{ 0x11d3a, 0x11d3a },
+ .{ 0x11d3c, 0x11d3d },
+ .{ 0x11d3f, 0x11d47 },
+ .{ 0x11d50, 0x11d59 },
+ .{ 0x11d60, 0x11d65 },
+ .{ 0x11d67, 0x11d68 },
+ .{ 0x11d6a, 0x11d8e },
+ .{ 0x11d90, 0x11d91 },
+ .{ 0x11d93, 0x11d98 },
+ .{ 0x11da0, 0x11da9 },
+ .{ 0x11ee0, 0x11ef6 },
+ .{ 0x11fb0, 0x11fb0 },
+ .{ 0x12000, 0x12399 },
+ .{ 0x12400, 0x1246e },
+ .{ 0x12480, 0x12543 },
+ .{ 0x13000, 0x1342e },
+ .{ 0x14400, 0x14646 },
+ .{ 0x16800, 0x16a38 },
+ .{ 0x16a40, 0x16a5e },
+ .{ 0x16a60, 0x16a69 },
+ .{ 0x16ad0, 0x16aed },
+ .{ 0x16af0, 0x16af4 },
+ .{ 0x16b00, 0x16b36 },
+ .{ 0x16b40, 0x16b43 },
+ .{ 0x16b50, 0x16b59 },
+ .{ 0x16b63, 0x16b77 },
+ .{ 0x16b7d, 0x16b8f },
+ .{ 0x16e40, 0x16e7f },
+ .{ 0x16f00, 0x16f4a },
+ .{ 0x16f4f, 0x16f87 },
+ .{ 0x16f8f, 0x16f9f },
+ .{ 0x16fe0, 0x16fe1 },
+ .{ 0x16fe3, 0x16fe4 },
+ .{ 0x16ff0, 0x16ff1 },
+ .{ 0x17000, 0x187f7 },
+ .{ 0x18800, 0x18cd5 },
+ .{ 0x18d00, 0x18d08 },
+ .{ 0x1b000, 0x1b11e },
+ .{ 0x1b150, 0x1b152 },
+ .{ 0x1b164, 0x1b167 },
+ .{ 0x1b170, 0x1b2fb },
+ .{ 0x1bc00, 0x1bc6a },
+ .{ 0x1bc70, 0x1bc7c },
+ .{ 0x1bc80, 0x1bc88 },
+ .{ 0x1bc90, 0x1bc99 },
+ .{ 0x1bc9d, 0x1bc9e },
+ .{ 0x1d165, 0x1d169 },
+ .{ 0x1d16d, 0x1d172 },
+ .{ 0x1d17b, 0x1d182 },
+ .{ 0x1d185, 0x1d18b },
+ .{ 0x1d1aa, 0x1d1ad },
+ .{ 0x1d242, 0x1d244 },
+ .{ 0x1d400, 0x1d454 },
+ .{ 0x1d456, 0x1d49c },
+ .{ 0x1d49e, 0x1d49f },
+ .{ 0x1d4a2, 0x1d4a2 },
+ .{ 0x1d4a5, 0x1d4a6 },
+ .{ 0x1d4a9, 0x1d4ac },
+ .{ 0x1d4ae, 0x1d4b9 },
+ .{ 0x1d4bb, 0x1d4bb },
+ .{ 0x1d4bd, 0x1d4c3 },
+ .{ 0x1d4c5, 0x1d505 },
+ .{ 0x1d507, 0x1d50a },
+ .{ 0x1d50d, 0x1d514 },
+ .{ 0x1d516, 0x1d51c },
+ .{ 0x1d51e, 0x1d539 },
+ .{ 0x1d53b, 0x1d53e },
+ .{ 0x1d540, 0x1d544 },
+ .{ 0x1d546, 0x1d546 },
+ .{ 0x1d54a, 0x1d550 },
+ .{ 0x1d552, 0x1d6a5 },
+ .{ 0x1d6a8, 0x1d6c0 },
+ .{ 0x1d6c2, 0x1d6da },
+ .{ 0x1d6dc, 0x1d6fa },
+ .{ 0x1d6fc, 0x1d714 },
+ .{ 0x1d716, 0x1d734 },
+ .{ 0x1d736, 0x1d74e },
+ .{ 0x1d750, 0x1d76e },
+ .{ 0x1d770, 0x1d788 },
+ .{ 0x1d78a, 0x1d7a8 },
+ .{ 0x1d7aa, 0x1d7c2 },
+ .{ 0x1d7c4, 0x1d7cb },
+ .{ 0x1d7ce, 0x1d7ff },
+ .{ 0x1da00, 0x1da36 },
+ .{ 0x1da3b, 0x1da6c },
+ .{ 0x1da75, 0x1da75 },
+ .{ 0x1da84, 0x1da84 },
+ .{ 0x1da9b, 0x1da9f },
+ .{ 0x1daa1, 0x1daaf },
+ .{ 0x1e000, 0x1e006 },
+ .{ 0x1e008, 0x1e018 },
+ .{ 0x1e01b, 0x1e021 },
+ .{ 0x1e023, 0x1e024 },
+ .{ 0x1e026, 0x1e02a },
+ .{ 0x1e100, 0x1e12c },
+ .{ 0x1e130, 0x1e13d },
+ .{ 0x1e140, 0x1e149 },
+ .{ 0x1e14e, 0x1e14e },
+ .{ 0x1e2c0, 0x1e2f9 },
+ .{ 0x1e800, 0x1e8c4 },
+ .{ 0x1e8d0, 0x1e8d6 },
+ .{ 0x1e900, 0x1e94b },
+ .{ 0x1e950, 0x1e959 },
+ .{ 0x1ee00, 0x1ee03 },
+ .{ 0x1ee05, 0x1ee1f },
+ .{ 0x1ee21, 0x1ee22 },
+ .{ 0x1ee24, 0x1ee24 },
+ .{ 0x1ee27, 0x1ee27 },
+ .{ 0x1ee29, 0x1ee32 },
+ .{ 0x1ee34, 0x1ee37 },
+ .{ 0x1ee39, 0x1ee39 },
+ .{ 0x1ee3b, 0x1ee3b },
+ .{ 0x1ee42, 0x1ee42 },
+ .{ 0x1ee47, 0x1ee47 },
+ .{ 0x1ee49, 0x1ee49 },
+ .{ 0x1ee4b, 0x1ee4b },
+ .{ 0x1ee4d, 0x1ee4f },
+ .{ 0x1ee51, 0x1ee52 },
+ .{ 0x1ee54, 0x1ee54 },
+ .{ 0x1ee57, 0x1ee57 },
+ .{ 0x1ee59, 0x1ee59 },
+ .{ 0x1ee5b, 0x1ee5b },
+ .{ 0x1ee5d, 0x1ee5d },
+ .{ 0x1ee5f, 0x1ee5f },
+ .{ 0x1ee61, 0x1ee62 },
+ .{ 0x1ee64, 0x1ee64 },
+ .{ 0x1ee67, 0x1ee6a },
+ .{ 0x1ee6c, 0x1ee72 },
+ .{ 0x1ee74, 0x1ee77 },
+ .{ 0x1ee79, 0x1ee7c },
+ .{ 0x1ee7e, 0x1ee7e },
+ .{ 0x1ee80, 0x1ee89 },
+ .{ 0x1ee8b, 0x1ee9b },
+ .{ 0x1eea1, 0x1eea3 },
+ .{ 0x1eea5, 0x1eea9 },
+ .{ 0x1eeab, 0x1eebb },
+ .{ 0x1fbf0, 0x1fbf9 },
+ .{ 0x20000, 0x2a6dd },
+ .{ 0x2a700, 0x2b734 },
+ .{ 0x2b740, 0x2b81d },
+ .{ 0x2b820, 0x2cea1 },
+ .{ 0x2ceb0, 0x2ebe0 },
+ .{ 0x2f800, 0x2fa1d },
+ .{ 0x30000, 0x3134a },
+ .{ 0xe0100, 0xe01ef },
+ },
+);
diff --git a/src/js_lexer_tables.zig b/src/js_lexer_tables.zig
index 41d3cf352..b1241adb9 100644
--- a/src/js_lexer_tables.zig
+++ b/src/js_lexer_tables.zig
@@ -839,3 +839,6 @@ test "tokenToString" {
// expect(v == 0x223C);
// }
// }
+
+pub const id_start = @import("./js_lexer/unicode.zig").id_start;
+pub const id_continue = @import("./js_lexer/unicode.zig").id_continue;
diff --git a/src/js_parser/js_parser.zig b/src/js_parser/js_parser.zig
index 24ead5013..d3db3861b 100644
--- a/src/js_parser/js_parser.zig
+++ b/src/js_parser/js_parser.zig
@@ -2539,22 +2539,22 @@ pub const Prefill = struct {
};
};
pub const StringLiteral = struct {
- pub var Key = [3]u16{ 'k', 'e', 'y' };
- pub var Children = [_]u16{ 'c', 'h', 'i', 'l', 'd', 'r', 'e', 'n' };
- pub var Filename = [_]u16{ 'f', 'i', 'l', 'e', 'N', 'a', 'm', 'e' };
- pub var LineNumber = [_]u16{ 'l', 'i', 'n', 'e', 'N', 'u', 'm', 'b', 'e', 'r' };
- pub var ColumnNumber = [_]u16{ 'c', 'o', 'l', 'u', 'm', 'n', 'N', 'u', 'm', 'b', 'e', 'r' };
+ pub var Key = [3]u8{ 'k', 'e', 'y' };
+ pub var Children = [_]u8{ 'c', 'h', 'i', 'l', 'd', 'r', 'e', 'n' };
+ pub var Filename = [_]u8{ 'f', 'i', 'l', 'e', 'N', 'a', 'm', 'e' };
+ pub var LineNumber = [_]u8{ 'l', 'i', 'n', 'e', 'N', 'u', 'm', 'b', 'e', 'r' };
+ pub var ColumnNumber = [_]u8{ 'c', 'o', 'l', 'u', 'm', 'n', 'N', 'u', 'm', 'b', 'e', 'r' };
};
pub const Value = struct {
pub var EThis = E.This{};
pub var Zero = E.Number{ .value = 0.0 };
};
pub const String = struct {
- pub var Key = E.String{ .value = &Prefill.StringLiteral.Key };
- pub var Children = E.String{ .value = &Prefill.StringLiteral.Children };
- pub var Filename = E.String{ .value = &Prefill.StringLiteral.Filename };
- pub var LineNumber = E.String{ .value = &Prefill.StringLiteral.LineNumber };
- pub var ColumnNumber = E.String{ .value = &Prefill.StringLiteral.ColumnNumber };
+ pub var Key = E.String{ .utf8 = &Prefill.StringLiteral.Key };
+ pub var Children = E.String{ .utf8 = &Prefill.StringLiteral.Children };
+ pub var Filename = E.String{ .utf8 = &Prefill.StringLiteral.Filename };
+ pub var LineNumber = E.String{ .utf8 = &Prefill.StringLiteral.LineNumber };
+ pub var ColumnNumber = E.String{ .utf8 = &Prefill.StringLiteral.ColumnNumber };
};
pub const Data = struct {
pub var BMissing = B{ .b_missing = BMissing_ };
@@ -4981,7 +4981,7 @@ pub fn NewParser(
}
fn createDefaultName(p: *P, loc: logger.Loc) !js_ast.LocRef {
- var identifier = try std.fmt.allocPrint(p.allocator, "{s}_default", .{p.source.identifier_name});
+ var identifier = try std.fmt.allocPrint(p.allocator, "{s}_default", .{try p.source.path.name.nonUniqueNameString(p.allocator)});
const name = js_ast.LocRef{ .loc = loc, .ref = try p.newSymbol(Symbol.Kind.other, identifier) };
diff --git a/src/js_printer.zig b/src/js_printer.zig
index 2260b08da..4c103a3c0 100644
--- a/src/js_printer.zig
+++ b/src/js_printer.zig
@@ -272,7 +272,7 @@ pub fn NewPrinter(
}
}
- pub fn unsafePrint(p: *Printer, str: string) void {
+ pub inline fn unsafePrint(p: *Printer, str: string) void {
p.print(str);
}
@@ -289,13 +289,13 @@ pub fn NewPrinter(
}
}
- pub fn printSpace(p: *Printer) void {
+ pub inline fn printSpace(p: *Printer) void {
p.print(" ");
}
- pub fn printNewline(p: *Printer) void {
+ pub inline fn printNewline(p: *Printer) void {
p.print("\n");
}
- pub fn printSemicolonAfterStatement(p: *Printer) void {
+ pub inline fn printSemicolonAfterStatement(p: *Printer) void {
p.print(";\n");
}
pub fn printSemicolonIfNeeded(p: *Printer) void {
@@ -304,7 +304,7 @@ pub fn NewPrinter(
p.needs_semicolon = false;
}
}
- pub fn printSpaceBeforeIdentifier(
+ pub inline fn printSpaceBeforeIdentifier(
p: *Printer,
) void {
if (p.writer.written > 0 and (js_lexer.isIdentifierContinue(p.writer.prevChar()) or p.writer.written == p.prev_reg_exp_end)) {
@@ -312,7 +312,7 @@ pub fn NewPrinter(
}
}
- pub fn maybePrintSpace(
+ pub inline fn maybePrintSpace(
p: *Printer,
) void {
switch (p.writer.prevChar()) {
@@ -327,7 +327,7 @@ pub fn NewPrinter(
return .comma;
}
- pub fn printUndefined(p: *Printer, level: Level) void {
+ pub inline fn printUndefined(p: *Printer, level: Level) void {
// void 0 is more efficient in output size
// however, "void 0" is the same as "undefined" is a point of confusion for many
// since we are optimizing for development, undefined is more clear.
@@ -414,8 +414,6 @@ pub fn NewPrinter(
pub fn addSourceMapping(p: *Printer, loc: logger.Loc) void {}
pub fn printSymbol(p: *Printer, ref: Ref) void {
- debug("<printSymbol>\n {s}", .{ref});
- defer debugl("</printSymbol>");
const name = p.renamer.nameForSymbol(ref);
p.printIdentifier(name);
@@ -555,6 +553,7 @@ pub fn NewPrinter(
pub fn printNonNegativeFloat(p: *Printer, float: f64) void {
// Is this actually an integer?
+ @setRuntimeSafety(false);
if (float < std.math.maxInt(u32) and std.math.ceil(float) == float) {
// In JavaScript, numbers are represented as 64 bit floats
// However, they could also be signed or unsigned int 32 (when doing bit shifts)
@@ -859,25 +858,28 @@ pub fn NewPrinter(
pub fn printQuotedUTF8(p: *Printer, str: string, allow_backtick: bool) void {
const quote = p.bestQuoteCharForString(str, allow_backtick);
p.print(quote);
- // I don't think this will work...
p.print(str);
p.print(quote);
}
- pub fn canPrintIdentifier(p: *Printer, name: string) bool {
- if (ascii_only) {
+ pub inline fn canPrintIdentifier(p: *Printer, name: string) bool {
+ if (comptime ascii_only) {
return js_lexer.isIdentifier(name) and !strings.containsNonBmpCodePoint(name);
} else {
return js_lexer.isIdentifier(name);
}
}
- pub fn canPrintIdentifierUTF16(p: *Printer, name: JavascriptString) bool {
- if (ascii_only) {
- return js_lexer.isIdentifierUTF16(name) and !strings.containsNonBmpCodePointUTF16(name);
- } else {
- return js_lexer.isIdentifierUTF16(name);
- }
+ pub inline fn canPrintIdentifierUTF16(p: *Printer, name: JavascriptString) bool {
+ // TODO: fix this
+ // this is commented out because something isn't quite right
+ // the problem may lie in isIdentifierUTF16, or it may lie in how these are allocated.
+ return false;
+ // if (comptime ascii_only) {
+ // return js_lexer.isIdentifierUTF16(name) and !strings.containsNonBmpCodePointUTF16(name);
+ // } else {
+ // return js_lexer.isIdentifierUTF16(name);
+ // }
}
pub fn printExpr(p: *Printer, expr: Expr, level: Level, _flags: ExprFlag) void {
@@ -1873,18 +1875,7 @@ pub fn NewPrinter(
// While each of those property keys are ASCII, a subset of ASCII is valid as the start of an identifier
// "=" and ":" are not valid
// So we need to check
- var needs_quoted = !js_lexer.isIdentifierStart(@intCast(js_lexer.CodePoint, key.utf8[0]));
- if (!needs_quoted) {
- var i: usize = 1;
- while (i < key.utf8.len) : (i += 1) {
- if (!js_lexer.isIdentifierContinue(@intCast(js_lexer.CodePoint, key.utf8[i]))) {
- needs_quoted = true;
- break;
- }
- }
- }
-
- if (!needs_quoted) {
+ if (js_lexer.isIdentifier(key.utf8)) {
p.print(key.utf8);
} else {
allow_shorthand = false;
@@ -1971,17 +1962,10 @@ pub fn NewPrinter(
}
}
} else {
- if (key.isUTF8()) {
- const c = p.bestQuoteCharForString(key.utf8, false);
- p.print(c);
- p.printIdentifier(key.utf8);
- p.print(c);
- } else {
- const c = p.bestQuoteCharForString(key.value, false);
- p.print(c);
- p.printQuotedUTF16(key.value, c);
- p.print(c);
- }
+ const c = p.bestQuoteCharForString(key.value, false);
+ p.print(c);
+ p.printQuotedUTF16(key.value, c);
+ p.print(c);
}
},
else => {
diff --git a/src/logger.zig b/src/logger.zig
index 87b9c9c73..338b35f03 100644
--- a/src/logger.zig
+++ b/src/logger.zig
@@ -847,11 +847,6 @@ pub const Source = struct {
contents: string,
contents_is_recycled: bool = false,
- // An identifier that is mixed in to automatically-generated symbol names to
- // improve readability. For example, if the identifier is "util" then the
- // symbol for an "export default" statement will be called "util_default".
- identifier_name: string,
-
pub const ErrorPosition = struct {
line_start: usize,
line_end: usize,
@@ -861,12 +856,10 @@ pub const Source = struct {
pub fn initFile(file: fs.File, allocator: *std.mem.Allocator) !Source {
var name = file.path.name;
- var identifier_name = name.nonUniqueNameString(allocator) catch unreachable;
var source = Source{
.path = file.path,
.key_path = fs.Path.init(file.path.text),
- .identifier_name = identifier_name,
.contents = file.contents,
};
source.path.namespace = "file";
@@ -875,12 +868,10 @@ pub const Source = struct {
pub fn initRecycledFile(file: fs.File, allocator: *std.mem.Allocator) !Source {
var name = file.path.name;
- var identifier_name = name.nonUniqueNameString(allocator) catch unreachable;
var source = Source{
.path = file.path,
.key_path = fs.Path.init(file.path.text),
- .identifier_name = identifier_name,
.contents = file.contents,
.contents_is_recycled = true,
};
@@ -891,7 +882,7 @@ pub const Source = struct {
pub fn initPathString(pathString: string, contents: string) Source {
var path = fs.Path.init(pathString);
- return Source{ .key_path = path, .path = path, .identifier_name = path.name.base, .contents = contents };
+ return Source{ .key_path = path, .path = path, .contents = contents };
}
pub fn textForRange(self: *const Source, r: Range) string {
diff --git a/src/string_immutable.zig b/src/string_immutable.zig
index 564a4f94d..75bfcfd70 100644
--- a/src/string_immutable.zig
+++ b/src/string_immutable.zig
@@ -649,105 +649,111 @@ pub fn utf8ByteSequenceLength(first_byte: u8) u3 {
};
}
-pub const CodepointIterator = struct {
- bytes: []const u8,
- i: usize,
- width: u3 = 0,
- c: CodePoint = 0,
-
- inline fn nextCodepointSlice(it: *CodepointIterator) []const u8 {
- @setRuntimeSafety(false);
+pub fn NewCodePointIterator(comptime CodePointType: type, comptime zeroValue: comptime_int) type {
+ return struct {
+ const Iterator = @This();
+ bytes: []const u8,
+ i: usize,
+ width: u3 = 0,
+ c: CodePointType = 0,
+
+ inline fn nextCodepointSlice(it: *Iterator) []const u8 {
+ @setRuntimeSafety(false);
- const cp_len = utf8ByteSequenceLength(it.bytes[it.i]);
- it.i += cp_len;
+ const cp_len = utf8ByteSequenceLength(it.bytes[it.i]);
+ it.i += cp_len;
- return if (!(it.i > it.bytes.len)) it.bytes[it.i - cp_len .. it.i] else "";
- }
+ return if (!(it.i > it.bytes.len)) it.bytes[it.i - cp_len .. it.i] else "";
+ }
- pub fn needsUTF8Decoding(slice: string) bool {
- var it = CodepointIterator{ .bytes = slice, .i = 0 };
+ pub fn needsUTF8Decoding(slice: string) bool {
+ var it = Iterator{ .bytes = slice, .i = 0 };
- while (true) {
- const part = it.nextCodepointSlice();
- it.width = @intCast(u3, part.len);
- @setRuntimeSafety(false);
- switch (it.width) {
- 0 => return false,
- 1 => continue,
- else => return true,
+ while (true) {
+ const part = it.nextCodepointSlice();
+ it.width = @intCast(u3, part.len);
+ @setRuntimeSafety(false);
+ switch (it.width) {
+ 0 => return false,
+ 1 => continue,
+ else => return true,
+ }
}
}
- }
- pub fn scanUntilQuotedValueOrEOF(iter: *CodepointIterator, comptime quote: CodePoint) usize {
- @setRuntimeSafety(false);
+ pub fn scanUntilQuotedValueOrEOF(iter: *Iterator, comptime quote: CodePointType) usize {
+ @setRuntimeSafety(false);
- while (iter.c > -1) {
- if (!switch (iter.nextCodepoint()) {
- quote => false,
- '\\' => brk: {
- if (iter.nextCodepoint() == quote) {
- continue;
- }
- break :brk true;
- },
- else => true,
- }) {
- return iter.i + 1;
+ while (iter.c > -1) {
+ if (!switch (iter.nextCodepoint()) {
+ quote => false,
+ '\\' => brk: {
+ if (iter.nextCodepoint() == quote) {
+ continue;
+ }
+ break :brk true;
+ },
+ else => true,
+ }) {
+ return iter.i + 1;
+ }
}
+
+ return iter.i;
}
- return iter.i;
- }
+ pub fn nextCodepoint(it: *Iterator) CodePointType {
+ const slice = it.nextCodepointSlice();
+ it.width = @intCast(u3, slice.len);
+ @setRuntimeSafety(false);
- pub fn nextCodepoint(it: *CodepointIterator) CodePoint {
- const slice = it.nextCodepointSlice();
- it.width = @intCast(u3, slice.len);
- @setRuntimeSafety(false);
+ it.c = switch (it.width) {
+ 0 => zeroValue,
+ 1 => @intCast(CodePointType, slice[0]),
+ 2 => @intCast(CodePointType, std.unicode.utf8Decode2(slice) catch unreachable),
+ 3 => @intCast(CodePointType, std.unicode.utf8Decode3(slice) catch unreachable),
+ 4 => @intCast(CodePointType, std.unicode.utf8Decode4(slice) catch unreachable),
+ else => unreachable,
+ };
- it.c = switch (it.width) {
- 0 => -1,
- 1 => @intCast(CodePoint, slice[0]),
- 2 => @intCast(CodePoint, std.unicode.utf8Decode2(slice) catch unreachable),
- 3 => @intCast(CodePoint, std.unicode.utf8Decode3(slice) catch unreachable),
- 4 => @intCast(CodePoint, std.unicode.utf8Decode4(slice) catch unreachable),
- else => unreachable,
- };
+ return it.c;
+ }
- return it.c;
- }
+ pub fn nextCodepointNoReturn(it: *Iterator) void {
+ const slice = it.nextCodepointSlice();
+ it.width = @intCast(u3, slice.len);
+ @setRuntimeSafety(false);
- pub fn nextCodepointNoReturn(it: *CodepointIterator) void {
- const slice = it.nextCodepointSlice();
- it.width = @intCast(u3, slice.len);
- @setRuntimeSafety(false);
+ it.c = switch (it.width) {
+ 0 => zeroValue,
+ 1 => @intCast(CodePointType, slice[0]),
+ 2 => @intCast(CodePointType, std.unicode.utf8Decode2(slice) catch unreachable),
+ 3 => @intCast(CodePointType, std.unicode.utf8Decode3(slice) catch unreachable),
+ 4 => @intCast(CodePointType, std.unicode.utf8Decode4(slice) catch unreachable),
+ else => unreachable,
+ };
+ }
- it.c = switch (it.width) {
- 0 => -1,
- 1 => @intCast(CodePoint, slice[0]),
- 2 => @intCast(CodePoint, std.unicode.utf8Decode2(slice) catch unreachable),
- 3 => @intCast(CodePoint, std.unicode.utf8Decode3(slice) catch unreachable),
- 4 => @intCast(CodePoint, std.unicode.utf8Decode4(slice) catch unreachable),
- else => unreachable,
- };
- }
+ /// Look ahead at the next n codepoints without advancing the iterator.
+ /// If fewer than n codepoints are available, then return the remainder of the string.
+ pub fn peek(it: *Iterator, n: usize) []const u8 {
+ const original_i = it.i;
+ defer it.i = original_i;
+
+ var end_ix = original_i;
+ var found: usize = 0;
+ while (found < n) : (found += 1) {
+ const next_codepoint = it.nextCodepointSlice() orelse return it.bytes[original_i..];
+ end_ix += next_codepoint.len;
+ }
- /// Look ahead at the next n codepoints without advancing the iterator.
- /// If fewer than n codepoints are available, then return the remainder of the string.
- pub fn peek(it: *CodepointIterator, n: usize) []const u8 {
- const original_i = it.i;
- defer it.i = original_i;
-
- var end_ix = original_i;
- var found: usize = 0;
- while (found < n) : (found += 1) {
- const next_codepoint = it.nextCodepointSlice() orelse return it.bytes[original_i..];
- end_ix += next_codepoint.len;
+ return it.bytes[original_i..end_ix];
}
+ };
+}
- return it.bytes[original_i..end_ix];
- }
-};
+pub const CodepointIterator = NewCodePointIterator(CodePoint, -1);
+pub const UnsignedCodepointIterator = NewCodePointIterator(u32, 0);
test "join" {
var string_list = &[_]string{ "abc", "def", "123", "hello" };