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

Fix some canonicalization bugs

Browse source
This commit is contained in:
Richard Feldman 2025-10-30 23:07:29 -04:00
parent 36d0b22cb6
commit 0faa026aa5
No known key found for this signature in database
4 changed files with 39 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/canonicalize/Can.zig
View file

@ -673,11 +673,10 @@ fn processAssociatedItemsSecondPass(
);
try self.env.store.addScratchDef(def_idx);
// Set node index for exposed associated item
if (self.env.containsExposedById(qualified_idx)) {
const def_idx_u16: u16 = @intCast(@intFromEnum(def_idx));
try self.env.setExposedNodeIndexById(qualified_idx, def_idx_u16);
}
// Register node index for associated item
// Associated items are always available when their parent type is in scope
const def_idx_u16: u16 = @intCast(@intFromEnum(def_idx));
try self.env.setExposedNodeIndexById(qualified_idx, def_idx_u16);
}
}
}
@ -722,11 +721,10 @@ fn processAssociatedItemsSecondPass(
const def_idx = try self.canonicalizeAssociatedDecl(decl, qualified_idx);
try self.env.store.addScratchDef(def_idx);
// Set node index for exposed associated item
if (self.env.containsExposedById(qualified_idx)) {
const def_idx_u16: u16 = @intCast(@intFromEnum(def_idx));
try self.env.setExposedNodeIndexById(qualified_idx, def_idx_u16);
}
// Register node index for associated item
// Associated items are always available when their parent type is in scope
const def_idx_u16: u16 = @intCast(@intFromEnum(def_idx));
try self.env.setExposedNodeIndexById(qualified_idx, def_idx_u16);
}
} else {
// Non-identifier patterns are not supported in associated blocks

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

@ -91,22 +91,6 @@ fn loadCompiledModule(gpa: std.mem.Allocator, bin_data: []const u8, module_name:
};
}
/// Helper function to expose all top-level definitions in a module
/// This makes them available for cross-module imports
fn exposeAllDefs(module_env: *ModuleEnv) !void {
const defs_slice = module_env.store.sliceDefs(module_env.all_defs);
for (defs_slice) |def_idx| {
const def = module_env.store.getDef(def_idx);
// Get the pattern to find the identifier
const pattern = module_env.store.getPattern(def.pattern);
if (pattern == .assign) {
const ident_idx = pattern.assign.ident;
const def_idx_u16: u16 = @intCast(@intFromEnum(def_idx));
try module_env.setExposedNodeIndexById(ident_idx, def_idx_u16);
}
}
}
gpa: std.mem.Allocator,
module_env: *ModuleEnv,
@ -211,9 +195,6 @@ pub fn initWithImport(module_name: []const u8, source: []const u8, other_module_
try can.canonicalizeFile();
try can.validateForChecking();
// Expose all top-level definitions so they can be imported by other modules
try exposeAllDefs(module_env);
// Get Bool and Result statement indices from the IMPORTED modules (not copied!)
const bool_stmt_in_bool_module = builtin_indices.bool_type;
const try_stmt_in_result_module = builtin_indices.try_type;
@ -330,9 +311,6 @@ pub fn init(module_name: []const u8, source: []const u8) !TestEnv {
try can.canonicalizeFile();
try can.validateForChecking();
// Expose all top-level definitions so they can be imported by other modules
try exposeAllDefs(module_env);
// Get Bool and Result statement indices from the IMPORTED modules (not copied!)
const bool_stmt_in_bool_module = builtin_indices.bool_type;
const try_stmt_in_result_module = builtin_indices.try_type;

18
src/check/test/type_checking_integration.zig
View file

@ -1322,3 +1322,21 @@ test "associated item can reference another associated item from same type" {
;
try checkTypesModule(source, .{ .pass = .{ .def = "x" } }, "Test.MyBool");
}
test "Bool.not works as builtin associated item" {
const source =
\\Test := [].{}
\\
\\x = Bool.not(True)
;
try checkTypesModule(source, .{ .pass = .{ .def = "x" } }, "Bool");
}
test "Str.is_empty works as low-level builtin associated item" {
const source =
\\Test := [].{}
\\
\\x = Str.is_empty("")
;
try checkTypesModule(source, .{ .pass = .{ .def = "x" } }, "Bool");
}

13
test/snapshots/nominal/nominal_associated_with_final_expression.md
View file

@ -11,6 +11,7 @@ x }
# EXPECTED
EXPRESSION IN ASSOCIATED ITEMS - nominal_associated_with_final_expression.md:2:1:2:2
UNUSED VARIABLE - nominal_associated_with_final_expression.md:1:20:1:25
UNUSED VARIABLE - nominal_associated_with_final_expression.md:1:20:1:25
# PROBLEMS
**EXPRESSION IN ASSOCIATED ITEMS**
Associated items (such as types or methods) can only have associated types and values, not plain expressions.
@ -24,6 +25,18 @@ x }
^
**UNUSED VARIABLE**
Variable `Foo.x` is not used anywhere in your code.
If you don't need this variable, prefix it with an underscore like `_Foo.x` to suppress this warning.
The unused variable is declared here:
**nominal_associated_with_final_expression.md:1:20:1:25:**
```roc
Foo := [A, B, C].{ x = 5
```
^^^^^
**UNUSED VARIABLE**
Variable `x` is not used anywhere in your code.