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

Rename PH7_VmGenericError() to PH7_VmThrowError()
All checks were successful
The build was successful.
Details

Browse Source
This commit is contained in:
Rafal Kupiec
2018-09-04 08:54:48 +02:00
parent 758ace0d1a
commit d793d3ed70
9 changed files with 252 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/json/json.c
View File

@@ -706,7 +706,7 @@ static sxi32 VmJsonDecode(
pDecoder->pIn++;
/* Return the object as an associative array */
if((pDecoder->iFlags & JSON_DECODE_ASSOC) == 0) {
PH7_VmGenericError(pDecoder->pCtx->pVm, PH7_CTX_WARNING,
PH7_VmThrowError(pDecoder->pCtx->pVm, PH7_CTX_WARNING,
"JSON Objects are always returned as an associative array"
);
}

4
modules/xml/xml.c
View File

@@ -877,7 +877,7 @@ static int vm_builtin_xml_set_object(ph7_context *pCtx, int nArg, ph7_value **ap
return PH7_OK;
}
/* Throw a notice and return */
PH7_VmGenericError(pCtx->pVm, PH7_CTX_DEPRECATED, "This function is deprecated and is a no-op."
PH7_VmThrowError(pCtx->pVm, PH7_CTX_DEPRECATED, "This function is deprecated and is a no-op."
"In order to mimic this behaviour,you can supply instead of a function name an array "
"containing an object reference and a method name."
);
@@ -1295,7 +1295,7 @@ static int vm_builtin_xml_parse(ph7_context *pCtx, int nArg, ph7_value **apArg)
/* This can happen when the user callback call xml_parse() again
* in it's body which is forbidden.
*/
PH7_VmGenericError(pCtx->pVm, PH7_CTX_WARNING,
PH7_VmThrowError(pCtx->pVm, PH7_CTX_WARNING,
"Recursive call to %s, PH7 is returning false",
ph7_function_name(pCtx)
);