From c0dd2841362b67fdb5ede262b19688004a4eb9a4 Mon Sep 17 00:00:00 2001 From: Jarred Sumner Date: Wed, 28 Dec 2022 00:51:22 -0800 Subject: Upgrade to latest Zig (#1610) * @min and @max * builtins and some trivial ones * Most of them * more * more! * More Progress * wip * Update tagged_pointer.zig * Update http_client_async.zig * Most of the iterable dir changes * alright * Remove usages of deprecated formatters * :camera: * fmt * Update shimmer.zig * wip * wip * wip * progress * more * Latest * stuck on error * latest * workaround stage2 * wip * Update string_immutable.zig * wip * Migrate `Dirent` and `require("fs')` to use JSC<>Zig bindings * Fix build errors * Fixup most of the test failures * Fix `make headers` * Fix "outside package path" error * Fixup aligned alloc * Add missing file * linux * More linux fixes * use latest peechy * Fix transpiler test failure * Forgot about these * Fixup test failure * Update node-timers.test.ts * [node:htt] Fix `undefined is not an object` error Fixes https://github.com/oven-sh/bun/issues/1618 * Update http.exports.js * Make this test less flaky * fix hashes * Fix hex formatting and zls issues * Download zig version * Update Dockerfile * Update Dockerfile * Update uws * Update Dockerfile * Set llvm version * Update README.md * Update uws * Update Dockerfile * Update io_linux.zig * Update bun.zig * Log output * workaround strange @cInclude error * Make ffi tests better * Don't use cImport * Update c.zig * Update c-bindings.cpp * call setOutputDir * Update Dockerfile * Use a longer name * latest * Update serve.test.ts Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com> Co-authored-by: Veikka Tuominen --- src/js_lexer.zig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/js_lexer.zig') diff --git a/src/js_lexer.zig b/src/js_lexer.zig index e9ec7442b..6ff8c1ec5 100644 --- a/src/js_lexer.zig +++ b/src/js_lexer.zig @@ -735,7 +735,7 @@ fn NewLexer_( // Reset string literal const base = if (comptime quote == 0) lexer.start else lexer.start + 1; - lexer.string_literal_slice = lexer.source.contents[base..@minimum(lexer.source.contents.len, lexer.end - @as(usize, string_literal_details.suffix_len))]; + lexer.string_literal_slice = lexer.source.contents[base..@min(lexer.source.contents.len, lexer.end - @as(usize, 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) { @@ -968,7 +968,7 @@ fn NewLexer_( self.addError(self.start, "Expected \"{s}\" but found \"{s}\" (token: {s})", .{ keyword, self.raw(), - self.token, + @tagName(self.token), }, true); } else { self.addError(self.start, "Expected \"{s}\" but found \"{s}\"", .{ keyword, self.raw() }, true); @@ -2139,7 +2139,7 @@ fn NewLexer_( // JSX string literals do not support escaping // They're "pre" escaped switch (lexer.code_point) { - 'u', 0x0C, 0, '\t', std.ascii.control_code.VT, 0x08 => { + 'u', 0x0C, 0, '\t', std.ascii.control_code.vt, 0x08 => { needs_decode = true; }, else => {}, @@ -3019,7 +3019,7 @@ fn indexOfInterestingCharacterInStringLiteral(text_: []const u8, quote: u8) ?usi if (@reduce(.Max, any_significant) > 0) { const bitmask = @ptrCast(*const u16, &any_significant).*; - const first = @ctz(u16, bitmask); + const first = @ctz(bitmask); std.debug.assert(first < strings.ascii_vector_size); return first + (@ptrToInt(text.ptr) - @ptrToInt(text_.ptr)); } -- cgit v1.2.3