From: Peter Stephenson <p.stephenson@samsung.com>
To: zsh-workers@zsh.org
Subject: Re: [BUG] Anonymous functions cause funcfiletrace to produce function-relative line numbers
Date: Mon, 11 Dec 2017 10:12:38 +0000 [thread overview]
Message-ID: <20171211101238.410a91b1@pwslap01u.europe.root.pri> (raw)
In-Reply-To: <20171211094116.48e29012@pwslap01u.europe.root.pri>
On Mon, 11 Dec 2017 09:41:16 +0000
Peter Stephenson <p.stephenson@samsung.com> 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;
next prev parent reply other threads:[~2017-12-11 10:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20171210232854epcas2p2f9d4f0ac2ad31feb5a54d61da49e7140@epcas2p2.samsung.com>
2017-12-10 23:28 ` dana
2017-12-11 9:41 ` Peter Stephenson
2017-12-11 10:12 ` Peter Stephenson [this message]
2017-12-11 21:57 ` dana
2017-12-15 10:21 ` Peter Stephenson
2017-12-15 18:45 ` dana
2017-12-16 21:10 ` Bart Schaefer
2017-12-16 22:33 ` dana
2017-12-18 9:01 ` Peter Stephenson
2017-12-20 17:39 ` Peter Stephenson
2017-12-20 22:26 ` dana
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=20171211101238.410a91b1@pwslap01u.europe.root.pri \
--to=p.stephenson@samsung.com \
--cc=zsh-workers@zsh.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).