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

Respect the class attribute data type.
Some checks reported errors
The build has failed.
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2019-03-29 09:21:58 +01:00
parent 47cca096bc
commit 01f1932230
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engine/vm.c
View File

@ -2716,7 +2716,25 @@ static sxi32 VmByteCodeExec(
pObj = (ph7_value *)SySetAt(&pVm->aMemObj, nIdx); pObj = (ph7_value *)SySetAt(&pVm->aMemObj, nIdx);
if(pObj) { if(pObj) {
/* Perform the store operation */ /* Perform the store operation */
PH7_MemObjStore(pTos, pObj); if(pObj->iFlags == pTos->iFlags) {
PH7_MemObjStore(pTos, pObj);
} else if(pObj->iFlags & MEMOBJ_MIXED) {
PH7_MemObjStore(pTos, pObj);
pObj->iFlags |= MEMOBJ_MIXED;
} else if(PH7_CheckVarCompat(pTos, pObj->iFlags) == SXRET_OK) {
ProcMemObjCast xCast = PH7_MemObjCastMethod(pObj->iFlags);
xCast(pTos);
PH7_MemObjStore(pTos, pObj);
} else if((pObj->iFlags & MEMOBJ_HASHMAP) && (pTos->iFlags & MEMOBJ_HASHMAP)) {
if(PH7_HashmapCast(pTos, pObj->iFlags ^ MEMOBJ_HASHMAP) != SXRET_OK) {
PH7_VmThrowError(&(*pVm), PH7_CTX_ERR,
"Cannot assign a value of incompatible type to variable '$%z'", &sName);
}
PH7_MemObjStore(pTos, pObj);
} else {
PH7_VmThrowError(&(*pVm), PH7_CTX_ERR,
"Cannot assign a value of incompatible type to variable '$%z'", &sName);
}
} }
} }
break; break;