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

Formatting fixes for read_directory_recursive

Browse Source
This commit is contained in:
ed
2024-05-16 17:32:16 -04:00
parent 494c9ce08e
commit 6cff778944
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/parser.cpp
+16 -18
View File
@@ -5434,13 +5434,13 @@ gb_internal void parser_add_foreign_file_to_process(Parser *p, AstPackage *pkg,
} }
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) {
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));
if (rd_err != ReadDirectory_None) { if (rd_err != ReadDirectory_None) {
return rd_err; return rd_err;
} }
String const FILE_EXT_MONLITHIC = str_lit(".ODIN_MONOLITHIC_PACKAGE"); String const FILE_EXT_MONLITHIC = str_lit(".ODIN_MONOLITHIC_PACKAGE");
@@ -5449,25 +5449,23 @@ gb_internal ReadDirectoryError read_directory_recursive(String path, Array<FileI
if (ext == FILE_EXT_MONLITHIC) { if (ext == FILE_EXT_MONLITHIC) {
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);
if (rd_err != ReadDirectory_None) { if (rd_err != ReadDirectory_None) {
return rd_err; return rd_err;
} }
} } else {
else if (ext != FILE_EXT_MONLITHIC && (ext == FILE_EXT || ext == ".S" || ext == ".s")) {
{
if (ext != FILE_EXT_MONLITHIC && (ext == FILE_EXT || ext == ".S" || ext == ".s")) {
if (fi->data == nullptr) { if (fi->data == nullptr) {
array_init(fi, heap_allocator(), 0, 100); array_init(fi, heap_allocator(), 0, 100);
} }
array_add(fi, sub_fi); array_add(fi, sub_fi);
} }
} }
} }
return rd_err; return rd_err;
} }