krzosa/first
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TestClexer fix for github ubuntu worker

Browse Source
This commit is contained in:
Krzosa Karol
2024-01-28 08:59:24 +01:00
parent 190323bb5e
commit bf0d18bc00
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core_library/filesystem.c
View File

@@ -618,6 +618,11 @@ OS_API OS_Result OS_AppendFile(S8_String path, S8_String string) {
} }
OS_API S8_String OS_ReadFile(MA_Arena *arena, S8_String path) { OS_API S8_String OS_ReadFile(MA_Arena *arena, S8_String path) {
// ftell returns insane size if file is a directory **on some machines** KEKW
if (OS_IsDir(path)) {
return {};
}
MA_Checkpoint scratch = MA_GetScratch1(arena); MA_Checkpoint scratch = MA_GetScratch1(arena);
path = S8_Copy(scratch.arena, path); path = S8_Copy(scratch.arena, path);
@@ -628,7 +633,6 @@ OS_API S8_String OS_ReadFile(MA_Arena *arena, S8_String path) {
result.len = ftell(f); result.len = ftell(f);
fseek(f, 0, SEEK_SET); fseek(f, 0, SEEK_SET);
IO_Printf("Reading: %.*s, size: %lld\n", S8_Expand(path), result.len);
result.str = (char *)MA_PushSizeNonZeroed(arena, result.len + 1); result.str = (char *)MA_PushSizeNonZeroed(arena, result.len + 1);
fread(result.str, result.len, 1, f); fread(result.str, result.len, 1, f);
result.str[result.len] = 0; result.str[result.len] = 0;

3
tests/test_lexer.cpp
View File

@@ -12,11 +12,12 @@ void TestLexDir(S8_String dir) {
char msg_buff[1024]; char msg_buff[1024];
for (OS_FileIter iter = OS_IterateFiles(scratch_filenames, dir); OS_IsValid(iter); OS_Advance(&iter)) { for (OS_FileIter iter = OS_IterateFiles(scratch_filenames, dir); OS_IsValid(iter); OS_Advance(&iter)) {
MA_Scratch scratch(scratch_filenames.checkpoint); MA_Scratch scratch(scratch_filenames.checkpoint);
if (iter.is_directory) continue;
S8_String file = OS_ReadFile(scratch, iter.absolute_path); S8_String file = OS_ReadFile(scratch, iter.absolute_path);
if (!file.str) continue; if (!file.str) continue;
CL_Lexer lexer = CL_Begin(scratch, file.str, iter.absolute_path.str);
CL_Lexer lexer = CL_Begin(scratch, file.str, iter.absolute_path.str);
for (int i = 0;; i += 1) { for (int i = 0;; i += 1) {
CL_Token token = CL_Next(&lexer); CL_Token token = CL_Next(&lexer);
if (token.kind == CL_EOF) break; if (token.kind == CL_EOF) break;