Tarantool development patches archive
 help / color / mirror / Atom feed
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: Re: [Tarantool-patches] [PATCH v2 luajit 20/30] test: adapt PUC Lua test for args in vararg func
Date: Fri, 26 Mar 2021 17:54:11 +0300	[thread overview]
Message-ID: <YF31k64gn/rlRcM9@root> (raw)
In-Reply-To: <422eaeb77d4cb957338af0bdc0151ae7787e1567.1616743343.git.skaplun@tarantool.org>


I've changed s/first/local/ in the commit message and the comment,
considering comment by Sergos for the previous patch.

===================================================================
test: adapt PUC Lua test for args in vararg func

Lua 5.1 interprets ... in the vararg functions like additional local
argument, unlike LuaJIT does. All extra arguments is set into `arg`
variable.

Implicit `arg` parameter for old-style vararg functions was finally
removed in Lua 5.2. This patch adjust tests in vararg.lua considering
Lua 5.2 test suite taken from
https://www.lua.org/tests/lua-5.2.0-tests.tar.gz.

Closes tarantool/tarantool#5712
Part of tarantool/tarantool#5845
Part of tarantool/tarantool#4473
===================================================================

===================================================================
diff --git a/test/PUC-Lua-5.1-tests/vararg.lua b/test/PUC-Lua-5.1-tests/vararg.lua
index efb76c5..4d6ec6d 100644
--- a/test/PUC-Lua-5.1-tests/vararg.lua
+++ b/test/PUC-Lua-5.1-tests/vararg.lua
@@ -3,7 +3,7 @@ print('testing vararg')
 _G.arg = nil
 
 -- Lua 5.1 interprets ... in the vararg functions like additional
--- first argument, unlike LuaJIT does. All extra arguments is set
+-- local argument, unlike LuaJIT does. All extra arguments is set
 -- into `arg` variable. This extension is from Lua 5.2.
 -- See also https://github.com/tarantool/tarantool/issues/5712.
 -- LuaJIT: Test is adapted from PUC-Rio Lua 5.2 test suite.
===================================================================


On 26.03.21, Sergey Kaplun wrote:
> Lua 5.1 interprets ... in the vararg functions like additional first
> argument, unlike LuaJIT does. All extra arguments is set into `arg`
> variable.
> 
> Implicit `arg` parameter for old-style vararg functions was finally
> removed in Lua 5.2. This patch adjust tests in vararg.lua considering
> Lua 5.2 test suite taken from
> https://www.lua.org/tests/lua-5.2.0-tests.tar.gz.
> 
> Closes tarantool/tarantool#5712
> Part of tarantool/tarantool#5845
> Part of tarantool/tarantool#4473
> ---
>  test/PUC-Lua-5.1-tests/vararg.lua | 16 ++++++++++++----
>  1 file changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/test/PUC-Lua-5.1-tests/vararg.lua b/test/PUC-Lua-5.1-tests/vararg.lua
> index ae068fa..efb76c5 100644
> --- a/test/PUC-Lua-5.1-tests/vararg.lua
> +++ b/test/PUC-Lua-5.1-tests/vararg.lua
> @@ -2,9 +2,13 @@ print('testing vararg')
>  
>  _G.arg = nil
>  
> +-- Lua 5.1 interprets ... in the vararg functions like additional
> +-- first argument, unlike LuaJIT does. All extra arguments is set
> +-- into `arg` variable. This extension is from Lua 5.2.
> +-- See also https://github.com/tarantool/tarantool/issues/5712.
> +-- LuaJIT: Test is adapted from PUC-Rio Lua 5.2 test suite.
>  function f(a, ...)
> -  assert(type(arg) == 'table')
> -  assert(type(arg.n) == 'number')
> +  local arg = {n = select('#', ...), ...}
>    for i=1,arg.n do assert(a[i]==arg[i]) end
>    return arg.n
>  end
> @@ -17,7 +21,9 @@ function c12 (...)
>    return res, 2
>  end
>  
> -function vararg (...) return arg end
> +-- LuaJIT: Test chunk is adapted from PUC-Rio Lua 5.2 test suite.
> +-- See the comment above.
> +function vararg (...) return {n = select('#', ...), ...} end
>  
>  local call = function (f, args) return f(unpack(args, 1, args.n)) end
>  
> @@ -42,7 +48,9 @@ a = call(print, {'+'})
>  assert(a == nil)
>  
>  local t = {1, 10}
> -function t:f (...) return self[arg[1]]+arg.n end
> +-- LuaJIT: Test chunk is adapted from PUC-Rio Lua 5.2 test suite.
> +-- See the comment above.
> +function t:f (...) local arg = {...}; return self[...]+#arg end
>  assert(t:f(1,4) == 3 and t:f(2) == 11)
>  print('+')
>  
> -- 
> 2.31.0
> 

