[Tarantool-patches] [PATCH luajit] From Lua 5.3: assert() accepts any type of error object.
Sergey Kaplun
skaplun at tarantool.org
Fri Jul 15 12:17:54 MSK 2022
Hi, Sergos!
Thanks for the review!
On 14.07.22, sergos wrote:
> Hi!
>
> Thanks for the patch!
>
> Minor updates, LGTM.
>
> Sergos
>
> > On 13 Jul 2022, at 09:41, Sergey Kaplun <skaplun at tarantool.org> wrote:
> >
> > From: Mike Pall <mike>
> >
> > (cherry picked from commit a5a89ab586a3b5bb4f266949bbf3dc2b140e2374)
> >
> > This patch removes type restrictions for the second optional argument in
> ^
> all?
>
> > `assert()` function. It allows to use different error objects in
> ^^^^^^^^
> various
>
> > `assert()` and catches them via `pcall()`.
> ^^^^^^^^
> to catch
Update commit message to the following:
===================================================================
>From Lua 5.3: assert() accepts any type of error object.
(cherry picked from commit a5a89ab586a3b5bb4f266949bbf3dc2b140e2374)
This patch removes all type restrictions for the second optional
argument in `assert()` function. It allows to use various error objects
in `assert()` and catch them via `pcall()` or `xpcall()`.
Sergey Kaplun:
* added the description and the test for the problem
Part of tarantool/tarantool#7230
===================================================================
Branch is force-pushed.
>
> >
> > 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
<snipped>
> > 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
<snipped>
> > 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')
>
> Shall we add an xpcall case also?
> tarantool> xpcall(assert, function(s) print('Handled:', s) end, false, {'catch me!'})
> Handled: table: 0x01022dc810
> ---
> - false
> - null
> ...
>
I've added the following `xpcall()` case:
===================================================================
diff --git a/test/tarantool-tests/lj-418-assert-any-type.test.lua b/test/tarantool-tests/lj-418-assert-any-type.test.lua
index 37b88574..dba60b61 100644
--- a/test/tarantool-tests/lj-418-assert-any-type.test.lua
+++ b/test/tarantool-tests/lj-418-assert-any-type.test.lua
@@ -2,7 +2,7 @@ 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)
+test:plan(2)
local retv = {}
@@ -11,4 +11,8 @@ assert(not st, 'pcall fails')
test:ok(obj == retv, 'assert function take non-string argument')
+st = xpcall(assert, function(obj)
+ test:ok(obj == retv, 'xpcall error handler function get non-string argument')
+end, false, retv)
+
os.exit(test:check() and 0 or 1)
===================================================================
> > +
> > +os.exit(test:check() and 0 or 1)
> > --
> > 2.34.1
> >
>
--
Best regards,
Sergey Kaplun
More information about the Tarantool-patches
mailing list