mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2025-12-29 17:34:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve usage of file_id

Browse Source
This commit is contained in:
gingerBill
2021-11-15 17:26:01 +00:00
parent f55fc4cd08
commit e814a3693f
9 changed files with 75 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/parser.cpp
View File

@@ -11,7 +11,7 @@ Token token_end_of_line(AstFile *f, Token tok) {
}
gbString get_file_line_as_string(TokenPos const &pos, i32 *offset_) {
AstFile *file = get_ast_file_from_id(pos.file_id);
AstFile *file = thread_safe_get_ast_file_from_id(pos.file_id);
if (file == nullptr) {
return nullptr;
}
@@ -95,7 +95,7 @@ Ast *clone_ast(Ast *node) {
if (node == nullptr) {
return nullptr;
}
AstFile *f = get_ast_file_from_id(node->file_id);
AstFile *f = node->thread_safe_file();
Ast *n = alloc_ast_node(f, node->kind);
gb_memmove(n, node, ast_node_size(node->kind));
@@ -401,7 +401,7 @@ void error(Ast *node, char const *fmt, ...) {
error_va(token.pos, end_pos, fmt, va);
va_end(va);
if (node != nullptr && node->file_id != 0) {
AstFile *f = get_ast_file_from_id(node->file_id);
AstFile *f = node->thread_safe_file();
f->error_count += 1;
}
}
@@ -416,7 +416,7 @@ void error_no_newline(Ast *node, char const *fmt, ...) {
error_no_newline_va(token.pos, fmt, va);
va_end(va);
if (node != nullptr && node->file_id != 0) {
AstFile *f = get_ast_file_from_id(node->file_id);
AstFile *f = node->thread_safe_file();
f->error_count += 1;
}
}
@@ -446,7 +446,7 @@ void syntax_error(Ast *node, char const *fmt, ...) {
syntax_error_va(token.pos, end_pos, fmt, va);
va_end(va);
if (node != nullptr && node->file_id != 0) {
AstFile *f = get_ast_file_from_id(node->file_id);
AstFile *f = node->thread_safe_file();
f->error_count += 1;
}
}
@@ -4669,7 +4669,7 @@ ParseFileError init_ast_file(AstFile *f, String fullpath, TokenPos *err_pos) {
GB_ASSERT(f != nullptr);
f->fullpath = string_trim_whitespace(fullpath); // Just in case
set_file_path_string(f->id, fullpath);
set_ast_file_from_id(f->id, f);
thread_safe_set_ast_file_from_id(f->id, f);
if (!string_ends_with(f->fullpath, str_lit(".odin"))) {
return ParseFile_WrongExtension;
}