aboutsummaryrefslogtreecommitdiff
path: root/src/js_lexer
diff options
context:
space:
mode:
Diffstat (limited to 'src/js_lexer')
-rw-r--r--src/js_lexer/identifier.zig12
-rw-r--r--src/js_lexer/identifier_cache.zig8
-rw-r--r--src/js_lexer/identifier_data.zig4
3 files changed, 12 insertions, 12 deletions
diff --git a/src/js_lexer/identifier.zig b/src/js_lexer/identifier.zig
index 8c1a59c2b..77308fcd2 100644
--- a/src/js_lexer/identifier.zig
+++ b/src/js_lexer/identifier.zig
@@ -19,9 +19,9 @@ pub const Bitset = struct {
pub fn isIdentifierStart(codepoint: i32) bool {
return codepoint >= (comptime id_start_range[0]) and
codepoint <= (comptime id_start_range[1]) and
- id_start.isSet((comptime @intCast(usize, id_start_range[1])) - @intCast(
+ id_start.isSet((comptime @as(usize, @intCast(id_start_range[1]))) - @as(
usize,
- codepoint,
+ @intCast(codepoint),
));
}
@@ -29,9 +29,9 @@ pub const Bitset = struct {
return codepoint >= (comptime id_end_range[0]) and
codepoint <= (comptime id_end_range[1]) and
id_continue.isSet(
- (comptime @intCast(usize, id_end_range[1])) - @intCast(
+ (comptime @as(usize, @intCast(id_end_range[1]))) - @as(
usize,
- codepoint,
+ @intCast(codepoint),
),
);
}
@@ -46,7 +46,7 @@ pub const JumpTable = struct {
@setCold(true);
return switch (codepoint) {
// explicitly tell LLVM's optimizer about values we know will not be in the range of this switch statement
- 0xaa...0xffd7 => isIdentifierPartSlow16(@intCast(u16, codepoint)),
+ 0xaa...0xffd7 => isIdentifierPartSlow16(@as(u16, @intCast(codepoint))),
(0xffd7 + 1)...0xe01ef => isIdentifierPartSlow32(codepoint),
else => false,
};
@@ -87,7 +87,7 @@ pub const JumpTable = struct {
// explicitly tell LLVM's optimizer about values we know will not be in the range of this switch statement
(max_codepoint + 1)...maxInt(i32), minInt(i32)...127 => unreachable,
- 128...0xfdc7 => isIdentifierStartSlow16(@intCast(u16, codepoint)),
+ 128...0xfdc7 => isIdentifierStartSlow16(@as(u16, @intCast(codepoint))),
0xfdf0...0x3134a => isIdentifierStartSlow32(codepoint),
else => false,
};
diff --git a/src/js_lexer/identifier_cache.zig b/src/js_lexer/identifier_cache.zig
index 402e999f1..21511846f 100644
--- a/src/js_lexer/identifier_cache.zig
+++ b/src/js_lexer/identifier_cache.zig
@@ -6,13 +6,13 @@ pub const CachedBitset = extern struct {
len: u32,
pub fn fromFile(comptime filename: anytype) CachedBitset {
- return comptime @bitCast(CachedBitset, bun.asByteSlice(@embedFile(filename)).ptr[0..@sizeOf(CachedBitset)].*);
+ return comptime @as(CachedBitset, @bitCast(bun.asByteSlice(@embedFile(filename)).ptr[0..@sizeOf(CachedBitset)].*));
}
};
pub fn setMasks(masks: [*:0]const u8, comptime MaskType: type, masky: MaskType) void {
const FieldInfo: std.builtin.Type.StructField = std.meta.fieldInfo(MaskType, "masks");
- masky.masks = @bitCast(masks, FieldInfo.type);
+ masky.masks = @as(masks, @bitCast(FieldInfo.type));
}
pub const id_start_meta = CachedBitset.fromFile("id_start_bitset.meta.blob");
@@ -23,8 +23,8 @@ pub const id_continue_masks = @embedFile("id_continue_bitset.blob");
pub const IDStartType = bun.bit_set.ArrayBitSet(usize, id_start_meta.len);
pub const IDContinueType = bun.bit_set.ArrayBitSet(usize, id_continue_meta.len);
pub const id_start = IDStartType{
- .masks = @bitCast(std.meta.fieldInfo(IDStartType, .masks).type, @ptrCast(*const [id_start_masks.len]u8, id_start_masks).*),
+ .masks = @as(std.meta.fieldInfo(IDStartType, .masks).type, @bitCast(@as(*const [id_start_masks.len]u8, @ptrCast(id_start_masks)).*)),
};
pub const id_continue = IDContinueType{
- .masks = @bitCast(std.meta.fieldInfo(IDContinueType, .masks).type, @ptrCast(*const [id_continue_masks.len]u8, id_continue_masks).*),
+ .masks = @as(std.meta.fieldInfo(IDContinueType, .masks).type, @bitCast(@as(*const [id_continue_masks.len]u8, @ptrCast(id_continue_masks)).*)),
};
diff --git a/src/js_lexer/identifier_data.zig b/src/js_lexer/identifier_data.zig
index c9c83d113..3ff27f9c6 100644
--- a/src/js_lexer/identifier_data.zig
+++ b/src/js_lexer/identifier_data.zig
@@ -165,11 +165,11 @@ test "Check #3" {
var i: i32 = id_end_range[0];
while (i < id_end_range[1]) : (i += 1) {
- try std.testing.expectEqual(id_continue.isSet(@intCast(usize, id_end_range[1] - i)), Cache.id_continue.isSet(@intCast(usize, id_end_range[1] - i)));
+ try std.testing.expectEqual(id_continue.isSet(@as(usize, @intCast(id_end_range[1] - i))), Cache.id_continue.isSet(@as(usize, @intCast(id_end_range[1] - i))));
}
i = id_start_range[0];
while (i < id_start_range[1]) : (i += 1) {
- try std.testing.expectEqual(id_start.isSet(@intCast(usize, id_start_range[1] - i)), Cache.id_start.isSet(@intCast(usize, id_start_range[1] - i)));
+ try std.testing.expectEqual(id_start.isSet(@as(usize, @intCast(id_start_range[1] - i))), Cache.id_start.isSet(@as(usize, @intCast(id_start_range[1] - i))));
}
}