ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-07 08:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix syntax error for a missing package name

Browse Source
This commit is contained in:
gingerBill
2021-07-26 11:43:17 +01:00
parent 08dc829b70
commit ae25787f48
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parser.cpp
+8 -2
View File
@@ -5428,8 +5428,14 @@ ParseFileError process_imported_file(Parser *p, ImportedFile const &imported_fil
if (pkg->name.len == 0) { if (pkg->name.len == 0) {
pkg->name = file->package_name; pkg->name = file->package_name;
} else if (file->tokens.count > 0 && pkg->name != file->package_name) { } else if (pkg->name != file->package_name) {
syntax_error(file->package_token, "Different package name, expected '%.*s', got '%.*s'", LIT(pkg->name), LIT(file->package_name)); if (file->tokens.count > 0 && file->tokens[0].kind != Token_EOF) {
Token tok = file->package_token;
tok.pos.file_id = file->id;
tok.pos.line = gb_max(tok.pos.line, 1);
tok.pos.column = gb_max(tok.pos.column, 1);
syntax_error(tok, "Different package name, expected '%.*s', got '%.*s'", LIT(pkg->name), LIT(file->package_name));
}
} }
p->total_line_count += file->tokenizer.line_count; p->total_line_count += file->tokenizer.line_count;