From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 27A672F8F8 for ; Mon, 3 Dec 2018 09:25:54 -0500 (EST) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7jyX728ZbIKg for ; Mon, 3 Dec 2018 09:25:54 -0500 (EST) Received: from smtp63.i.mail.ru (smtp63.i.mail.ru [217.69.128.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id DBA3A2F8D3 for ; Mon, 3 Dec 2018 09:25:53 -0500 (EST) Subject: [tarantool-patches] Re: [PATCH] lua: modify the error message in 'fio.pathjoin' References: <20181202002729.8968-1-roman.habibov@tarantool.org> From: Vladislav Shpilevoy Message-ID: <372c9ce1-c96f-fd26-b779-3eeba9665cb0@tarantool.org> Date: Mon, 3 Dec 2018 17:25:48 +0300 MIME-Version: 1.0 In-Reply-To: <20181202002729.8968-1-roman.habibov@tarantool.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: Roman Khabibov , tarantool-patches@freelists.org Thanks for the patch! See 2 comments below, review fix at the end of the email and on the branch. On 02/12/2018 03:27, Roman Khabibov wrote: > Display line number with error and fix the bug with bad argument number. > > Closes #3580 > > Branch: https://github.com/tarantool/tarantool/tree/romanhabibov/gh-3580-err-msg-pathjoin > Issue: https://github.com/tarantool/tarantool/issues/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..13a4d36dc 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("in function 'pathjoin' undefined path part "..i, 2) 1. Usually we write error messages without saying 'in function'. Also, you did not specify module name 'fio'. I've fixed it on the branch in a separate commit. Please, look and squash if it is ok for you. > end > > sp = tostring(sp) 2. The module 'fio' contains some other error messages without function name. I've fixed them too in a follow-up commit. Look at it, say if do not agree, but do not squash. It should be separate. If all my changes are ok, then send v2 patch to Vova, please. =================================================================== commit 4ec3b8238faa0515cb13dea43a3fcc38e7ecce18 Author: Vladislav Shpilevoy Date: Mon Dec 3 17:04:52 2018 +0300 Review fix diff --git a/src/lua/fio.lua b/src/lua/fio.lua index 13a4d36dc..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("in function 'pathjoin' undefined path part "..i, 2) + 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("in function 'pathjoin' undefined path part "..i, 2) + 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 fd3e289c4..9777a0aec 100644 --- a/test/app/fio.result +++ b/test/app/fio.result @@ -58,15 +58,15 @@ fio.pathjoin('abc', 'awdeq///qweqwqwe///', "//asda//") --gh-3580 Modify the error message in 'fio.pathjoin'. fio.pathjoin(nil) --- -- error: in function 'pathjoin' undefined path part 1 +- error: fio.pathjoin() undefined path part 1 ... fio.pathjoin('abc', nil) --- -- error: in function 'pathjoin' undefined path part 2 +- error: fio.pathjoin() undefined path part 2 ... fio.pathjoin('abc', 'cde', nil) --- -- error: in function 'pathjoin' undefined path part 3 +- error: fio.pathjoin() undefined path part 3 ... -- basename st, err = pcall(fio.basename, nil)