hl-valdemar/brolang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

_ prefixed top-level symbols now file-local

Browse Source
This commit is contained in:
Valdemar Høgsvig Lorenzen
2026-07-11 23:37:30 +02:00
parent 6dd6b7ff54
commit 220b1c6e82
15 changed files with 282 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/loader/loader.odin
+5 -5
View File
@@ -1226,18 +1226,18 @@ load_package :: proc(state: ^State, path: string, import_span: source.Span, is_r
return pkg_id
}
declaration_conflicts :: proc(module: ^ast.Module, pkg: ast.Package_Id, name: symbol.Id) -> bool {
declaration_conflicts :: proc(module: ^ast.Module, pkg: ast.Package_Id, file: ast.File_Id, name: symbol.Id) -> bool {
for function in module.functions {
if function.pkg == pkg && function.name == name {
if function.pkg == pkg && function.name == name && (!function.file_hidden || function.file == file) {
return true
}
}
for global in module.globals {
if global.pkg == pkg && global.name == name {
if global.pkg == pkg && global.name == name && (!global.file_hidden || global.file == file) {
return true
}
}
type_id := types.find_named(&module.type_store, u32(pkg), u32(name))
type_id := types.find_named(&module.type_store, u32(pkg), u32(name), file=u32(file))
type_item, type_ok := types.node(&module.type_store, type_id)
if type_ok && type_item.declared {
return true
@@ -1260,7 +1260,7 @@ validate_imports :: proc(state: ^State) {
)
state.module.imports[import_id].valid = false
}
if declaration_conflicts(state.module, import_item.pkg, alias) {
if declaration_conflicts(state.module, import_item.pkg, import_item.file, alias) {
state.module.imports[import_id].diagnostic = source.addf(
state.diagnostics,
import_item.span,