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

Make reported errors more PHP-like

Browse Source
This commit is contained in:
Rafal Kupiec 2018-07-23 15:20:46 +02:00
parent 0d2238ac8c
commit 17c486d599
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engine/vm.c
View File

@ -2240,11 +2240,6 @@ static sxi32 VmThrowErrorAp(
SyBlobReset(pWorker); SyBlobReset(pWorker);
/* Peek the processed file if available */ /* Peek the processed file if available */
pFile = (SyString *)SySetPeek(&pVm->aFiles); pFile = (SyString *)SySetPeek(&pVm->aFiles);
if(pFile) {
/* Append file name */
SyBlobAppend(pWorker, pFile->zString, pFile->nByte);
SyBlobAppend(pWorker, (const void *)" ", sizeof(char));
}
switch(iErr) { switch(iErr) {
case PH7_CTX_WARNING: case PH7_CTX_WARNING:
zErr = "Warning: "; zErr = "Warning: ";
@ -2258,12 +2253,12 @@ static sxi32 VmThrowErrorAp(
break; break;
} }
SyBlobAppend(pWorker, zErr, SyStrlen(zErr)); SyBlobAppend(pWorker, zErr, SyStrlen(zErr));
if(pFuncName) {
/* Append function name first */
SyBlobAppend(pWorker, pFuncName->zString, pFuncName->nByte);
SyBlobAppend(pWorker, "(): ", sizeof("(): ") - 1);
}
SyBlobFormatAp(pWorker, zFormat, ap); SyBlobFormatAp(pWorker, zFormat, ap);
if(pFile) {
/* Append file name */
SyBlobAppend(pWorker, " in ", sizeof(" in ") - 1);
SyBlobAppend(pWorker, pFile->zString, pFile->nByte);
}
/* Consume the error message */ /* Consume the error message */
rc = VmCallErrorHandler(&(*pVm), pWorker); rc = VmCallErrorHandler(&(*pVm), pWorker);
if(iErr == PH7_CTX_ERR) { if(iErr == PH7_CTX_ERR) {