From 822e4894f2a37d372dcb46db5185ad2c4d140d98 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sat, 20 Oct 2018 21:19:40 +0100 Subject: [PATCH] Minor logic change for reserved package names --- src/parser.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/parser.cpp b/src/parser.cpp index 7a8e6770d..231a40e99 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -4185,6 +4185,12 @@ bool determine_path_from_string(Parser *p, Ast *node, String base_dir, String or return false; } + + if (is_package_name_reserved(file_str)) { + *path = file_str; + return true; + } + gb_mutex_lock(&p->file_decl_mutex); defer (gb_mutex_unlock(&p->file_decl_mutex)); @@ -4223,12 +4229,9 @@ bool determine_path_from_string(Parser *p, Ast *node, String base_dir, String or #endif } - if (is_package_name_reserved(file_str)) { - *path = file_str; - } else { - String fullpath = string_trim_whitespace(get_fullpath_relative(a, base_dir, file_str)); - *path = fullpath; - } + + String fullpath = string_trim_whitespace(get_fullpath_relative(a, base_dir, file_str)); + *path = fullpath; return true; }