Re: [PATCH]: Revamped (P) expansion flag

Re: [PATCH]: Revamped (P) expansion flag

[Michael Hwang]

I made a mistake with the last patch. This remedies that problem.

I'm using git send-email, so the patch should finally show up with the email.
But as always, the changes can be pulled from the pflag branch of my GitHub
repo (git://github.com/Nomexous/zsh.git).

Michael Hwang

[PATCH] Fixed k, v flags for P expansion flag with unquoted reference.

[Michael Hwang]

---
 Src/subst.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Src/subst.c b/Src/subst.c
index 730fcd2..4579812 100644
--- a/Src/subst.c
+++ b/Src/subst.c
@@ -2030,7 +2030,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub)
 
 	    if ((v && !v->isarr) || (!v && !isarr)) {
 		/* Reference is not an array. Just retrieve value. */
-		v = fetchvalue(&vbuf, &val, 0, 0);
+		v = fetchvalue(&vbuf, &val, 0, hkeys | hvals);
 	    } else if (v && v->isarr) {
 		/* Reference is an array, stored in v. Convert to val/aval. */
 		isarr = v->isarr;
-- 
1.6.2.5

Re: [PATCH] Fixed k, v flags for P expansion flag with unquoted reference.

[Michael Hwang]

Sorry. I sent this with git send-email, and for some reason it didn't
send the accompanying message. I guess it also didn't want to reply to
my other thread.

I made a mistake in the previous update I made to my P flag patch.
This remedies that problem. Again, the changes can be pulled from the
pflag branch of my GitHub repo (git://github.com/Nomexous/zsh.git).

Michael Hwang

On Fri, Jan 1, 2010 at 11:35 AM, Michael Hwang
<michael.a.hwang@gmail.com> wrote:
> ---
>  Src/subst.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Src/subst.c b/Src/subst.c
> index 730fcd2..4579812 100644
> --- a/Src/subst.c
> +++ b/Src/subst.c
> @@ -2030,7 +2030,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub)
>
>            if ((v && !v->isarr) || (!v && !isarr)) {
>                /* Reference is not an array. Just retrieve value. */
> -               v = fetchvalue(&vbuf, &val, 0, 0);
> +               v = fetchvalue(&vbuf, &val, 0, hkeys | hvals);
>            } else if (v && v->isarr) {
>                /* Reference is an array, stored in v. Convert to val/aval. */
>                isarr = v->isarr;
> --
> 1.6.2.5
>
>