DiamondNether90/cground
1
0
Fork 0
forked from ground/ground
Code Pull Requests Activity

Fix use segfault

Browse Source
This commit is contained in:
Maxwell
2026-03-17 18:35:37 +11:00
parent e3a0f16d2e
commit 832c6c7bf9
1 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/interpreter.c
View File

@@ -15,6 +15,8 @@ int currentInstruction = 0;
bool isMainScopeGlobal = true; bool isMainScopeGlobal = true;
char* getFileContents(const char* filename);
[[noreturn]] void customError(GroundArg type, GroundArg what, GroundInstruction* where, int whereLine, int exitCode) { [[noreturn]] void customError(GroundArg type, GroundArg what, GroundInstruction* where, int whereLine, int exitCode) {
printf("Ground runtime error:\n ErrorType: "); printf("Ground runtime error:\n ErrorType: ");
printGroundArg(&type); printGroundArg(&type);
@@ -1886,17 +1888,17 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
char* envPath = getenv("GROUND_LIBS"); char* envPath = getenv("GROUND_LIBS");
if (envPath) { if (envPath) {
snprintf(path, sizeof(path), "%s/%s", envPath, libName); snprintf(path, sizeof(path), "%s/%s.grnd", envPath, libName);
if (access(path, F_OK) == 0) found = 1; if (access(path, F_OK) == 0) found = 1;
} }
if (!found) { if (!found) {
snprintf(path, sizeof(path), "/usr/lib/ground/%s", libName); snprintf(path, sizeof(path), "/usr/lib/ground/%s.grnd", libName);
if (access(path, F_OK) == 0) found = 1; if (access(path, F_OK) == 0) found = 1;
} }
if (!found) { if (!found) {
snprintf(path, sizeof(path), "%s", libName); snprintf(path, sizeof(path), "%s.grnd", libName);
if (access(path, F_OK) == 0) found = 1; if (access(path, F_OK) == 0) found = 1;
} }
@@ -1905,29 +1907,22 @@ GroundValue interpretGroundInstruction(GroundInstruction inst, GroundScope* scop
snprintf(errorMsg, sizeof(errorMsg), "Could not find library: %s", libName); snprintf(errorMsg, sizeof(errorMsg), "Could not find library: %s", libName);
runtimeError(FIXME, errorMsg, in, currentInstruction); runtimeError(FIXME, errorMsg, in, currentInstruction);
} }
char* fileContents = getFileContents(path);
GroundProgram program = parseFile(fileContents);
free(fileContents);
GroundScope newScope = {
.variables = scope->variables,
.labels = malloc(sizeof(GroundLabel*)),
.isMainScope = false
};
*newScope.labels = NULL;
FILE* f = fopen(path, "r"); interpretGroundProgram(&program, &newScope);
if (!f) {
runtimeError(FIXME, "Failed to open file", in, currentInstruction);
}
fseek(f, 0, SEEK_END);
long fsize = ftell(f);
fseek(f, 0, SEEK_SET);
char* content = malloc(fsize + 1);
if (!content) {
fclose(f);
runtimeError(FIXME, "Failed to allocate memory for file content", in, currentInstruction);
}
fread(content, 1, fsize, f);
fclose(f);
content[fsize] = 0;
GroundProgram program = parseFile(content);
free(content);
interpretGroundProgram(&program, scope);
freeGroundProgram(&program);
break; break;
} }