From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17318 invoked by alias); 29 Jan 2017 21:25:39 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 40460 Received: (qmail 13248 invoked from network); 29 Jan 2017 21:25:39 -0000 X-Qmail-Scanner-Diagnostics: from out1-smtp.messagingengine.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(66.111.4.25):SA:0(-0.7/5.0):. Processed in 1.226711 secs); 29 Jan 2017 21:25:39 -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.7 required=5.0 tests=RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 X-Envelope-From: d.s@daniel.shahaf.name X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | Received-SPF: none (ns1.primenet.com.au: domain at daniel.shahaf.name does not designate permitted sender hosts) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= mesmtp; bh=ZEpFDftbYWOtC0AjTMfNliecmCg=; b=g2g+c0AOsLI0i2UCDx9VP uCUDZEvYKO0rUi1WD15HpnkVoaah44BVfIb1ZgM08pzLMwHyPMtLYK39onY4xUII u3y9Q2k9teERcr8DZstdgfLv6gNdPK6OrlnvAKrT4Xa6j7dny6Q1YpI8cFwC5wxm LD+0UDEfTreb80tJs9KAC4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= smtpout; bh=ZEpFDftbYWOtC0AjTMfNliecmCg=; b=I+JaMOPOMIeQZsrxYnCz LKhY2uXUuB4vOihqiBbEKS3ZcfnKTm+zk6dVy/JFCyjj+C5PvmXuCteiK+/B4eF/ vxUAVYRWm8eAkFuiJ22n8LdNDZX5krd4rlL3albR/E6u/aviqKy5cA8d/lYcUflI mrBTaTpVdS8BswdjZBWQ70Q= X-ME-Sender: X-Sasl-enc: 46T6dx3aGN2x7+a1D+jYH65x3FczL4sxhYE7PDWJEPdE 1485725125 Date: Sun, 29 Jan 2017 21:21:36 +0000 From: Daniel Shahaf To: zsh-workers@zsh.org Subject: Re: LOCAL_VARS option ? Message-ID: <20170129212136.GA14893@fujitsu.shahaf.local2> References: <20170120171922.0e0c370d@pwslap01u.europe.root.pri> <20170122190052.327898df@ntlworld.com> <20170123100914.55675852@pwslap01u.europe.root.pri> <20170123112008.GA8944@fujitsu.shahaf.local2> <20170125055009.GA11466@fujitsu.shahaf.local2> <20170125092438.215f5a2c@pwslap01u.europe.root.pri> <20170125193202.GA17866@fujitsu.shahaf.local2> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="yrj/dFKFPuw6o+aM" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) --yrj/dFKFPuw6o+aM Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit Bart Schaefer wrote on Wed, Jan 25, 2017 at 13:50:06 -0800: > On Wed, 25 Jan 2017, Daniel Shahaf wrote: > > > It does warn if the inner function assigns «var[3]=(three)». I suppose > > it shouldn't, for the same reason as the above case? > > It warns in that instance because inserting a slice into an array goes > through the same code branch as assigning to the array as a whole (IIRC). > It is probably not possible to selectively suppress this warning. Patch attached. Cheers, Daniel --yrj/dFKFPuw6o+aM Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="0001-WARN_NESTED_VAR-Don-t-warn-when-assigning-to-a-slice.patch" >>From a97270dbee2e2169ddf99aeb7fc8ac902263a944 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Sun, 29 Jan 2017 21:17:48 +0000 Subject: [PATCH] WARN_NESTED_VAR: Don't warn when assigning to a slice of an existing array --- Src/params.c | 19 +++++++++++++------ Test/E01options.ztst | 4 ++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Src/params.c b/Src/params.c index a8d4f50..20abe6a 100644 --- a/Src/params.c +++ b/Src/params.c @@ -2866,10 +2866,14 @@ gethkparam(char *s) /**/ static void -check_warn_pm(Param pm, const char *pmtype, int created) +check_warn_pm(Param pm, const char *pmtype, int created, + int may_warn_about_nested_vars) { Funcstack i; + if (!may_warn_about_nested_vars && !created) + return; + if (created && isset(WARNCREATEGLOBAL)) { if (locallevel <= forklevel || pm->level != 0) return; @@ -2956,7 +2960,7 @@ assignsparam(char *s, char *val, int flags) return NULL; } if (flags & ASSPM_WARN) - check_warn_pm(v->pm, "scalar", created); + check_warn_pm(v->pm, "scalar", created, 1); if (flags & ASSPM_AUGMENT) { if (v->start == 0 && v->end == -1) { switch (PM_TYPE(v->pm->node.flags)) { @@ -3049,6 +3053,7 @@ assignaparam(char *s, char **val, int flags) char *t = s; char *ss; int created = 0; + int may_warn_about_nested_vars = 1; if (!isident(s)) { zerr("not an identifier: %s", s); @@ -3062,6 +3067,8 @@ assignaparam(char *s, char **val, int flags) if (!(v = getvalue(&vbuf, &s, 1))) { createparam(t, PM_ARRAY); created = 1; + } else { + may_warn_about_nested_vars = 0; } *ss = '['; if (v && PM_TYPE(v->pm->node.flags) == PM_HASHED) { @@ -3105,7 +3112,7 @@ assignaparam(char *s, char **val, int flags) } if (flags & ASSPM_WARN) - check_warn_pm(v->pm, "array", created); + check_warn_pm(v->pm, "array", created, may_warn_about_nested_vars); if (flags & ASSPM_AUGMENT) { if (v->start == 0 && v->end == -1) { if (PM_TYPE(v->pm->node.flags) & PM_ARRAY) { @@ -3176,7 +3183,7 @@ sethparam(char *s, char **val) /* errflag |= ERRFLAG_ERROR; */ return NULL; } - check_warn_pm(v->pm, "associative array", checkcreate); + check_warn_pm(v->pm, "associative array", checkcreate, 1); setarrvalue(v, val); unqueue_signals(); return v->pm; @@ -3241,9 +3248,9 @@ setnparam(char *s, mnumber val) unqueue_signals(); return NULL; } - check_warn_pm(v->pm, "numeric", !was_unset); + check_warn_pm(v->pm, "numeric", !was_unset, 1); } else { - check_warn_pm(v->pm, "numeric", 0); + check_warn_pm(v->pm, "numeric", 0, 1); } setnumvalue(v, val); unqueue_signals(); diff --git a/Test/E01options.ztst b/Test/E01options.ztst index 343d5a9..2bd4fdb 100644 --- a/Test/E01options.ztst +++ b/Test/E01options.ztst @@ -1137,6 +1137,8 @@ ( foo1=global1 foo2=global2 foo3=global3 foo4=global4 integer foo5=5 + # skip foo6, defined in fn_wnv + foo7=(one two) fn_wnv() { # warns foo1=bar1 @@ -1161,6 +1163,8 @@ integer foo6=9 # doesn't warn (( foo6=10 )) + foo7[3]=three + foo7[4]=(four) } print option off >&2 fn_wnv --yrj/dFKFPuw6o+aM--