From: Bart Schaefer <schaefer@brasslantern.com>
To: <zsh-workers@zsh.org>
Subject: Re: PATCH Re: let unset array element remove compatible with bash
Date: Mon, 02 Jul 2012 00:36:54 -0700 [thread overview]
Message-ID: <120702003654.ZM29918@torch.brasslantern.com> (raw)
In-Reply-To: <120701095354.ZM28458@torch.brasslantern.com>
On Jul 1, 9:53am, Bart Schaefer wrote:
}
} One thing I'm still scratching my head about: In foo[(i)x] for scalar
} foo, setstrvalue() doesn't properly apply the subscript range returned
} from getindex(). That's why the PM_SCALAR branch below uses getvalue()
I'm not sure what I was doing wrong before, but the below seems to be the
right way to remove the getvalue() in the scalar case. It doesn't really
save processing because getindex() calls getarg() which eventually calls
getstrvalue() in order to scan th string, but it feels cleaner.
This patch REPLACES the one from 30552, it does not apply on top of it.
Index: Src/builtin.c
--- ../zsh-forge/current/Src/builtin.c 2012-06-30 10:33:44.000000000 -0700
+++ Src/builtin.c 2012-07-02 00:31:05.000000000 -0700
@@ -3055,9 +3055,35 @@
*sse = ']';
}
paramtab = tht;
+ } else if (PM_TYPE(pm->node.flags) == PM_SCALAR ||
+ PM_TYPE(pm->node.flags) == PM_ARRAY) {
+ struct value vbuf;
+ vbuf.isarr = (PM_TYPE(pm->node.flags) == PM_ARRAY ?
+ SCANPM_ARRONLY : 0);
+ vbuf.pm = pm;
+ vbuf.flags = 0;
+ vbuf.start = 0;
+ vbuf.end = -1;
+ vbuf.arr = 0;
+ *ss = '[';
+ if (getindex(&ss, &vbuf, SCANPM_ASSIGNING) == 0 &&
+ vbuf.pm && !(vbuf.pm->node.flags & PM_UNSET)) {
+ if (PM_TYPE(pm->node.flags) == PM_SCALAR) {
+ setstrvalue(&vbuf, ztrdup(""));
+ } else {
+ /* start is after the element for reverse index */
+ int start = vbuf.start - !!(vbuf.flags & VALFLAG_INV);
+ if (start < arrlen(vbuf.pm->u.arr)) {
+ char *arr[1];
+ arr[0] = 0;
+ setarrvalue(&vbuf, zarrdup(arr));
+ }
+ }
+ }
+ returnval = errflag;
+ errflag = 0;
} else {
- zerrnam(name, "%s: invalid element for unset", s);
- returnval = 1;
+ returnval = 1;
}
} else {
if (unsetparam_pm(pm, 0, 1))
next prev parent reply other threads:[~2012-07-02 7:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAPg-njyehwyETKY4KGdFV8u_ZwkMku-G9xVi7d7PpU9rZhdPDA@mail.gmail.com>
2012-02-22 5:01 ` Bart Schaefer
2012-02-22 9:52 ` Peter Stephenson
2012-02-22 17:28 ` Bart Schaefer
2012-02-22 20:19 ` Peter Stephenson
2012-07-01 16:53 ` PATCH " Bart Schaefer
2012-07-01 18:15 ` Peter Stephenson
2012-07-01 22:23 ` Bart Schaefer
2012-07-02 9:11 ` Peter Stephenson
2012-07-07 17:02 ` Bart Schaefer
2012-07-08 17:50 ` Peter Stephenson
2012-07-01 22:29 ` Bart Schaefer
2012-07-02 7:36 ` Bart Schaefer [this message]
2012-02-23 10:58 ` Peter Stephenson
2012-02-23 16:23 ` Bart Schaefer
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=120702003654.ZM29918@torch.brasslantern.com \
--to=schaefer@brasslantern.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).