From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Sergey Ostanevich <sergos@tarantool.org>, Igor Munkin <imun@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH luajit] From Lua 5.3: assert() accepts any type of error object. Date: Wed, 13 Jul 2022 09:41:49 +0300 [thread overview] Message-ID: <20220713064149.523-1-skaplun@tarantool.org> (raw) From: Mike Pall <mike> (cherry picked from commit a5a89ab586a3b5bb4f266949bbf3dc2b140e2374) This patch removes type restrictions for the second optional argument in `assert()` function. It allows to use different error objects in `assert()` and catches them via `pcall()`. Sergey Kaplun: * added the description and the test for the problem Part of tarantool/tarantool#7230 --- Branch: https://github.com/tarantool/luajit/tree/skaplun/lj-418-assert-any-type-full-ci Issue: https://github.com/LuaJIT/LuaJIT/issues/418 doc/extensions.html | 1 + src/lib_base.c | 10 +++++----- .../lj-418-assert-any-type.test.lua | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 test/tarantool-tests/lj-418-assert-any-type.test.lua diff --git a/doc/extensions.html b/doc/extensions.html index d7cc9693..e0f136e2 100644 --- a/doc/extensions.html +++ b/doc/extensions.html @@ -374,6 +374,7 @@ LuaJIT supports some extensions from Lua 5.3: <li>Unicode escape <tt>'\u{XX...}'</tt> embeds the UTF-8 encoding in string literals.</li> <li>The argument table <tt>arg</tt> can be read (and modified) by <tt>LUA_INIT</tt> and <tt>-e</tt> chunks.</li> <li><tt>io.read()</tt> and <tt>file:read()</tt> accept formats with or without a leading <tt>*</tt>.</li> +<li><tt>assert()</tt> accepts any type of error object.</li> <li><tt>table.move(a1, f, e, t [,a2])</tt>.</li> <li><tt>coroutine.isyieldable()</tt>.</li> <li>Lua/C API extensions: diff --git a/src/lib_base.c b/src/lib_base.c index 613a1859..83c7663c 100644 --- a/src/lib_base.c +++ b/src/lib_base.c @@ -42,13 +42,13 @@ LJLIB_ASM(assert) LJLIB_REC(.) { - GCstr *s; lj_lib_checkany(L, 1); - s = lj_lib_optstr(L, 2); - if (s) - lj_err_callermsg(L, strdata(s)); - else + if (L->top == L->base+1) lj_err_caller(L, LJ_ERR_ASSERT); + else if (tvisstr(L->base+1) || tvisnumber(L->base+1)) + lj_err_callermsg(L, strdata(lj_lib_checkstr(L, 2))); + else + lj_err_run(L); return FFH_UNREACHABLE; } diff --git a/test/tarantool-tests/lj-418-assert-any-type.test.lua b/test/tarantool-tests/lj-418-assert-any-type.test.lua new file mode 100644 index 00000000..37b88574 --- /dev/null +++ b/test/tarantool-tests/lj-418-assert-any-type.test.lua @@ -0,0 +1,14 @@ +local tap = require('tap') + +-- See also https://github.com/LuaJIT/LuaJIT/issues/418. +local test = tap.test('lj-418-asset-any-type') +test:plan(1) + +local retv = {} + +local st, obj = pcall(assert, false, retv) +assert(not st, 'pcall fails') + +test:ok(obj == retv, 'assert function take non-string argument') + +os.exit(test:check() and 0 or 1) -- 2.34.1
next reply other threads:[~2022-07-13 6:44 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-13 6:41 Sergey Kaplun via Tarantool-patches [this message] 2022-07-14 11:33 ` sergos via Tarantool-patches 2022-07-15 9:17 ` Sergey Kaplun via Tarantool-patches 2022-09-14 18:59 ` Igor Munkin via Tarantool-patches 2022-09-14 19:01 ` Igor Munkin via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220713064149.523-1-skaplun@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=imun@tarantool.org \ --cc=sergos@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit] From Lua 5.3: assert() accepts any type of error object.' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox