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

Merge for v0.1.1 #57

Merged
belliash merged 10 commits from master into release/v0.1 2019-11-02 09:24:59 +01:00
Conversation 0 Commits 10 Files Changed 9 +2 -2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3aa31a9dfa - Show all commits

4
engine/vm.c
View File

@@ -2852,7 +2852,7 @@ static sxi32 VmByteCodeExec(
if(pTos < pStack) { if(pTos < pStack) {
goto Abort; goto Abort;
} }
if(pTos->nType & (MEMOBJ_INT | MEMOBJ_REAL) && (pTos->nType & MEMOBJ_HASHMAP) == 0) { if(PH7_MemObjIsNumeric(pTos) && (pTos->nType & MEMOBJ_HASHMAP) == 0) {
if(pTos->nIdx != SXU32_HIGH) { if(pTos->nIdx != SXU32_HIGH) {
ph7_value *pObj; ph7_value *pObj;
if((pObj = (ph7_value *)SySetAt(&pVm->aMemObj, pTos->nIdx)) != 0) { if((pObj = (ph7_value *)SySetAt(&pVm->aMemObj, pTos->nIdx)) != 0) {
@@ -2893,7 +2893,7 @@ static sxi32 VmByteCodeExec(
if(pTos < pStack) { if(pTos < pStack) {
goto Abort; goto Abort;
} }
if(pTos->nType & (MEMOBJ_INT | MEMOBJ_REAL) && (pTos->nType & MEMOBJ_HASHMAP) == 0) { if(PH7_MemObjIsNumeric(pTos) && (pTos->nType & MEMOBJ_HASHMAP) == 0) {
if(pTos->nIdx != SXU32_HIGH) { if(pTos->nIdx != SXU32_HIGH) {
ph7_value *pObj; ph7_value *pObj;
if((pObj = (ph7_value *)SySetAt(&pVm->aMemObj, pTos->nIdx)) != 0) { if((pObj = (ph7_value *)SySetAt(&pVm->aMemObj, pTos->nIdx)) != 0) {