krgamestudios/Toy
1
0
Fork 0
mirror of https://github.com/krgamestudios/Toy.git synced 2026-04-15 14:54:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fixed execFnDecl accidentally modifying the literalCache for a moment, resolved #105

Browse Source
This commit is contained in:
Kayne Ruse
2023-08-14 10:47:10 +10:00
parent 62fe86f99b
commit 23b55fc360
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/toy_interpreter.c
View File

@@ -655,8 +655,15 @@ static bool execFnDecl(Toy_Interpreter* interpreter, bool lng) {
functionIndex = (int)readByte(interpreter->bytecode, &interpreter->count);
}
Toy_Literal identifier = interpreter->literalCache.literals[identifierIndex];
Toy_Literal function = interpreter->literalCache.literals[functionIndex];
Toy_Literal identifier = Toy_copyLiteral(interpreter->literalCache.literals[identifierIndex]);
Toy_Literal function = Toy_copyLiteral(interpreter->literalCache.literals[functionIndex]);
if (!TOY_IS_IDENTIFIER(identifier) || !TOY_IS_FUNCTION(function)) {
interpreter->errorOutput("Failed to declare a function, unknown literal error\n");
Toy_freeLiteral(identifier);
Toy_freeLiteral(function);
return false;
}
TOY_AS_FUNCTION(function).scope = Toy_pushScope(interpreter->scope); //hacked in (needed for closure persistance)
@@ -666,6 +673,10 @@ static bool execFnDecl(Toy_Interpreter* interpreter, bool lng) {
interpreter->errorOutput("Can't redefine the function \"");
Toy_printLiteralCustom(identifier, interpreter->errorOutput);
interpreter->errorOutput("\"\n");
Toy_freeLiteral(identifier);
Toy_freeLiteral(function);
return false;
}
@@ -673,6 +684,10 @@ static bool execFnDecl(Toy_Interpreter* interpreter, bool lng) {
interpreter->errorOutput("Incorrect type assigned to variable \"");
Toy_printLiteralCustom(identifier, interpreter->errorOutput);
interpreter->errorOutput("\"\n");
Toy_freeLiteral(identifier);
Toy_freeLiteral(function);
return false;
}
@@ -680,6 +695,8 @@ static bool execFnDecl(Toy_Interpreter* interpreter, bool lng) {
TOY_AS_FUNCTION(function).scope = NULL;
Toy_freeLiteral(type);
Toy_freeLiteral(identifier);
Toy_freeLiteral(function);
return true;
}