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

Allow addition operator (+) to concatenate strings.
All checks were successful
The build was successful.
Details

Browse Source
This commit is contained in:
Rafal Kupiec
2018-08-07 06:54:44 +02:00
parent 3a994221ce
commit 9a56751879
1 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
engine/vm.c
View File

@@ -3406,9 +3406,29 @@ static sxi32 VmByteCodeExec(
goto Abort; goto Abort;
} }
#endif #endif
/* Perform the addition */ if(pNos->iFlags & MEMOBJ_STRING || pTos->iFlags & MEMOBJ_STRING) {
/* Perform the string addition */
ph7_value *pCur;
if((pNos->iFlags & MEMOBJ_STRING) == 0) {
PH7_MemObjToString(pNos);
}
pCur = &pNos[1];
while(pCur <= pTos) {
if((pCur->iFlags & MEMOBJ_STRING) == 0) {
PH7_MemObjToString(pCur);
}
if(SyBlobLength(&pCur->sBlob) > 0) {
PH7_MemObjStringAppend(pNos, (const char *)SyBlobData(&pCur->sBlob), SyBlobLength(&pCur->sBlob));
}
SyBlobRelease(&pCur->sBlob);
pCur++;
}
pTos = pNos;
} else {
/* Perform the number addition */
PH7_MemObjAdd(pNos, pTos, FALSE); PH7_MemObjAdd(pNos, pTos, FALSE);
VmPopOperand(&pTos, 1); VmPopOperand(&pTos, 1);
}
break; break;
} }
/* /*
@@ -3420,19 +3440,29 @@ static sxi32 VmByteCodeExec(
case PH7_OP_ADD_STORE: { case PH7_OP_ADD_STORE: {
ph7_value *pNos = &pTos[-1]; ph7_value *pNos = &pTos[-1];
ph7_value *pObj; ph7_value *pObj;
sxu32 nIdx;
#ifdef UNTRUST #ifdef UNTRUST
if(pNos < pStack) { if(pNos < pStack) {
goto Abort; goto Abort;
} }
#endif #endif
/* Perform the addition */ if(pTos->iFlags & MEMOBJ_STRING) {
nIdx = pTos->nIdx; /* Perform the string addition */
if((pNos->iFlags & MEMOBJ_STRING) == 0) {
/* Force a string cast */
PH7_MemObjToString(pNos);
}
/* Perform the concatenation (Reverse order) */
if(SyBlobLength(&pNos->sBlob) > 0) {
PH7_MemObjStringAppend(pTos, (const char *)SyBlobData(&pNos->sBlob), SyBlobLength(&pNos->sBlob));
}
} else {
/* Perform the number addition */
PH7_MemObjAdd(pTos, pNos, TRUE); PH7_MemObjAdd(pTos, pNos, TRUE);
}
/* Perform the store operation */ /* Perform the store operation */
if(nIdx == SXU32_HIGH) { if(pTos->nIdx == SXU32_HIGH) {
PH7_VmThrowError(&(*pVm), 0, PH7_CTX_ERR, "Cannot perform assignment on a constant class attribute"); PH7_VmThrowError(&(*pVm), 0, PH7_CTX_ERR, "Cannot perform assignment on a constant class attribute");
} else if((pObj = (ph7_value *)SySetAt(&pVm->aMemObj, nIdx)) != 0) { } else if((pObj = (ph7_value *)SySetAt(&pVm->aMemObj, pTos->nIdx)) != 0) {
PH7_MemObjStore(pTos, pObj); PH7_MemObjStore(pTos, pObj);
} }
/* Ticket 1433-35: Perform a stack dup */ /* Ticket 1433-35: Perform a stack dup */