-- 
Best regards,
Sergey Kaplun

  reply	other threads:[~2021-03-26 14:55 UTC|newest]

Thread overview: 153+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-26  7:42 [Tarantool-patches] [PATCH v2 luajit 00/30] Adapt PUC-Rio Lua 5.1 test suite Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 01/30] test: add " Sergey Kaplun via Tarantool-patches
2021-03-26 10:14   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:13   ` Igor Munkin via Tarantool-patches
2021-04-01  8:11     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 02/30] test: add compiling for C libs from PUC-Rio-Lua5.1 Sergey Kaplun via Tarantool-patches
2021-03-26 11:01   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:14   ` Igor Munkin via Tarantool-patches
2021-04-01  8:21     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 03/30] test: adapt Lua 5.1 suite for out-of-source build Sergey Kaplun via Tarantool-patches
2021-03-26 11:07   ` Sergey Ostanevich via Tarantool-patches
2021-03-26 14:25     ` Sergey Kaplun via Tarantool-patches
2021-03-31 22:58       ` Igor Munkin via Tarantool-patches
2021-04-01  8:43         ` Sergey Kaplun via Tarantool-patches
2021-03-31 22:58   ` Igor Munkin via Tarantool-patches
2021-04-01  8:40     ` Sergey Kaplun via Tarantool-patches
2021-04-06 16:56       ` Igor Munkin via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 04/30] test: remove quotes in progname from <main.lua> Sergey Kaplun via Tarantool-patches
2021-03-26 11:12   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 22:58   ` Igor Munkin via Tarantool-patches
2021-04-01  8:50     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 05/30] test: adapt arg availability test from Lua suite Sergey Kaplun via Tarantool-patches
2021-03-26 11:22   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 22:58   ` Igor Munkin via Tarantool-patches
2021-04-01  9:37     ` Sergey Kaplun via Tarantool-patches
2021-04-06 15:24       ` Igor Munkin via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 06/30] test: disable PUC Lua tests confused by -v output Sergey Kaplun via Tarantool-patches
2021-03-26 11:26   ` Sergey Ostanevich via Tarantool-patches
2021-03-26 14:31     ` Sergey Kaplun via Tarantool-patches
2021-03-31 22:58   ` Igor Munkin via Tarantool-patches
2021-04-01  9:56     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 07/30] test: disable Lua tests for bytecode with header Sergey Kaplun via Tarantool-patches
2021-03-26 11:30   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 22:59   ` Igor Munkin via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 08/30] test: disable JIT for GC step counting tests Sergey Kaplun via Tarantool-patches
2021-03-26 11:32   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:14   ` Igor Munkin via Tarantool-patches
2021-04-01 10:10     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 09/30] test: disable Lua suite tests for line hook Sergey Kaplun via Tarantool-patches
2021-03-26 11:35   ` Sergey Ostanevich via Tarantool-patches
2021-03-26 14:33     ` Sergey Kaplun via Tarantool-patches
2021-03-31 22:59   ` Igor Munkin via Tarantool-patches
2021-04-01 10:06     ` Sergey Kaplun via Tarantool-patches
2021-04-06 19:45       ` Igor Munkin via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 10/30] test: adapt test for debug.setlocal in Lua suite Sergey Kaplun via Tarantool-patches
2021-03-26 11:44   ` Sergey Ostanevich via Tarantool-patches
2021-03-26 14:45     ` Sergey Kaplun via Tarantool-patches
2021-03-30 22:14   ` Igor Munkin via Tarantool-patches
2021-04-01 10:16     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 11/30] test: adapt getlocal PUC test for vararg func Sergey Kaplun via Tarantool-patches
2021-03-26 11:47   ` Sergey Ostanevich via Tarantool-patches
2021-03-26 14:52     ` Sergey Kaplun via Tarantool-patches
2021-03-30 22:15   ` Igor Munkin via Tarantool-patches
2021-04-01 11:37     ` Sergey Kaplun via Tarantool-patches
2021-04-06 20:09       ` Igor Munkin via Tarantool-patches
2021-04-06 20:40         ` Igor Munkin via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 12/30] test: adapt PUC Lua test with count hooks Sergey Kaplun via Tarantool-patches
2021-03-26 11:49   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:15   ` Igor Munkin via Tarantool-patches
2021-04-01 11:42     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 13/30] test: disable PUC Lua test for tail call info Sergey Kaplun via Tarantool-patches
2021-03-26 14:43   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:15   ` Igor Munkin via Tarantool-patches
2021-04-01 11:52     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 14/30] test: adapt activeline check in the PUC Lua test Sergey Kaplun via Tarantool-patches
2021-03-26 14:50   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:15   ` Igor Munkin via Tarantool-patches
2021-04-01 11:58     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 15/30] test: disable PUC-Lua test for per-coroutine hooks Sergey Kaplun via Tarantool-patches
2021-03-26 14:54   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:16   ` Igor Munkin via Tarantool-patches
2021-04-01 12:03     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:42 ` [Tarantool-patches] [PATCH v2 luajit 16/30] test: adapt PUC Lua test for %q in fmt for LuaJIT Sergey Kaplun via Tarantool-patches
2021-03-26 14:56   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:16   ` Igor Munkin via Tarantool-patches
2021-04-01 12:33     ` Sergey Kaplun via Tarantool-patches
2021-04-06 21:37       ` Igor Munkin via Tarantool-patches
2021-04-07 15:50         ` Sergey Kaplun via Tarantool-patches
2021-04-07 16:31           ` Igor Munkin via Tarantool-patches
2021-04-08  8:51             ` Sergey Kaplun via Tarantool-patches
2021-04-12 10:26               ` Igor Munkin via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 17/30] test: disable locale-depended tests for Lua suite Sergey Kaplun via Tarantool-patches
2021-03-26 14:58   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:16   ` Igor Munkin via Tarantool-patches
2021-04-01 19:12     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 18/30] test: replace math.mod to math.fmod for Lua tests Sergey Kaplun via Tarantool-patches
2021-03-26 15:12   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:17     ` Igor Munkin via Tarantool-patches
2021-03-26 15:16   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:16   ` Igor Munkin via Tarantool-patches
2021-04-01 19:36     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 19/30] test: remove assert for string.gfind check Sergey Kaplun via Tarantool-patches
2021-03-26 15:14   ` Sergey Ostanevich via Tarantool-patches
2021-03-30 22:17   ` Igor Munkin via Tarantool-patches
2021-04-02  7:05     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 20/30] test: adapt PUC Lua test for args in vararg func Sergey Kaplun via Tarantool-patches
2021-03-26 14:54   ` Sergey Kaplun via Tarantool-patches [this message]
2021-03-26 15:22     ` Sergey Ostanevich via Tarantool-patches
2021-03-31  9:51   ` Igor Munkin via Tarantool-patches
2021-04-02  7:21     ` Sergey Kaplun via Tarantool-patches
2021-04-06 20:45       ` Igor Munkin via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 21/30] test: disable test for getfenv in closure tailcall Sergey Kaplun via Tarantool-patches
2021-03-26 15:41   ` Sergey Ostanevich via Tarantool-patches
2021-03-31  9:51   ` Igor Munkin via Tarantool-patches
2021-04-02  7:40     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 22/30] test: disable PUC Lua test for var names in error Sergey Kaplun via Tarantool-patches
2021-03-26 15:44   ` Sergey Ostanevich via Tarantool-patches
2021-03-26 16:01     ` Sergey Kaplun via Tarantool-patches
2021-03-31 19:23   ` Igor Munkin via Tarantool-patches
2021-04-02  7:48     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 23/30] test: disable PUC Lua test for fast function name Sergey Kaplun via Tarantool-patches
2021-03-26 15:45   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 19:23   ` Igor Munkin via Tarantool-patches
2021-04-02  8:14     ` Sergey Kaplun via Tarantool-patches
2021-04-06 21:37       ` Igor Munkin via Tarantool-patches
2021-04-07 16:06         ` Sergey Kaplun via Tarantool-patches
2021-04-07 16:11           ` Igor Munkin via Tarantool-patches
2021-04-07 19:57             ` Sergey Kaplun via Tarantool-patches
2021-04-12  9:36               ` Igor Munkin via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 24/30] test: disable PUC Lua test for non-asci identifier Sergey Kaplun via Tarantool-patches
2021-03-26 15:46   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 19:23   ` Igor Munkin via Tarantool-patches
2021-04-02  8:20     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 25/30] test: disable PUC Lua error test for syntax level Sergey Kaplun via Tarantool-patches
2021-03-26 15:52   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 19:24   ` Igor Munkin via Tarantool-patches
2021-04-02  8:30     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 26/30] test: disable tests with multiple -l options Sergey Kaplun via Tarantool-patches
2021-03-26 15:56   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 19:24   ` Igor Munkin via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 27/30] test: disable PUC Lua test for checking arg layout Sergey Kaplun via Tarantool-patches
2021-03-26 15:58   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 19:24   ` Igor Munkin via Tarantool-patches
2021-04-02  8:35     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 28/30] test: disable PUC Lua test checking -h option Sergey Kaplun via Tarantool-patches
2021-03-26 15:58   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 19:24   ` Igor Munkin via Tarantool-patches
2021-04-02  8:39     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 29/30] test: disable PUC Lua hanging GC test Sergey Kaplun via Tarantool-patches
2021-03-26 16:03   ` Sergey Ostanevich via Tarantool-patches
2021-03-31 19:24     ` Igor Munkin via Tarantool-patches
2021-03-31 19:24   ` Igor Munkin via Tarantool-patches
2021-04-02  8:45     ` Sergey Kaplun via Tarantool-patches
2021-03-26  7:43 ` [Tarantool-patches] [PATCH v2 luajit 30/30] test: disable too depth recursive PUC Lua test Sergey Kaplun via Tarantool-patches
2021-03-26 16:28   ` Sergey Ostanevich via Tarantool-patches
2021-03-26 16:45     ` Sergey Kaplun via Tarantool-patches
2021-03-31 19:24   ` Igor Munkin via Tarantool-patches
2021-04-02  8:47     ` Sergey Kaplun via Tarantool-patches
2021-03-26 11:09 ` [Tarantool-patches] [PATCH v2 luajit 00/30] Adapt PUC-Rio Lua 5.1 test suite Sergey Ostanevich via Tarantool-patches
2021-03-26 14:12   ` Sergey Kaplun via Tarantool-patches
2021-03-30 22:17 ` Igor Munkin via Tarantool-patches
2021-03-31  9:41   ` Sergey Kaplun via Tarantool-patches
2021-03-31 10:49     ` 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=YF31k64gn/rlRcM9@root \
    --to=tarantool-patches@dev.tarantool.org \
    --cc=imun@tarantool.org \
    --cc=sergos@tarantool.org \
    --cc=skaplun@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v2 luajit 20/30] test: adapt PUC Lua test for args in vararg func' \
    /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