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

Fixed read_directory_recursive not enforcing all nested subdirectories to be part of the same package when .ODIN_MONOLITHIC_PACKAGE on package directory

Browse Source
This commit is contained in:
ed
2024-05-18 14:17:03 -04:00
parent 6cff778944
commit 389e12a785
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parser.cpp
+4 -3
View File
@@ -5433,7 +5433,7 @@ gb_internal void parser_add_foreign_file_to_process(Parser *p, AstPackage *pkg,
thread_pool_add_task(foreign_file_worker_proc, wd); thread_pool_add_task(foreign_file_worker_proc, wd);
} }
gb_internal ReadDirectoryError read_directory_recursive(String path, Array<FileInfo> *fi, String const &FILE_EXT) { gb_internal ReadDirectoryError read_directory_recursive(String path, Array<FileInfo> *fi, String const &FILE_EXT, bool is_monolihtic = false) {
Array<FileInfo> sub_list = {}; Array<FileInfo> sub_list = {};
ReadDirectoryError rd_err = read_directory(path, &sub_list); ReadDirectoryError rd_err = read_directory(path, &sub_list);
defer(array_free(&sub_list)); defer(array_free(&sub_list));
@@ -5446,14 +5446,15 @@ gb_internal ReadDirectoryError read_directory_recursive(String path, Array<FileI
String ext = path_extension(sub_list[0].name); String ext = path_extension(sub_list[0].name);
bool monolithic_specified = false; bool monolithic_specified = false;
if (ext == FILE_EXT_MONLITHIC) { if (is_monolihtic || ext == FILE_EXT_MONLITHIC) {
// ALl subdirectories for this package cannot have nested packages, they'll all be considered part of the same package
monolithic_specified = true; monolithic_specified = true;
} }
for (FileInfo sub_fi : sub_list) { for (FileInfo sub_fi : sub_list) {
String ext = path_extension(sub_fi.name); String ext = path_extension(sub_fi.name);
if (monolithic_specified && sub_fi.is_dir) if (monolithic_specified && sub_fi.is_dir)
{ {
rd_err = read_directory_recursive(sub_fi.fullpath, fi, FILE_EXT); rd_err = read_directory_recursive(sub_fi.fullpath, fi, FILE_EXT, monolithic_specified);
if (rd_err != ReadDirectory_None) { if (rd_err != ReadDirectory_None) {
return rd_err; return rd_err;
} }