aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Pall <mike>2018-06-05 12:23:56 +0200
committerMike Pall <mike>2018-06-05 12:23:56 +0200
commita5a89ab586a3b5bb4f266949bbf3dc2b140e2374 (patch)
tree6743ee80ead7f7a78d1caf9df45921f549c1250e /src
parent55f70823242aa4e6acc248bde5cf8194ba1b27e3 (diff)
downloadluajit-a5a89ab586a3b5bb4f266949bbf3dc2b140e2374.tar.gz
luajit-a5a89ab586a3b5bb4f266949bbf3dc2b140e2374.tar.bz2
luajit-a5a89ab586a3b5bb4f266949bbf3dc2b140e2374.zip
From Lua 5.3: assert() accepts any type of error object.
Diffstat (limited to 'src')
-rw-r--r--src/lib_base.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib_base.c b/src/lib_base.c
index d61e8762..1cd83058 100644
--- a/src/lib_base.c
+++ b/src/lib_base.c
@@ -42,13 +42,13 @@
42 42
43LJLIB_ASM(assert) LJLIB_REC(.) 43LJLIB_ASM(assert) LJLIB_REC(.)
44{ 44{
45 GCstr *s;
46 lj_lib_checkany(L, 1); 45 lj_lib_checkany(L, 1);
47 s = lj_lib_optstr(L, 2); 46 if (L->top == L->base+1)
48 if (s)
49 lj_err_callermsg(L, strdata(s));
50 else
51 lj_err_caller(L, LJ_ERR_ASSERT); 47 lj_err_caller(L, LJ_ERR_ASSERT);
48 else if (tvisstr(L->base+1) || tvisnumber(L->base+1))
49 lj_err_callermsg(L, strdata(lj_lib_checkstr(L, 2)));
50 else
51 lj_err_run(L);
52 return FFH_UNREACHABLE; 52 return FFH_UNREACHABLE;
53} 53}
54 54