HeeroYui-deprecated/rabbit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #121 from VasiliyRyabtsev/feature/assert-message

Browse Source 
Add optional message text parameter for assert()
This commit is contained in:
Alberto Demichelis 2017-12-01 14:54:37 +08:00 committed by GitHub
commit 0be2bebef0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/reference/language/builtin_functions.rst
View File

@ -53,9 +53,9 @@ returns the const table of the VM.
sets the const table of the VM; returns the previous const table. sets the const table of the VM; returns the previous const table.
.. js:function:: assert(exp) .. js:function:: assert(exp, [message])
throws an exception if exp is null throws an exception if exp is null or false. Throws "assertion failed" string by default, or message if specified.
.. js:function:: print(x) .. js:function:: print(x)

11
squirrel/sqbaselib.cpp
View File

@ -156,7 +156,14 @@ static SQInteger base_getstackinfos(HSQUIRRELVM v)
static SQInteger base_assert(HSQUIRRELVM v) static SQInteger base_assert(HSQUIRRELVM v)
{ {
if(SQVM::IsFalse(stack_get(v,2))){ if(SQVM::IsFalse(stack_get(v,2))){
return sq_throwerror(v,_SC("assertion failed")); SQInteger top = sq_gettop(v);
if (top>2 && SQ_SUCCEEDED(sq_tostring(v,3))) {
const SQChar *str = 0;
if (SQ_SUCCEEDED(sq_getstring(v,-1,&str))) {
return sq_throwerror(v, str);
}
}
return sq_throwerror(v, _SC("assertion failed"));
} }
return 0; return 0;
} }
@ -283,7 +290,7 @@ static const SQRegFunction base_funcs[]={
{_SC("setroottable"),base_setroottable,2, NULL}, {_SC("setroottable"),base_setroottable,2, NULL},
{_SC("getconsttable"),base_getconsttable,1, NULL}, {_SC("getconsttable"),base_getconsttable,1, NULL},
{_SC("setconsttable"),base_setconsttable,2, NULL}, {_SC("setconsttable"),base_setconsttable,2, NULL},
{_SC("assert"),base_assert,2, NULL}, {_SC("assert"),base_assert,-2, NULL},
{_SC("print"),base_print,2, NULL}, {_SC("print"),base_print,2, NULL},
{_SC("error"),base_error,2, NULL}, {_SC("error"),base_error,2, NULL},
{_SC("compilestring"),base_compilestring,-2, _SC(".ss")}, {_SC("compilestring"),base_compilestring,-2, _SC(".ss")},