From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26889 invoked by alias); 11 Dec 2017 10:12:54 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 42109 Received: (qmail 11934 invoked by uid 1010); 11 Dec 2017 10:12:54 -0000 X-Qmail-Scanner-Diagnostics: from mailout1.w1.samsung.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(210.118.77.11):SA:0(-6.9/5.0):. Processed in 8.180496 secs); 11 Dec 2017 10:12:54 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, SPF_HELO_PASS,SPF_PASS,T_DKIM_INVALID,T_RP_MATCHES_RCVD autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: p.stephenson@samsung.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20171211101242euoutp01bd26b42079d0c61bf09b2dec0316d1c5~-Nc7o3Vu_1283612836euoutp01R DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1512987162; bh=jbCEBksgO93w3N04lOwwbpxeV5Egkb7kPOwogVy20Mw=; h=Date:From:To:Subject:In-reply-to:References:From; b=D8XTdCePM6tCXXHJo3K2reA6S64EwkGUm+d+2Xp9TZUGPnkckcBDDhb+rFhaKz3/X 9xIK7ELJyyDLUZYRv3iIcubRgcFASWTPrfShjrA7UvXnqrLRUlTw7cOPwK5zMcFBaJ J+dwwzWafDby6gnj4luAQiGcvreIlzW6nMeaw98c= X-AuditID: cbfec7ef-f79ee6d000003120-74-5a2e5a19ddb1 Date: Mon, 11 Dec 2017 10:12:38 +0000 From: Peter Stephenson To: zsh-workers@zsh.org Subject: Re: [BUG] Anonymous functions cause funcfiletrace to produce function-relative line numbers Message-id: <20171211101238.410a91b1@pwslap01u.europe.root.pri> In-reply-to: <20171211094116.48e29012@pwslap01u.europe.root.pri> Organization: Samsung Cambridge Solution Centre X-Mailer: Claws Mail 3.7.9 (GTK+ 2.22.0; i386-redhat-linux-gnu) MIME-version: 1.0 Content-type: text/plain; charset="US-ASCII" Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLIsWRmVeSWpSXmKPExsWy7djPc7qSUXpRBl198hYHmx8yOTB6rDr4 gSmAMYrLJiU1J7MstUjfLoEro33xS6aC42wV3/70sjYw7mPtYuTkkBAwkeh/080MYYtJXLi3 nq2LkYtDSGAZo0Tb2iYop5dJYt7sOUAdHGAd598IwhU9PzuFGcKZxiRx/ORMqI4zjBLLT95i hHDOMko8u/kArJ1FQFVi3TZ2kH1sAoYSUzfNZgSxRQTEJc6uPc8CYgsLpEnsfvgVLM4rYC/x Zs41MJtTwEHi07dFYL38AvoSV/9+YoK4215i5pUzUPWCEj8m3wObwyygI7Ft22N2CFteYvOa t2CXSggsYJPoPnqbBaLZReLS2Y1sELawxKvjW9ghbBmJy5O7oWr6GSWedPtCNM9glDh9ZgdU g7VE3+2LjBAb+CQmbZvODAkjXomONiGIEg+JM59XQM1xlFi/9RxYuZDAEUaJjy/DJjAqzEJy 9ywkd89CcvcCRuZVjCKppcW56anFhnrFibnFpXnpesn5uZsYgYng9L/j73cwPm0OOcQowMGo xMO7YLZulBBrYllxZe4hRgkOZiURXlM/oBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXFe26i2SCGB 9MSS1OzU1ILUIpgsEwenVAPjpIcBvJwnXhpXaMSfWrK2Z4rNY5e9/xjYD3vPiF718YmPPX+B h8Rphfdbd+84u96X9aOR6iw9YWkdth6HestnS5/ZTCtzvuYTsbj388vzkroO1TphAT6i0d1/ Vp+ddKMhTcV9o/vnvXezJZ72BMtcupX5eYJAAJvU2xClD2lyJ27lyazdJ1+uxFKckWioxVxU nAgAxDzM7gADAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPLMWRmVeSWpSXmKPExsVy+t/xa7qSUXpRBuvWsVgcbH7I5MDoserg B6YAxigum5TUnMyy1CJ9uwSujPbFL5kKjrNVfPvTy9rAuI+1i5GDQ0LAROL8G8EuRk4gU0zi wr31bF2MXBxCAksYJS5v38AE4cxgkvh1fAoLhHOOUeLnkctQZWcZJZ6/nM4IMopFQFVi3TZ2 kFFsAoYSUzfNZgSxRQTEJc6uPc8CYgsLpEnsfvgVLM4rYC/xZs41MJtTwEHi07dF7BAzjzFK nN17G2wQv4C+xNW/n5gg7rOXmHnlDFSzoMSPyffAhjILaEls3tbECmHLS2xe85YZxBYSUJe4 cXc3+wRG4VlIWmYhaZmFpGUBI/MqRpHU0uLc9NxiI73ixNzi0rx0veT83E2MwGDeduznlh2M Xe+CDzEKcDAq8fAumK0bJcSaWFZcmXuIUYKDWUmE19QPKMSbklhZlVqUH19UmpNafIhRmoNF SZy3d8/qSCGB9MSS1OzU1ILUIpgsEwenVAPj7DUrA+R8yqWM7CdOj4jfflX61f+99R5FL7fd aV7R4abq1lEmK9ryI+KdkvTkWd/nKb0SnfUnfM4s4W32vzdXH+leVMZ0cIOASPTs/uOfvq+q aT2y80xus/+EG3vunAibtbI+2/zGhQUHnzMWrLS4Ft7bH8Hh9tfwUsDsr026ZQs8WsR6PC4+ VWIpzkg01GIuKk4EAJlWmLZiAgAA X-CMS-MailID: 20171211101241eucas1p2811bb1fbb3d143b2465b8bee7801d674 X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20171210232854epcas2p2f9d4f0ac2ad31feb5a54d61da49e7140 X-RootMTR: 20171210232854epcas2p2f9d4f0ac2ad31feb5a54d61da49e7140 References: <20171211094116.48e29012@pwslap01u.europe.root.pri> On Mon, 11 Dec 2017 09:41:16 +0000 Peter Stephenson wrote: > Perhaps...? Oops, try this instead. diff --git a/Src/exec.c b/Src/exec.c index fc6d02d..24d3c7e 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -5669,11 +5669,13 @@ doshfunc(Shfunc shfunc, LinkList doshargs, int noreturnval) funcsave->fstack.caller = funcstack ? funcstack->name : dupstring(funcsave->argv0 ? funcsave->argv0 : argzero); funcsave->fstack.lineno = lineno; + funcsave->fstack.flineno = shfunc->lineno; + if (funcstack) + funcsave->fstack.flineno += funcstack->flineno; funcsave->fstack.prev = funcstack; funcsave->fstack.tp = FS_FUNC; funcstack = &funcsave->fstack; - funcsave->fstack.flineno = shfunc->lineno; funcsave->fstack.filename = getshfuncfile(shfunc); prog = shfunc->funcdef;