lcpp
/
lci
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a segfault when attempting to declare a function in a non-array type value.

This commit is contained in:
Justin J. Meza 2011-07-01 22:38:12 -07:00
parent 35e24ff5e9
commit c3ded8ddab
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
interpreter.c
View File

@ -702,8 +702,7 @@ ValueObject *getScopeValueLocal(ScopeObject *src,
ValueObject *val = getScopeValueArray(src, dest, target); ValueObject *val = getScopeValueArray(src, dest, target);
if (!val) goto getScopeValueLocalAbort; if (!val) goto getScopeValueLocalAbort;
if (val->type != VT_ARRAY) { if (val->type != VT_ARRAY) {
printInterpreterError("variable is not an array", printInterpreterError("variable is not an array", target, src);
target, src);
goto getScopeValueLocalAbort; goto getScopeValueLocalAbort;
} }
dest = getArray(val); dest = getArray(val);
@ -758,8 +757,7 @@ ScopeObject *getScopeObject(ScopeObject *src,
ValueObject *val = getScopeValueArray(src, dest, target); ValueObject *val = getScopeValueArray(src, dest, target);
if (!val) goto getScopeObjectAbort; if (!val) goto getScopeObjectAbort;
if (val->type != VT_ARRAY) { if (val->type != VT_ARRAY) {
printInterpreterError("variable is not an array", printInterpreterError("variable is not an array", target, src);
target, src);
goto getScopeObjectAbort; goto getScopeObjectAbort;
} }
dest = getArray(val); dest = getArray(val);
@ -772,10 +770,15 @@ target, src);
status = strcmp(name, "I"); status = strcmp(name, "I");
free(name); free(name);
name = NULL;
if (!status) return src; if (!status) return src;
val = getScopeValue(src, dest, target); val = getScopeValue(src, dest, target);
if (!val) goto getScopeObjectAbort; if (!val) goto getScopeObjectAbort;
if (val->type != VT_ARRAY) {
printInterpreterError("variable is not an array", target, src);
goto getScopeObjectAbort;
}
return getArray(val); return getArray(val);
@ -3480,8 +3483,9 @@ ReturnObject *interpretFuncDefStmtNode(StmtNode *node,
FuncDefStmtNode *stmt = (FuncDefStmtNode *)node->stmt; FuncDefStmtNode *stmt = (FuncDefStmtNode *)node->stmt;
ValueObject *init = NULL; ValueObject *init = NULL;
ScopeObject *dest = NULL; ScopeObject *dest = NULL;
dest = getScopeObject(scope, scope, stmt->scope); dest = getScopeObject(scope, scope, stmt->scope);
/** \todo Figure out if this makes sense: we want to check if the local scope contains the function name, but if the name of the function contains a SRS expression, we want to evaluate that using the local scope */ if (!dest) return NULL;
if (getScopeValueLocal(scope, dest, stmt->name)) { if (getScopeValueLocal(scope, dest, stmt->name)) {
IdentifierNode *id = (IdentifierNode *)(stmt->name); IdentifierNode *id = (IdentifierNode *)(stmt->name);
char *name = resolveIdentifierName(id, scope); char *name = resolveIdentifierName(id, scope);