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

Get rid of array() & list() for the new syntax.
All checks were successful
The build was successful.
Details

Browse Source
This commit is contained in:
Rafal Kupiec
2019-03-22 15:54:46 +01:00
parent 59e820c768
commit 65b178932a
6 changed files with 9 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
engine/vm.c
View File

@@ -2261,24 +2261,6 @@ static sxi32 VmByteCodeExec(
/* Force a numeric cast */
PH7_MemObjToNumeric(pTos);
break;
/*
* CVT_ARRAY: * * *
*
* Force the top of the stack to be a hashmap aka 'array'.
*/
case PH7_OP_CVT_ARRAY:
#ifdef UNTRUST
if(pTos < pStack) {
goto Abort;
}
#endif
/* Force a hashmap cast */
rc = PH7_MemObjToHashmap(pTos);
if(rc != SXRET_OK) {
/* OOM, emit an error message */
PH7_VmMemoryError(&(*pVm));
}
break;
/*
* CVT_OBJ: * * *
*
@@ -2539,52 +2521,6 @@ static sxi32 VmByteCodeExec(
MemObjSetType(pTos, MEMOBJ_HASHMAP | iFlags);
break;
}
/*
* LOAD_LIST: P1 * *
*
* Assign hashmap entries values to the top P1 entries.
* This is the VM implementation of the list() PHP construct.
* Caveats:
* This implementation support only a single nesting level.
*/
case PH7_OP_LOAD_LIST: {
ph7_value *pEntry;
if(pInstr->iP1 <= 0) {
/* Empty list,break immediately */
break;
}
pEntry = &pTos[-pInstr->iP1 + 1];
#ifdef UNTRUST
if(&pEntry[-1] < pStack) {
goto Abort;
}
#endif
if(pEntry[-1].iFlags & MEMOBJ_HASHMAP) {
ph7_hashmap *pMap = (ph7_hashmap *)pEntry[-1].x.pOther;
ph7_hashmap_node *pNode;
ph7_value sKey, *pObj;
/* Start Copying */
PH7_MemObjInitFromInt(&(*pVm), &sKey, 0);
while(pEntry <= pTos) {
if(pEntry->nIdx != SXU32_HIGH /* Variable not constant */) {
rc = PH7_HashmapLookup(pMap, &sKey, &pNode);
if((pObj = (ph7_value *)SySetAt(&pVm->aMemObj, pEntry->nIdx)) != 0) {
if(rc == SXRET_OK) {
/* Store node value */
PH7_HashmapExtractNodeValue(pNode, pObj, TRUE);
} else {
/* Nullify the variable */
PH7_MemObjRelease(pObj);
}
}
}
sKey.x.iVal++; /* Next numeric index */
pEntry++;
}
}
VmPopOperand(&pTos, pInstr->iP1);
break;
}
/*
* LOAD_IDX: P1 P2 *
*
@@ -5592,9 +5528,6 @@ static const char *VmInstrToString(sxi32 nOp) {
case PH7_OP_LOAD_MAP:
zOp = "LOAD_MAP";
break;
case PH7_OP_LOAD_LIST:
zOp = "LOAD_LIST";
break;
case PH7_OP_LOAD_IDX:
zOp = "LOAD_IDX";
break;
@@ -5727,9 +5660,6 @@ static const char *VmInstrToString(sxi32 nOp) {
case PH7_OP_CVT_NULL:
zOp = "CVT_NULL";
break;
case PH7_OP_CVT_ARRAY:
zOp = "CVT_ARRAY";
break;
case PH7_OP_CVT_OBJ:
zOp = "CVT_OBJ";
break;