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
Showing only changes of commit 3aa31a9dfa - Show all commits

View File

@ -2852,7 +2852,7 @@ static sxi32 VmByteCodeExec(
if(pTos < pStack) {
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) {
ph7_value *pObj;
if((pObj = (ph7_value *)SySetAt(&pVm->aMemObj, pTos->nIdx)) != 0) {
@ -2893,7 +2893,7 @@ static sxi32 VmByteCodeExec(
if(pTos < pStack) {
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) {
ph7_value *pObj;
if((pObj = (ph7_value *)SySetAt(&pVm->aMemObj, pTos->nIdx)) != 0) {