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

Rework including mechanism (#58) related changes:
All checks were successful
The build was successful.
Details

Browse Source 
* VmExecIncludedFile() does not need a call context
 * Builtin include() function does not need to return false, it throws an error
This commit is contained in:
Rafal Kupiec
2019-12-09 19:30:28 +01:00
parent f3156bcbd5
commit cb91a4bbf4
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
engine/vm.c
View File

@@ -9040,7 +9040,7 @@ PH7_PRIVATE sxi32 PH7_VmPushFilePath(ph7_vm *pVm, const char *zPath, int nLen, s
* constructs for more information. * constructs for more information.
*/ */
static sxi32 VmExecIncludedFile( static sxi32 VmExecIncludedFile(
ph7_context *pCtx, /* Call Context */ ph7_vm *pVm, /* Underlying Virtual Machine */
SyString *pPath, /* Script path or URL*/ SyString *pPath, /* Script path or URL*/
int iFlags /* Code evaluation flag */ int iFlags /* Code evaluation flag */
) { ) {
@@ -9048,10 +9048,8 @@ static sxi32 VmExecIncludedFile(
const ph7_io_stream *pStream; const ph7_io_stream *pStream;
SyBlob sContents; SyBlob sContents;
void *pHandle; void *pHandle;
ph7_vm *pVm;
int isNew; int isNew;
/* Initialize fields */ /* Initialize fields */
pVm = pCtx->pVm;
SyBlobInit(&sContents, &pVm->sAllocator); SyBlobInit(&sContents, &pVm->sAllocator);
isNew = 0; isNew = 0;
/* Extract the associated stream */ /* Extract the associated stream */
@@ -9076,7 +9074,7 @@ static sxi32 VmExecIncludedFile(
/* Compile and execute the script */ /* Compile and execute the script */
SyStringInitFromBuf(&sScript, SyBlobData(&sContents), SyBlobLength(&sContents)); SyStringInitFromBuf(&sScript, SyBlobData(&sContents), SyBlobLength(&sContents));
pVm->nMagic = PH7_VM_INCL; pVm->nMagic = PH7_VM_INCL;
VmEvalChunk(pCtx->pVm, &(*pCtx), &sScript, iFlags); VmEvalChunk(pVm, 0, &sScript, iFlags);
pVm->nMagic = PH7_VM_EXEC; pVm->nMagic = PH7_VM_EXEC;
} }
} }
@@ -9256,12 +9254,11 @@ static int vm_builtin_include(ph7_context *pCtx, int nArg, ph7_value **apArg) {
ph7_result_null(pCtx); ph7_result_null(pCtx);
return SXRET_OK; return SXRET_OK;
} }
/* Open,compile and execute the desired script */ /* Open, compile and execute the desired script */
rc = VmExecIncludedFile(&(*pCtx), &sFile, PH7_AERSCRIPT_CHNK | PH7_AERSCRIPT_FILE); rc = VmExecIncludedFile(&(*pCtx->pVm), &sFile, PH7_AERSCRIPT_CHNK | PH7_AERSCRIPT_FILE);
if(rc != SXRET_OK) { if(rc != SXRET_OK) {
/* Emit a warning and return false */ /* Fatal, abort VM execution immediately */
PH7_VmThrowError(pCtx->pVm, PH7_CTX_ERR, "IO error while including file: '%z'", &sFile); PH7_VmThrowError(pCtx->pVm, PH7_CTX_ERR, "IO error while including file: '%z'", &sFile);
ph7_result_bool(pCtx, 0);
} }
return SXRET_OK; return SXRET_OK;
} }
@@ -9287,14 +9284,14 @@ static int vm_builtin_require(ph7_context *pCtx, int nArg, ph7_value **apArg) {
return SXRET_OK; return SXRET_OK;
} }
/* Open,compile and execute the desired script */ /* Open,compile and execute the desired script */
rc = VmExecIncludedFile(&(*pCtx), &sFile, PH7_AERSCRIPT_CODE | PH7_AERSCRIPT_FILE); rc = VmExecIncludedFile(&(*pCtx->pVm), &sFile, PH7_AERSCRIPT_CODE | PH7_AERSCRIPT_FILE);
if(rc == SXERR_EXISTS) { if(rc == SXERR_EXISTS) {
/* File already included, return TRUE */ /* File already included, return TRUE */
ph7_result_bool(pCtx, 1); ph7_result_bool(pCtx, 1);
return SXRET_OK; return SXRET_OK;
} }
if(rc != SXRET_OK) { if(rc != SXRET_OK) {
/* Fatal,abort VM execution immediately */ /* Fatal, abort VM execution immediately */
PH7_VmThrowError(pCtx->pVm, PH7_CTX_ERR, "IO error while including file: '%z'", &sFile); PH7_VmThrowError(pCtx->pVm, PH7_CTX_ERR, "IO error while including file: '%z'", &sFile);
} }
return SXRET_OK; return SXRET_OK;