From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <roman.habibov@tarantool.org>
From: Roman Khabibov <roman.habibov@tarantool.org>
Subject: [PATCH 1/2 v2] lua: modify the error message in 'fio.pathjoin'
Date: Tue,  4 Dec 2018 19:00:37 +0300
Message-Id: <dce03b75a6fec2a592d9daf820e8b985f513d86a.1543938959.git.roman.habibov@tarantool.org>
In-Reply-To: <cover.1543938959.git.roman.habibov@tarantool.org>
References: <cover.1543938959.git.roman.habibov@tarantool.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
To: tarantool-patches@freelists.org
Cc: vdavydov.dev@gmail.com
List-ID: <tarantool-patches.dev.tarantool.org>

Display line number with error and fix the bug with bad argument number.

Closes #3580
---
 src/lua/fio.lua       |  4 ++--
 test/app/fio.result   | 13 +++++++++++++
 test/app/fio.test.lua |  5 +++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/lua/fio.lua b/src/lua/fio.lua
index 55faebdcb..1d0bb4bd1 100644
--- a/src/lua/fio.lua
+++ b/src/lua/fio.lua
@@ -213,7 +213,7 @@ fio.pathjoin = function(...)
     while i <= len do
         local sp = select(i, ...)
         if sp == nil then
-            error("Undefined path part "..i)
+            error("fio.pathjoin() undefined path part "..i, 2)
         end
 
         sp = tostring(sp)
@@ -233,7 +233,7 @@ fio.pathjoin = function(...)
     while i <= len do
         local sp = select(i, ...)
         if sp == nil then
-            error("Undefined path part")
+            error("fio.pathjoin() undefined path part "..i, 2)
         end
 
         sp = tostring(sp)
diff --git a/test/app/fio.result b/test/app/fio.result
index b7a1f65c6..9777a0aec 100644
--- a/test/app/fio.result
+++ b/test/app/fio.result
@@ -55,6 +55,19 @@ fio.pathjoin('abc', 'awdeq///qweqwqwe///', "//asda//")
 ---
 - abc/awdeq/qweqwqwe/asda
 ...
+--gh-3580 Modify the error message in 'fio.pathjoin'.
+fio.pathjoin(nil)
+---
+- error: fio.pathjoin() undefined path part 1
+...
+fio.pathjoin('abc', nil)
+---
+- error: fio.pathjoin() undefined path part 2
+...
+fio.pathjoin('abc', 'cde', nil)
+---
+- error: fio.pathjoin() undefined path part 3
+...
 -- basename
 st, err = pcall(fio.basename, nil)
 ---
diff --git a/test/app/fio.test.lua b/test/app/fio.test.lua
index 4f34fd11c..b6c79648c 100644
--- a/test/app/fio.test.lua
+++ b/test/app/fio.test.lua
@@ -18,6 +18,11 @@ fio.pathjoin('/', '/cde')
 fio.pathjoin('/a', '/')
 fio.pathjoin('abc', 'awdeq///qweqwqwe///', "//asda//")
 
+--gh-3580 Modify the error message in 'fio.pathjoin'.
+fio.pathjoin(nil)
+fio.pathjoin('abc', nil)
+fio.pathjoin('abc', 'cde', nil)
+
 -- basename
 st, err = pcall(fio.basename, nil)
 st
-- 
2.19.1