aerscript/Aer
0
5
Fork 0
Code Issues 6 Pull Requests Releases 2 Wiki Activity

Typehinting merge #50

Merged
belliash merged 298 commits from typehinting into master 2019-04-17 11:27:52 +02:00
Conversation 0 Commits 298 Files Changed 98 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5eeceb6927 - Show all commits

10
engine/vm.c
View File

@ -4836,14 +4836,14 @@ static sxi32 VmByteCodeExec(
if(pObj == 0 || pVal == 0) { if(pObj == 0 || pVal == 0) {
PH7_VmMemoryError(&(*pVm)); PH7_VmMemoryError(&(*pVm));
} }
MemObjSetType(pObj, pStatic->iFlags);
if(SySetUsed(&pStatic->aByteCode) > 0) { if(SySetUsed(&pStatic->aByteCode) > 0) {
/* Evaluate initialization expression (Any complex expression) */ /* Evaluate initialization expression (Any complex expression) */
VmLocalExec(&(*pVm), &pStatic->aByteCode, pVal); VmLocalExec(&(*pVm), &pStatic->aByteCode, pVal);
} rc = PH7_MemObjSafeStore(pVal, pObj);
MemObjSetType(pObj, pStatic->iFlags); if(rc != SXRET_OK) {
rc = PH7_MemObjSafeStore(pVal, pObj); PH7_VmThrowError(&(*pVm), PH7_CTX_ERR, "Cannot assign a value of incompatible type to variable '$%z'", &pStatic->sName);
if(rc != SXRET_OK) { }
PH7_VmThrowError(&(*pVm), PH7_CTX_ERR, "Cannot assign a value of incompatible type to variable '$%z'", &pStatic->sName);
} }
pObj->nIdx = pStatic->nIdx; pObj->nIdx = pStatic->nIdx;
} }