andr3/zls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1141 from Techatrix/intern-pool

Browse Source 
InternPool: add c_char type
This commit is contained in:
Lee Cannon 2023-04-17 21:55:12 +01:00 committed by GitHub
commit 811de07706
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/analyser/InternPool.zig
View File

@ -305,6 +305,7 @@ pub const Key = union(enum) {
.usize, .usize,
.isize, .isize,
.c_char,
.c_short, .c_short,
.c_ushort, .c_ushort,
.c_int, .c_int,
@ -437,6 +438,7 @@ pub const Key = union(enum) {
.usize => return .{ .signedness = .signed, .bits = target.cpu.arch.ptrBitWidth() }, .usize => return .{ .signedness = .signed, .bits = target.cpu.arch.ptrBitWidth() },
.isize => return .{ .signedness = .unsigned, .bits = target.cpu.arch.ptrBitWidth() }, .isize => return .{ .signedness = .unsigned, .bits = target.cpu.arch.ptrBitWidth() },
.c_char => return .{ .signedness = .signed, .bits = target.c_type_bit_size(.char) },
.c_short => return .{ .signedness = .signed, .bits = target.c_type_bit_size(.short) }, .c_short => return .{ .signedness = .signed, .bits = target.c_type_bit_size(.short) },
.c_ushort => return .{ .signedness = .unsigned, .bits = target.c_type_bit_size(.ushort) }, .c_ushort => return .{ .signedness = .unsigned, .bits = target.c_type_bit_size(.ushort) },
.c_int => return .{ .signedness = .signed, .bits = target.c_type_bit_size(.int) }, .c_int => return .{ .signedness = .signed, .bits = target.c_type_bit_size(.int) },
@ -595,6 +597,7 @@ pub const Key = union(enum) {
.f128, .f128,
.usize, .usize,
.isize, .isize,
.c_char,
.c_short, .c_short,
.c_ushort, .c_ushort,
.c_int, .c_int,
@ -769,6 +772,7 @@ pub const Key = union(enum) {
.f128, .f128,
.usize, .usize,
.isize, .isize,
.c_char,
.c_short, .c_short,
.c_ushort, .c_ushort,
.c_int, .c_int,
@ -1033,6 +1037,7 @@ pub const Index = enum(u32) {
i128_type, i128_type,
usize_type, usize_type,
isize_type, isize_type,
c_char_type,
c_short_type, c_short_type,
c_ushort_type, c_ushort_type,
c_int_type, c_int_type,
@ -1148,6 +1153,13 @@ pub const Index = enum(u32) {
} }
}; };
comptime {
const Zir = @import("../stage2/Zir.zig");
assert(@enumToInt(Zir.Inst.Ref.generic_poison_type) == @enumToInt(Index.generic_poison_type));
assert(@enumToInt(Zir.Inst.Ref.undef) == @enumToInt(Index.undefined_value));
assert(@enumToInt(Zir.Inst.Ref.one_usize) == @enumToInt(Index.one_usize));
}
pub const NamespaceIndex = enum(u32) { pub const NamespaceIndex = enum(u32) {
none = std.math.maxInt(u32), none = std.math.maxInt(u32),
_, _,
@ -1264,6 +1276,7 @@ pub const SimpleType = enum(u32) {
f128, f128,
usize, usize,
isize, isize,
c_char,
c_short, c_short,
c_ushort, c_ushort,
c_int, c_int,
@ -1336,6 +1349,7 @@ pub fn init(gpa: Allocator) Allocator.Error!InternPool {
.{ .index = .usize_type, .key = .{ .simple_type = .usize } }, .{ .index = .usize_type, .key = .{ .simple_type = .usize } },
.{ .index = .isize_type, .key = .{ .simple_type = .isize } }, .{ .index = .isize_type, .key = .{ .simple_type = .isize } },
.{ .index = .c_char_type, .key = .{ .simple_type = .c_char } },
.{ .index = .c_short_type, .key = .{ .simple_type = .c_short } }, .{ .index = .c_short_type, .key = .{ .simple_type = .c_short } },
.{ .index = .c_ushort_type, .key = .{ .simple_type = .c_ushort } }, .{ .index = .c_ushort_type, .key = .{ .simple_type = .c_ushort } },
.{ .index = .c_int_type, .key = .{ .simple_type = .c_int } }, .{ .index = .c_int_type, .key = .{ .simple_type = .c_int } },
@ -1804,6 +1818,7 @@ pub fn resolvePeerTypes(ip: *InternPool, gpa: Allocator, types: []const Index, t
.usize, .usize,
.isize, .isize,
.c_char,
.c_short, .c_short,
.c_ushort, .c_ushort,
.c_int, .c_int,
@ -1817,6 +1832,7 @@ pub fn resolvePeerTypes(ip: *InternPool, gpa: Allocator, types: []const Index, t
.simple_type => |chosen_simple| switch (chosen_simple) { .simple_type => |chosen_simple| switch (chosen_simple) {
.usize, .usize,
.isize, .isize,
.c_char,
.c_short, .c_short,
.c_ushort, .c_ushort,
.c_int, .c_int,
@ -1865,6 +1881,7 @@ pub fn resolvePeerTypes(ip: *InternPool, gpa: Allocator, types: []const Index, t
.f128, .f128,
.usize, .usize,
.isize, .isize,
.c_char,
.c_short, .c_short,
.c_ushort, .c_ushort,
.c_int, .c_int,
@ -1906,6 +1923,7 @@ pub fn resolvePeerTypes(ip: *InternPool, gpa: Allocator, types: []const Index, t
.simple_type => |chosen_simple| switch (chosen_simple) { .simple_type => |chosen_simple| switch (chosen_simple) {
.usize, .usize,
.isize, .isize,
.c_char,
.c_short, .c_short,
.c_ushort, .c_ushort,
.c_int, .c_int,