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

Always show compilation errors
The build was successful. Details

This commit is contained in:
Rafal Kupiec 2018-08-15 16:01:09 +02:00
parent 8e87989719
commit 6f491b398a
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
engine/vm.c
View File

@ -852,7 +852,7 @@ PH7_PRIVATE ph7_value *VmReserveMemObj(ph7_vm *pVm, sxu32 *pIndex) {
return pObj; return pObj;
} }
/* Forward declaration */ /* Forward declaration */
static sxi32 VmEvalChunk(ph7_vm *pVm, ph7_context *pCtx, SyString *pChunk, int iFlags, int bTrueReturn); static sxi32 VmEvalChunk(ph7_vm *pVm, ph7_context *pCtx, SyString *pChunk, int iFlags);
/* /*
* Built-in classes/interfaces and some functions that cannot be implemented * Built-in classes/interfaces and some functions that cannot be implemented
* directly as foreign functions. * directly as foreign functions.
@ -1281,7 +1281,7 @@ PH7_PRIVATE sxi32 PH7_VmInit(
pVm->nMagic = PH7_VM_INIT; pVm->nMagic = PH7_VM_INIT;
SyStringInitFromBuf(&sBuiltin, PH7_BUILTIN_LIB, sizeof(PH7_BUILTIN_LIB) - 1); SyStringInitFromBuf(&sBuiltin, PH7_BUILTIN_LIB, sizeof(PH7_BUILTIN_LIB) - 1);
/* Compile the built-in library */ /* Compile the built-in library */
VmEvalChunk(&(*pVm), 0, &sBuiltin, PH7_AERSCRIPT_CODE, TRUE); VmEvalChunk(&(*pVm), 0, &sBuiltin, PH7_AERSCRIPT_CODE);
/* Reset the code generator */ /* Reset the code generator */
PH7_ResetCodeGenerator(&(*pVm), pEngine->xConf.xErr, pEngine->xConf.pErrData); PH7_ResetCodeGenerator(&(*pVm), pEngine->xConf.xErr, pEngine->xConf.pErrData);
return SXRET_OK; return SXRET_OK;
@ -9004,7 +9004,7 @@ static int vm_builtin_assert(ph7_context *pCtx, int nArg, ph7_value **apArg) {
SyString sChunk; SyString sChunk;
SyStringInitFromBuf(&sChunk, SyBlobData(&pAssert->sBlob), SyBlobLength(&pAssert->sBlob)); SyStringInitFromBuf(&sChunk, SyBlobData(&pAssert->sBlob), SyBlobLength(&pAssert->sBlob));
if(sChunk.nByte > 0) { if(sChunk.nByte > 0) {
VmEvalChunk(pVm, pCtx, &sChunk, PH7_AERSCRIPT_CODE | PH7_AERSCRIPT_EXPR, FALSE); VmEvalChunk(pVm, pCtx, &sChunk, PH7_AERSCRIPT_CODE | PH7_AERSCRIPT_EXPR);
/* Extract evaluation result */ /* Extract evaluation result */
iResult = ph7_value_to_bool(pCtx->pRet); iResult = ph7_value_to_bool(pCtx->pRet);
} else { } else {
@ -10421,8 +10421,7 @@ static sxi32 VmEvalChunk(
ph7_vm *pVm, /* Underlying Virtual Machine */ ph7_vm *pVm, /* Underlying Virtual Machine */
ph7_context *pCtx, /* Call Context */ ph7_context *pCtx, /* Call Context */
SyString *pChunk, /* PHP chunk to evaluate */ SyString *pChunk, /* PHP chunk to evaluate */
int iFlags, /* Compile flag */ int iFlags /* Compile flag */
int bTrueReturn /* TRUE to return execution result */
) { ) {
SySet *pByteCode, aByteCode; SySet *pByteCode, aByteCode;
ProcConsumer xErr = 0; ProcConsumer xErr = 0;
@ -10430,12 +10429,9 @@ static sxi32 VmEvalChunk(
/* Initialize bytecode container */ /* Initialize bytecode container */
SySetInit(&aByteCode, &pVm->sAllocator, sizeof(VmInstr)); SySetInit(&aByteCode, &pVm->sAllocator, sizeof(VmInstr));
SySetAlloc(&aByteCode, 0x20); SySetAlloc(&aByteCode, 0x20);
/* Reset the code generator */ /* Log compile-time errors */
if(bTrueReturn) { xErr = pVm->pEngine->xConf.xErr;
/* Log compile-time errors */ pErrData = pVm->pEngine->xConf.pErrData;
xErr = pVm->pEngine->xConf.xErr;
pErrData = pVm->pEngine->xConf.pErrData;
}
PH7_ResetCodeGenerator(pVm, xErr, pErrData); PH7_ResetCodeGenerator(pVm, xErr, pErrData);
/* Swap bytecode container */ /* Swap bytecode container */
pByteCode = pVm->pByteContainer; pByteCode = pVm->pByteContainer;
@ -10467,13 +10463,8 @@ static sxi32 VmEvalChunk(
} }
goto Cleanup; goto Cleanup;
} }
if(bTrueReturn) { /* Assume a boolean true return value */
/* Assume a boolean true return value */ PH7_MemObjInitFromBool(pVm, &sResult, 1);
PH7_MemObjInitFromBool(pVm, &sResult, 1);
} else {
/* Assume a null return value */
PH7_MemObjInit(pVm, &sResult);
}
/* Execute the compiled chunk */ /* Execute the compiled chunk */
VmLocalExec(pVm, &aByteCode, &sResult); VmLocalExec(pVm, &aByteCode, &sResult);
if(pCtx) { if(pCtx) {
@ -10513,7 +10504,7 @@ static int vm_builtin_eval(ph7_context *pCtx, int nArg, ph7_value **apArg) {
return SXRET_OK; return SXRET_OK;
} }
/* Eval the chunk */ /* Eval the chunk */
VmEvalChunk(pCtx->pVm, &(*pCtx), &sChunk, PH7_AERSCRIPT_CODE, TRUE); VmEvalChunk(pCtx->pVm, &(*pCtx), &sChunk, PH7_AERSCRIPT_CODE);
return SXRET_OK; return SXRET_OK;
} }
/* /*
@ -10636,7 +10627,7 @@ static sxi32 VmExecIncludedFile(
SyString sScript; SyString sScript;
/* Compile and execute the script */ /* Compile and execute the script */
SyStringInitFromBuf(&sScript, SyBlobData(&sContents), SyBlobLength(&sContents)); SyStringInitFromBuf(&sScript, SyBlobData(&sContents), SyBlobLength(&sContents));
VmEvalChunk(pCtx->pVm, &(*pCtx), &sScript, PH7_AERSCRIPT_CODE, TRUE); VmEvalChunk(pCtx->pVm, &(*pCtx), &sScript, PH7_AERSCRIPT_CODE);
} }
} }
/* Pop from the set of included file */ /* Pop from the set of included file */