From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <tarantool-patches-bounces@dev.tarantool.org>
Received: from [87.239.111.99] (localhost [127.0.0.1])
by dev.tarantool.org (Postfix) with ESMTP id 7B3FEC74DEC;
Wed, 21 Aug 2024 12:11:31 +0300 (MSK)
DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7B3FEC74DEC
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev;
t=1724231491; bh=TZcLdb8L925kwfvaJ3Kwf1mwtK7NHk01aSn9XiOeL2U=;
h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:
List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:
From;
b=bkEYE1eDQLuS8Af60+izcFpz8fQfesbiMjbGfQnGFGtS7D1b4oSTKJSgjrKAdv/fO
LaU1aApV+0RQzUbJQP3Tmjt7qPlm0m3HpWwjYfYoe3mqCA9donnMciUF4PefvQmGpo
e37mCQTZoUd3tDxSJyRsS5SC1n1nmRgKdz59hRBA=
Received: from smtp35.i.mail.ru (smtp35.i.mail.ru [95.163.41.76])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by dev.tarantool.org (Postfix) with ESMTPS id 36C6DC6199D
for <tarantool-patches@dev.tarantool.org>;
Wed, 21 Aug 2024 11:59:46 +0300 (MSK)
DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 36C6DC6199D
Received: by smtp35.i.mail.ru with esmtpa (envelope-from
<skaplun@tarantool.org>)
id 1sghBw-00000005aRz-4Bjm; Wed, 21 Aug 2024 11:59:45 +0300
To: Maxim Kokryashkin <m.kokryashkin@tarantool.org>,
Sergey Bronnikov <sergeyb@tarantool.org>
Date: Wed, 21 Aug 2024 11:58:28 +0300
Message-ID: <46e696274dfe466c47e0ee998c03e1278f17ce72.1724228998.git.skaplun@tarantool.org>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1724228998.git.skaplun@tarantool.org>
References: <cover.1724228998.git.skaplun@tarantool.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Mailru-Src: smtp
X-4EC0790: 10
X-7564579A: 646B95376F6C166E
X-77F55803: 4F1203BC0FB41BD93D5A650E6D4F687EF4BBCA98CD248D289BC5876E76F8659F182A05F538085040F07F30113863E13FD27678DDAA806314D6C4BCE5CC92DC34EFF80BD07D1CDB79D92625EFBC59CE93
X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE77E216A0E97507353EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AE3E21739D159E418638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D81FC2317B0690FF88C1F3096FD6B0A5BA8D54851EC6C123A3CC7F00164DA146DAFE8445B8C89999728AA50765F790063793270F7220657A0A389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8C2B5EEE3591E0D35F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA7E827F84554CEF5019E625A9149C048EE9ECD01F8117BC8BEE2021AF6380DFAD18AA50765F790063735872C767BF85DA227C277FBC8AE2E8B81DF583BEE9BDE68EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A
X-C1DE0DAB: 0D63561A33F958A5C577905034E8ECFC5002B1117B3ED696DF8CFA83A4A1E4A833EE06AFCD964888823CB91A9FED034534781492E4B8EEADD0953842B444AAC3C79554A2A72441328621D336A7BC284946AD531847A6065A535571D14F44ED41
X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF83A273B4738F9D3B32479742A9E628038EF765FF0633A62CB9FA22FA773E586BF49F51687F14C9B8D14E51FF79EEE603FD1FABBAF1F29F2BB2A94BCD9D7316CE63FEE0D43573226DC226CC413062362A913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203
X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojegttVMu7AX/A6wJxMgWp1Q==
X-DA7885C5: F19BB60329DBDB4CF255D290C0D534F97FC6EDF9947BA91292EFC4C006C91B5CD9F7F3B2C0E69F555B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E
X-Mailru-Sender: 689FA8AB762F7393C6D0B12EA33CAA9B1075FDA3B65AB2BEDAC77899D9C4377FD04FA6B0F26FDE06E49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F
X-Mras: Ok
Subject: [Tarantool-patches] [PATCH v2 luajit 25/45] test: enable
<misc/parse_misc.lua> LuaJIT test
X-BeenThere: tarantool-patches@dev.tarantool.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>,
<mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>,
<mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org>
Reply-To: Sergey Kaplun <skaplun@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Errors-To: tarantool-patches-bounces@dev.tarantool.org
Sender: "Tarantool-patches" <tarantool-patches-bounces@dev.tarantool.org>
This patch moves the aforementioned test from the <misc> to the <lang/>
directory, includes it in <index>, names the subtests, and adds checks
for the Lua version.
Part of tarantool/tarantool#9398
---
test/LuaJIT-tests/lang/index | 1 +
test/LuaJIT-tests/lang/parse_misc.lua | 31 +++++++++++++++++++++++++++
test/LuaJIT-tests/misc/parse_misc.lua | 31 ---------------------------
3 files changed, 32 insertions(+), 31 deletions(-)
create mode 100644 test/LuaJIT-tests/lang/parse_misc.lua
delete mode 100644 test/LuaJIT-tests/misc/parse_misc.lua
diff --git a/test/LuaJIT-tests/lang/index b/test/LuaJIT-tests/lang/index
index 0d1175a8..726c8d16 100644
--- a/test/LuaJIT-tests/lang/index
+++ b/test/LuaJIT-tests/lang/index
@@ -19,6 +19,7 @@ self.lua
table.lua
parse_comp.lua
parse_esc.lua
+parse_misc.lua
upvalue
tail_recursion.lua
vararg_jit.lua
diff --git a/test/LuaJIT-tests/lang/parse_misc.lua b/test/LuaJIT-tests/lang/parse_misc.lua
new file mode 100644
index 00000000..c95758a3
--- /dev/null
+++ b/test/LuaJIT-tests/lang/parse_misc.lua
@@ -0,0 +1,31 @@
+do --- Ambiguous syntax: function call vs. new statement. +lua==5.2
+ assert(assert(loadstring([[
+ local function f() return 99 end
+ return f
+ ()
+ ]]))() == 99)
+end
+
+do --- Ambiguous syntax: function call vs. new statement. +lua<5.2
+ assert(loadstring([[
+ local function f() return 99 end
+ return f
+ ()
+ ]]) == nil)
+end
+
+do --- UTF-8 identifiers.
+ assert(loadstring([[
+ local ä = 1
+ local aäa = 2
+ local äöü·€晶 = 3
+
+ assert(ä == 1)
+ assert(aäa == 2)
+ assert(äöü·€晶 == 3)
+
+ assert(#"ä" == 2)
+ assert(#"aäa" == 4)
+ assert(#"äöü·€晶" == 14)
+ ]]))()
+end
diff --git a/test/LuaJIT-tests/misc/parse_misc.lua b/test/LuaJIT-tests/misc/parse_misc.lua
deleted file mode 100644
index 8031ec17..00000000
--- a/test/LuaJIT-tests/misc/parse_misc.lua
+++ /dev/null
@@ -1,31 +0,0 @@
-
--- Ambiguous syntax: function call vs. new statement.
-if os.getenv("LUA52") then
- assert(assert(loadstring([[
-local function f() return 99 end
-return f
-()
-]]))() == 99)
-else
- assert(loadstring([[
-local function f() return 99 end
-return f
-()
-]]) == nil)
-end
-
--- UTF-8 identifiers.
-assert(loadstring([[
-local ä = 1
-local aäa = 2
-local äöü·€晶 = 3
-
-assert(ä == 1)
-assert(aäa == 2)
-assert(äöü·€晶 == 3)
-
-assert(#"ä" == 2)
-assert(#"aäa" == 4)
-assert(#"äöü·€晶" == 14)
-]]))()
-
--
2.45.2