language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-12-23 08:48:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Replace hardcoded [2]u32 serialization type

Browse source
This commit is contained in:
Richard Feldman 2025-11-22 12:39:47 -05:00
parent bedcc21575
commit 4a2dc883f0
No known key found for this signature in database
6 changed files with 58 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

85
src/canonicalize/ModuleEnv.zig
View file

@ -40,6 +40,56 @@ pub const ModuleKind = union(enum) {
hosted,
deprecated_module,
malformed,
/// Extern-compatible tag for serialization
pub const Tag = enum(u32) {
type_module,
default_app,
app,
package,
platform,
hosted,
deprecated_module,
malformed,
};
/// Extern-compatible payload union for serialization
pub const Payload = extern union {
type_module_ident: Ident.Idx,
none: u32,
};
/// Extern-compatible serialized form
pub const Serialized = extern struct {
tag: Tag,
payload: Payload,
pub fn encode(kind: ModuleKind) @This() {
return switch (kind) {
.type_module => |idx| .{ .tag = .type_module, .payload = .{ .type_module_ident = idx } },
.default_app => .{ .tag = .default_app, .payload = .{ .none = 0 } },
.app => .{ .tag = .app, .payload = .{ .none = 0 } },
.package => .{ .tag = .package, .payload = .{ .none = 0 } },
.platform => .{ .tag = .platform, .payload = .{ .none = 0 } },
.hosted => .{ .tag = .hosted, .payload = .{ .none = 0 } },
.deprecated_module => .{ .tag = .deprecated_module, .payload = .{ .none = 0 } },
.malformed => .{ .tag = .malformed, .payload = .{ .none = 0 } },
};
}
pub fn decode(self: @This()) ModuleKind {
return switch (self.tag) {
.type_module => .{ .type_module = self.payload.type_module_ident },
.default_app => .default_app,
.app => .app,
.package => .package,
.platform => .platform,
.hosted => .hosted,
.deprecated_module => .deprecated_module,
.malformed => .malformed,
};
}
};
};
gpa: std.mem.Allocator,
@ -1670,7 +1720,7 @@ pub const Serialized = extern struct {
module_name_idx_reserved: u32, // Reserved space for module_name_idx field (interned during deserialization)
diagnostics: CIR.Diagnostic.Span,
store: NodeStore.Serialized,
module_kind: [2]u32, // Serialized ModuleKind (tag + optional payload), decoded via decodeModuleKind
module_kind: ModuleKind.Serialized,
evaluation_order_reserved: u64, // Reserved space for evaluation_order field (required for in-place deserialization cast)
from_int_digits_ident_reserved: u32, // Reserved space for from_int_digits_ident field (interned during deserialization)
from_dec_digits_ident_reserved: u32, // Reserved space for from_dec_digits_ident field (interned during deserialization)
@ -1704,7 +1754,7 @@ pub const Serialized = extern struct {
try self.types.serialize(&env.types, allocator, writer);
// Copy simple values directly
self.module_kind = encodeModuleKind(env.module_kind);
self.module_kind = ModuleKind.Serialized.encode(env.module_kind);
self.all_defs = env.all_defs;
self.all_statements = env.all_statements;
self.exports = env.exports;
@ -1771,7 +1821,7 @@ pub const Serialized = extern struct {
.gpa = gpa,
.common = common,
.types = self.types.deserialize(offset, gpa).*,
.module_kind = decodeModuleKind(self.module_kind),
.module_kind = self.module_kind.decode(),
.all_defs = self.all_defs,
.all_statements = self.all_statements,
.exports = self.exports,
@ -1808,35 +1858,6 @@ pub const Serialized = extern struct {
return env;
}
/// Encode a ModuleKind to a serializable [2]u32 representation
pub fn encodeModuleKind(kind: ModuleKind) [2]u32 {
return switch (kind) {
.type_module => |idx| .{ 0, @bitCast(idx) },
.default_app => .{ 1, 0 },
.app => .{ 2, 0 },
.package => .{ 3, 0 },
.platform => .{ 4, 0 },
.hosted => .{ 5, 0 },
.deprecated_module => .{ 6, 0 },
.malformed => .{ 7, 0 },
};
}
/// Decode a [2]u32 representation back to a ModuleKind
pub fn decodeModuleKind(encoded: [2]u32) ModuleKind {
return switch (encoded[0]) {
0 => .{ .type_module = @bitCast(encoded[1]) },
1 => .default_app,
2 => .app,
3 => .package,
4 => .platform,
5 => .hosted,
6 => .deprecated_module,
7 => .malformed,
else => unreachable,
};
}
};
/// Convert a type into a node index

2
src/check/test/TestEnv.zig
View file

@ -73,7 +73,7 @@ fn loadCompiledModule(gpa: std.mem.Allocator, bin_data: []const u8, module_name:
.gpa = gpa,
.common = common,
.types = serialized_ptr.types.deserialize(@as(i64, @intCast(base_ptr)), gpa).*, // Pass gpa to types deserialize
.module_kind = ModuleEnv.Serialized.decodeModuleKind(serialized_ptr.module_kind),
.module_kind = serialized_ptr.module_kind.decode(),
.all_defs = serialized_ptr.all_defs,
.all_statements = serialized_ptr.all_statements,
.exports = serialized_ptr.exports,

2
src/compile/test/module_env_test.zig
View file

@ -90,7 +90,7 @@ test "ModuleEnv.Serialized roundtrip" {
.gpa = gpa,
.common = common,
.types = deserialized_ptr.types.deserialize(@as(i64, @intCast(@intFromPtr(buffer.ptr))), gpa).*,
.module_kind = ModuleEnv.Serialized.decodeModuleKind(deserialized_ptr.module_kind),
.module_kind = deserialized_ptr.module_kind.decode(),
.all_defs = deserialized_ptr.all_defs,
.all_statements = deserialized_ptr.all_statements,
.exports = deserialized_ptr.exports,

2
src/eval/builtin_loading.zig
View file

@ -65,7 +65,7 @@ pub fn loadCompiledModule(gpa: std.mem.Allocator, bin_data: []const u8, module_n
.gpa = gpa,
.common = common,
.types = serialized_ptr.types.deserialize(@as(i64, @intCast(base_ptr)), gpa).*, // Pass gpa to types deserialize
.module_kind = ModuleEnv.Serialized.decodeModuleKind(serialized_ptr.module_kind),
.module_kind = serialized_ptr.module_kind.decode(),
.all_defs = serialized_ptr.all_defs,
.all_statements = serialized_ptr.all_statements,
.exports = serialized_ptr.exports,

2
src/playground_wasm/main.zig
View file

@ -949,7 +949,7 @@ fn compileSource(source: []const u8) !CompilerStageData {
.gpa = gpa,
.common = common,
.types = serialized_ptr.types.deserialize(@as(i64, @intCast(base_ptr)), gpa).*,
.module_kind = ModuleEnv.Serialized.decodeModuleKind(serialized_ptr.module_kind),
.module_kind = serialized_ptr.module_kind.decode(),
.all_defs = serialized_ptr.all_defs,
.all_statements = serialized_ptr.all_statements,
.exports = serialized_ptr.exports,

2
src/repl/repl_test.zig
View file

@ -76,7 +76,7 @@ fn loadCompiledModule(gpa: std.mem.Allocator, bin_data: []const u8, module_name:
.gpa = gpa,
.common = common,
.types = serialized_ptr.types.deserialize(@as(i64, @intCast(base_ptr)), gpa).*, // Pass gpa to types deserialize
.module_kind = ModuleEnv.Serialized.decodeModuleKind(serialized_ptr.module_kind),
.module_kind = serialized_ptr.module_kind.decode(),
.all_defs = serialized_ptr.all_defs,
.all_statements = serialized_ptr.all_statements,
.exports = serialized_ptr.exports,