From: Peter Stephenson <p.w.stephenson@ntlworld.com>
To: "Zsh Hackers' List" <zsh-workers@zsh.org>
Subject: Re: PATCH: parameter substitution for exclusion by array
Date: Sun, 22 Apr 2012 19:20:36 +0100 [thread overview]
Message-ID: <20120422192036.733be288@pws-pc.ntlworld.com> (raw)
In-Reply-To: <CAHYJk3TE2rwtnB2R7+MLtNVvbNhqp5Fz4A67FPqkYt6H0tiBtQ@mail.gmail.com>
On Sun, 22 Apr 2012 14:55:15 +0200
Mikael Magnusson <mikachu@gmail.com> wrote:
> Using ${path:*notexist} prints all elements of $path, not sure if that
> is what one should expect or not. ${path:|notexist} does the same but
> that makes a lot more sense to me :). ${path:*SCALAR} and :| act the
> same way, substitute all elements in $path.
You're right that using :* with something that doesn't exist or isn't an
array should produce an empty result, I hadn't picked up this
difference from :|.
Index: Src/subst.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/subst.c,v
retrieving revision 1.135
diff -p -u -r1.135 subst.c
--- Src/subst.c 22 Apr 2012 18:10:43 -0000 1.135
+++ Src/subst.c 22 Apr 2012 18:18:18 -0000
@@ -2918,6 +2918,19 @@ paramsubst(LinkList l, LinkNode n, char
}
}
deletehashtable(ht);
+ } else if (intersect) {
+ /*
+ * The intersection with nothing is nothing...
+ * Seems a bit pointless complaining that the first
+ * expression is unset here if the second is, too.
+ */
+ if (!vunset) {
+ if (isarr) {
+ aval = mkarray(NULL);
+ } else {
+ val = dupstring("");
+ }
+ }
}
} else { /* no ${...=...} or anything, but possible modifiers. */
/*
Index: Test/D04parameter.ztst
===================================================================
RCS file: /cvsroot/zsh/zsh/Test/D04parameter.ztst,v
retrieving revision 1.66
diff -p -u -r1.66 D04parameter.ztst
--- Test/D04parameter.ztst 22 Apr 2012 18:10:43 -0000 1.66
+++ Test/D04parameter.ztst 22 Apr 2012 18:18:18 -0000
@@ -182,6 +182,9 @@
scalar='two words'
print ${scalar:|mod}
print ${scalar:*mod}
+ print ${args:*nonexistent}
+ empty=
+ print ${args:*empty}
0:"|" array exclusion and "*" array intersection
>one two
>#foo (bar 'three'
@@ -191,6 +194,8 @@
>two words
>
>two words
+>
+>
str1='twocubed'
array=(the number of protons in an oxygen nucleus)
--
Peter Stephenson <p.w.stephenson@ntlworld.com>
Web page now at http://homepage.ntlworld.com/p.w.stephenson/
next prev parent reply other threads:[~2012-04-22 18:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-20 19:20 Peter Stephenson
2012-04-21 21:05 ` Peter Stephenson
2012-04-21 21:48 ` Bart Schaefer
2012-04-21 22:06 ` Peter Stephenson
2012-04-22 12:55 ` Mikael Magnusson
2012-04-22 18:20 ` Peter Stephenson [this message]
2012-04-23 13:54 ` PATCH: NEWS: mention new array operations Mikael Magnusson
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=20120422192036.733be288@pws-pc.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).