From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 699 invoked by alias); 1 Jan 2017 20:57:37 -0000 Mailing-List: contact zsh-users-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Users List List-Post: List-Help: X-Seq: 22319 Received: (qmail 25282 invoked from network); 1 Jan 2017 20:57:37 -0000 X-Qmail-Scanner-Diagnostics: from mail-ua0-f170.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(209.85.217.170):SA:0(-0.0/5.0):. Processed in 1.488927 secs); 01 Jan 2017 20:57:37 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: schaefer@brasslantern.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: pass (ns1.primenet.com.au: SPF record at _netblocks.google.com designates 209.85.217.170 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20150623.gappssmtp.com; s=20150623; h=from:message-id:date:in-reply-to:comments:references:to:subject :mime-version; bh=MOezLh+oySnx0Bf8jCSFGPL8+Er6kZCuTa/fAOo5Ucc=; b=XCvObpD69tnWabCbSVHkUo6dUwqZTjzGwCXpe5WmAcO78NIdRYattHU91gxYdmIlHf pLxekM03UbUQoEcjmhpeEcso686Cy8XeAsEtB3RXVjeug+7rsbTL0OdTzD8vaP+SFtmA /Rat+6NjSIAb1fvKAzG9UrIeL7guCypMcX1lEMLsMFydR3ZanCeCv1Kj+1cks6oldole Bl4bbCbMR+1WaP2ZRf1IVfW52lYLLYp0qf6/IrB2UYzVGvcNX3UZjZCPDZBE/PIyQRdI JS0g9RVTHnfv/QRSetIs15fEnKJ6MYuXp7yj18qwCDFKBtbR0nBHXBVb6+CmLMCfOm8+ EetQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:date:in-reply-to:comments :references:to:subject:mime-version; bh=MOezLh+oySnx0Bf8jCSFGPL8+Er6kZCuTa/fAOo5Ucc=; b=SOPisl+zBZLQqO/FVkiqjPGhruQVrG3n2B4usLEbQacfuv1FoQ/VVMBYioRmRhpTyS PxFN15RYSsWFYssRjlOrZ77hfMTa5rcpVGIpq0W5zGHmX+qRDWk6ABn9o/s+YQ5xlMxI QVy/jNJqmZzNYprhMvDgjsDLE8Ko3hr6TizJHWAI239F4iR/dup4G/fnm5SQmSnvf5jk WTfV2CBAwnvA/pCK4K+QYJblY1BRWUlni8r7k8vpybw0GCv/rZF2TX/HH4a3VKqEZn4N kqp+ifdPbdohW7Ge8736EKWuhXrt6bHJQxc7B1NBLlyj42zBaOaLPCvV9vbSVJyUftWk 6JsQ== X-Gm-Message-State: AIkVDXKywHm8s+aVzzOMh+WAd+F611/cjOsNBxSaDx6amAlbjuO4KrBifAe7OFrgxW6cGg== X-Received: by 10.159.40.97 with SMTP id c88mr41189551uac.17.1483302409537; Sun, 01 Jan 2017 12:26:49 -0800 (PST) From: Bart Schaefer Message-Id: <170101122709.ZM20782@torch.brasslantern.com> Date: Sun, 1 Jan 2017 12:27:09 -0800 In-Reply-To: <170101122451.ZM20755@torch.brasslantern.com> Comments: In reply to Bart Schaefer "Re: Should zipping two empty arrays result in empty string?" (Jan 1, 12:24pm) References: <98007a1c-8cd4-f6bf-36c4-65f046e8bc17@gmx.com> <170101122451.ZM20755@torch.brasslantern.com> X-Mailer: OpenZMail Classic (0.9.2 24April2005) To: zsh-users@zsh.org Subject: [PATCH] zipping two empty arrays should not result in empty string MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii On Jan 1, 12:24pm, Bart Schaefer wrote: } } The zip operation is stepping on the internal state that records the } semantics of (@)-inside-double-quotes, so it always behaves as if } you did "${a[*]:^b}" instead. Don't change isarr unless creating one from a scalar. diff --git a/Src/subst.c b/Src/subst.c index 64b4400..737a0a9 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -3066,7 +3066,10 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags, if (sval) zip = hmkarray(sval); } - if (!isarr) aval = mkarray(val); + if (!isarr) { + aval = mkarray(val); + isarr = 1; + } if (zip) { char **out; int alen, ziplen, outlen, i = 0; @@ -3089,7 +3092,6 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags, out[i*2] = NULL; aval = out; copied = 1; - isarr = 1; } } else { if (unset(UNSET)) {