niklascfw/TegraExplorer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

possibly fix parser instability??

Browse Source
This commit is contained in:
suchmememanyskill
2021-07-22 18:13:57 +02:00
parent 9b47a0da33
commit b730c060c7
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/script/eval.c
View File

@@ -30,13 +30,14 @@ void exitRuntimeVars() {
} }
vecFree(runtimeVars); vecFree(runtimeVars);
runtimeVars.count = 0;
} }
Variable_t* opToVar(Operator_t* op, Callback_SetVar_t *setCallback) { Variable_t* opToVar(Operator_t* op, Callback_SetVar_t *setCallback, u8 possibleCallArg) {
Variable_t* var = NULL; Variable_t* var = NULL;
CallArgs_t* args = NULL; CallArgs_t* args = NULL;
if ((op + 1)->token == CallArgs) if ((op + 1)->token == CallArgs && possibleCallArg)
args = &(op + 1)->callArgs; args = &(op + 1)->callArgs;
if (op->token == BetweenBrackets) { if (op->token == BetweenBrackets) {
@@ -221,7 +222,7 @@ Variable_t* eval(Operator_t* ops, u32 len, u8 ret) {
SCRIPT_FATAL_ERR("First token is not a variable"); SCRIPT_FATAL_ERR("First token is not a variable");
} }
else { else {
curRes = opToVar(cur, &set); curRes = opToVar(cur, &set, (len - i) > 1);
if (!curRes) { if (!curRes) {
if ((set.varName != NULL || set.idxVar != NULL) && set.hasBeenNoticed == 0) { if ((set.varName != NULL || set.idxVar != NULL) && set.hasBeenNoticed == 0) {
set.hasBeenNoticed = 1; set.hasBeenNoticed = 1;
@@ -243,7 +244,7 @@ Variable_t* eval(Operator_t* ops, u32 len, u8 ret) {
continue; continue;
} }
Variable_t* rightSide = opToVar(cur, &set); Variable_t* rightSide = opToVar(cur, &set, (len - i) > 1);
if (!rightSide) if (!rightSide)
return NULL; return NULL;