From: Peter Stephenson <p.w.stephenson@ntlworld.com>
To: Zsh Hackers' List <zsh-workers@zsh.org>
Subject: Re: PATCH: PRINT_EXIT_VALUE with anonymous functions, again
Date: Fri, 13 Feb 2015 21:27:42 +0000 [thread overview]
Message-ID: <20150213212742.0865023b@ntlworld.com> (raw)
In-Reply-To: <20150213104849.701782fb@pwslap01u.europe.root.pri>
On Fri, 13 Feb 2015 10:48:49 +0000
Peter Stephenson <p.stephenson@samsung.com> wrote:
> Let's stick with an easy, unambiguously effective fix for this. As
> this is local there is no change to the simple / complex nature of the
> command.
Test, based on the original report, fixing matters arising.
pws
diff --git a/Src/exec.c b/Src/exec.c
index 302e2b5..de6b9c5 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -2784,9 +2784,14 @@ execcmd(Estate state, int input, int output, int how, int last1)
else
text = NULL;
- /* Set up special parameter $_ */
-
- setunderscore((args && nonempty(args)) ? ((char *) getdata(lastnode(args))) : "");
+ /*
+ * Set up special parameter $_
+ * For execfuncdef we may need to take account of an
+ * anonymous function with arguments.
+ */
+ if (type != WC_FUNCDEF)
+ setunderscore((args && nonempty(args)) ?
+ ((char *) getdata(lastnode(args))) : "");
/* Warn about "rm *" */
if (type == WC_SIMPLE && interact && unset(RMSTARSILENT) &&
@@ -4374,7 +4379,7 @@ execfuncdef(Estate state, Eprog redir_prog)
Shfunc shf;
char *s = NULL;
int signum, nprg, sbeg, nstrs, npats, len, plen, i, htok = 0, ret = 0;
- int nfunc = 0;
+ int nfunc = 0, anon_func = 0;
Wordcode beg = state->pc, end;
Eprog prog;
Patprog *pp;
@@ -4460,6 +4465,8 @@ execfuncdef(Estate state, Eprog redir_prog)
*/
LinkList args;
+ anon_func = 1;
+
state->pc = end;
end += *state->pc++;
args = ecgetlist(state, *state->pc++, EC_DUPTOK, &htok);
@@ -4515,6 +4522,8 @@ execfuncdef(Estate state, Eprog redir_prog)
shfunctab->addnode(shfunctab, ztrdup(s), shf);
}
}
+ if (!anon_func)
+ setunderscore("");
if (!nfunc && redir_prog) {
/* For completeness, shouldn't happen */
freeeprog(redir_prog);
diff --git a/Test/D04parameter.ztst b/Test/D04parameter.ztst
index cf639fa..42c7b4e 100644
--- a/Test/D04parameter.ztst
+++ b/Test/D04parameter.ztst
@@ -1670,3 +1670,32 @@
print ${(e)param}
0:Alias expansion in command substitution in parameter evaluation
>Expanded in substitution
+
+ a=1 b=2 c=3
+ : One;
+ function {
+ : Two
+ echo $_
+ print -l $argv
+ } $_ Three
+ print -l $_ Four;
+0:$_ with anonymous function
+>Two
+>One
+>Three
+>Three
+>Four
+
+ a=1 b=2 c=3
+ : One
+ function {
+ : Two
+ echo $_
+ print -l $argv
+ }
+ print -l "$_" Four
+0:$_ with anonymous function without arguments
+>Two
+>
+>
+>Four
prev parent reply other threads:[~2015-02-13 21:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-13 10:48 Peter Stephenson
2015-02-13 21:27 ` Peter Stephenson [this message]
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=20150213212742.0865023b@ntlworld.com \
--to=p.w.stephenson@ntlworld.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).