diff options
| -rw-r--r-- | src/js_printer.zig | 74 | ||||
| -rw-r--r-- | src/string_immutable.zig | 58 |
2 files changed, 112 insertions, 20 deletions
diff --git a/src/js_printer.zig b/src/js_printer.zig index 62390f99a..0598fb1dc 100644 --- a/src/js_printer.zig +++ b/src/js_printer.zig @@ -1651,10 +1651,7 @@ pub fn NewPrinter(comptime ascii_only: bool) type { } if (item.initializer) |initial| { - p.printSpace(); - p.print("="); - p.printSpace(); - p.printExpr(initial, .comma, ExprFlag.None()); + p.printInitializer(initial); } return; } @@ -1673,24 +1670,79 @@ pub fn NewPrinter(comptime ascii_only: bool) type { if (item.value) |val| { switch (val.data) { .e_identifier => |e| { - const name = p.renamer.nameForSymbol(e.ref); + if (strings.utf16EqlString(key.value, p.renamer.nameForSymbol(e.ref))) { + if (item.initializer) |initial| { + p.printInitializer(initial); + } + return; + } // if (strings) {} }, - .e_import_identifier => |e| {}, + .e_import_identifier => |e| { + const ref = p.symbols.follow(e.ref); + if (p.symbols.get(ref)) |symbol| { + if (symbol.namespace_alias == null and strings.utf16EqlString(key.value, p.renamer.nameForSymbol(e.ref))) { + if (item.initializer) |initial| { + p.printInitializer(initial); + } + return; + } + } + }, else => {}, } - } else {} + } + } else { + const c = p.bestQuoteCharForString(key.value, false); + p.print(c); + p.printQuotedUTF16(key.value, c); + p.print(c); } }, - else => {}, + else => { + p.printExpr(item.key.?, .lowest, ExprFlag{}); + }, } - if (item.kind != .normal) {} + if (item.kind != .normal) { + switch (item.value.?.data) { + .e_function => |func| { + p.printFunc(func.func); + return; + }, + else => {}, + } + } - if (item.value) |val| {} + if (item.value) |val| { + switch (val.data) { + .e_function => |f| { + if (item.flags.is_method) { + p.printFunc(f.func); + + return; + } + }, + else => {}, + } - if (item.initializer) |initial| {} + p.print(":"); + p.printSpace(); + p.printExpr(val, .comma, ExprFlag{}); + } + + if (item.initializer) |initial| { + p.printInitializer(initial); + } } + + pub fn printInitializer(p: *Printer, initial: Expr) void { + p.printSpace(); + p.print("="); + p.printSpace(); + p.printExpr(initial, .comma, ExprFlag.None()); + } + pub fn printBinding(p: *Printer, binding: Binding) void { notimpl(); } diff --git a/src/string_immutable.zig b/src/string_immutable.zig index 14569b5a9..116c17c00 100644 --- a/src/string_immutable.zig +++ b/src/string_immutable.zig @@ -95,26 +95,66 @@ pub fn utf16EqlString(text: []u16, str: string) bool { return false; } - var temp = [4]byte{ 0, 0, 0, 0 }; + var temp = [4]u8{ 0, 0, 0, 0 }; const n = text.len; + var j: usize = 0; + var i: usize = 0; + // TODO: is it safe to just make this u32 or u21? + var r1: i32 = undefined; + var k: u4 = 0; + while (i < n) : (i += 1) { + r1 = text[i]; + if (r1 >= 0xD800 and r1 <= 0xDBFF and i + 1 < n) { + const r2: i32 = text[i + 1]; + if (r2 >= 0xDC00 and r2 <= 0xDFFF) { + r1 = (r1 - 0xD800) << 10 | (r2 - 0xDC00) + 0x10000; + i += 1; + } + } + + const width = encodeWTF8Rune(&temp, r1); + if (j + width > str.len) { + return false; + } + k = 0; + while (k < width) : (k += 1) { + if (temp[k] != str[j]) { + return false; + } + j += 1; + } + } + + return j == str.len; } -pub fn encodeWTF8Rune(p: []byte, b: u8) u3 { +// This is a clone of golang's "utf8.EncodeRune" that has been modified to encode using +// WTF-8 instead. See https://simonsapin.github.io/wtf-8/ for more info. +pub fn encodeWTF8Rune(p: []u8, r: i32) u3 { // Negative values are erroneous. Making it unsigned addresses the problem. - const i = @intCast(u32, b); + const i = @intCast(u32, r); switch (i) { 0...0x7F => { - p[0] = b; + p[0] = @intCast(u8, r); return 1; }, - (0x7FF + 1)...0xFFFF => { - std.debug.panic("emoji not implemented yet!", .{}); + (0x7F + 1)...0x7FF => { + p[0] = 0xC0 | @intCast(u8, r >> 6); + p[1] = 0x80 | @intCast(u8, r) & 0x3F; + return 2; }, - (0x7F + 1)...(0x7FF) => { - std.debug.panic("emoji not implemented yet!", .{}); + (0x7FF + 1)...0xFFFF => { + p[0] = 0xE0 | @intCast(u8, r >> 12); + p[1] = 0x80 | @intCast(u8, r >> 6) & 0x3F; + p[2] = 0x80 | @intCast(u8, r) & 0x3F; + return 3; }, else => { - std.debug.panic("emoji not implemented yet!", .{}); + p[0] = 0xF0 | @intCast(u8, r >> 18); + p[1] = 0x80 | @intCast(u8, r >> 12) & 0x3F; + p[2] = 0x80 | @intCast(u8, r >> 6) & 0x3F; + p[3] = 0x80 | @intCast(u8, r) & 0x3F; + return 4; }, } } |