berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

scripting engine check Start/Initialise have correct signature before calling

This commit is contained in:
nakst 2022-02-04 11:59:59 +00:00
parent 9dbffd45ea
commit 2c79bd4367
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
util/script.c
View File

@ -5,7 +5,6 @@
// - Other operators: remainder, bitwise shifts, unary minus, bitwise AND/OR/XOR/NOT, ternary.
// - Enums, bitsets.
// - Resolving type identifiers when structs or function pointers contain references to other structs or function pointers.
// - Check that the start function has the correct signature.
// TODO Larger missing features:
// - Serialization.
@ -4559,6 +4558,20 @@ int ScriptExecute(ExecutionContext *context, ImportData *mainModule) {
return 1;
}
Node mainFunctionArguments = { 0 };
mainFunctionArguments.type = T_ARGUMENTS;
Node mainFunctionReturn = { 0 };
mainFunctionReturn.type = T_VOID;
Node mainFunctionType = { 0 };
mainFunctionType.type = T_FUNCPTR;
mainFunctionType.firstChild = &mainFunctionArguments;
mainFunctionArguments.sibling = &mainFunctionReturn;
if (!ASTMatching(&mainFunctionType, mainModule->rootNode->scope->entries[ScopeLookupIndex(&n, mainModule->rootNode->scope, false, true)]->expressionType)) {
PrintError3("The start function '%.*s' should take no arguments and return 'void'.\n", startFunctionBytes, startFunction);
return 1;
}
ImportData *module = importedModules;
while (module) {
@ -4568,6 +4581,11 @@ int ScriptExecute(ExecutionContext *context, ImportData *mainModule) {
intptr_t index = ScopeLookupIndex(&n, module->rootNode->scope, true, false);
if (index != -1) {
if (!ASTMatching(&mainFunctionType, module->rootNode->scope->entries[ScopeLookupIndex(&n, module->rootNode->scope, false, true)]->expressionType)) {
PrintError3("The 'Initialise' function in the module '%s' should take no arguments and return 'void'.\n", module->path);
return 1;
}
int result = ScriptExecuteFunction(context->heap[context->globalVariables[index + module->globalVariableOffset].i].lambdaID, context);
if (result == 0) {