From: Peter Stephenson <p.w.stephenson@ntlworld.com>
To: zsh-workers@zsh.org
Subject: Re: LOCAL_VARS option ?
Date: Thu, 26 Jan 2017 19:43:28 +0000 [thread overview]
Message-ID: <20170126194328.5aa3d79d@ntlworld.com> (raw)
In-Reply-To: <20170125092438.215f5a2c@pwslap01u.europe.root.pri>
On Wed, 25 Jan 2017 09:24:38 +0000
Peter Stephenson <p.stephenson@samsung.com> wrote:
> However, you don't get a warning if you change the array to something
> else:
>
> () {
> local var=(one two)
> () { var=three; }
> print $var
> }
>
> That's a crucial case for protecting against problems and needs looking
> at in the tortuous type conversion logic.
This wasn't particularly tortuous, simply that when I extended the
create warning logic I handled this one rather badly.
I'll commit this anyway if the message doesn't get out quickly.
pws
diff --git a/Src/params.c b/Src/params.c
index c38f2e0..45b37cb 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -2905,7 +2905,7 @@ assignsparam(char *s, char *val, int flags)
char *ss, *copy, *var;
size_t lvar;
mnumber lhs, rhs;
- int sstart;
+ int sstart, created = 0;
if (!isident(s)) {
zerr("not an identifier: %s", s);
@@ -2916,9 +2916,10 @@ assignsparam(char *s, char *val, int flags)
queue_signals();
if ((ss = strchr(s, '['))) {
*ss = '\0';
- if (!(v = getvalue(&vbuf, &s, 1)))
+ if (!(v = getvalue(&vbuf, &s, 1))) {
createparam(t, PM_ARRAY);
- else {
+ created = 1;
+ } else {
if (v->pm->node.flags & PM_READONLY) {
zerr("read-only variable: %s", v->pm->node.nam);
*ss = '[';
@@ -2935,18 +2936,18 @@ assignsparam(char *s, char *val, int flags)
*ss = '[';
v = NULL;
} else {
- if (!(v = getvalue(&vbuf, &s, 1)))
+ if (!(v = getvalue(&vbuf, &s, 1))) {
createparam(t, PM_SCALAR);
- else if ((((v->pm->node.flags & PM_ARRAY) && !(flags & ASSPM_AUGMENT)) ||
+ created = 1;
+ } else if ((((v->pm->node.flags & PM_ARRAY) && !(flags & ASSPM_AUGMENT)) ||
(v->pm->node.flags & PM_HASHED)) &&
!(v->pm->node.flags & (PM_SPECIAL|PM_TIED)) &&
unset(KSHARRAYS)) {
unsetparam(t);
createparam(t, PM_SCALAR);
+ /* not regarded as a new creation */
v = NULL;
}
- else
- flags &= ~ASSPM_WARN_CREATE;
}
if (!v && !(v = getvalue(&vbuf, &t, 1))) {
unqueue_signals();
@@ -2955,7 +2956,7 @@ assignsparam(char *s, char *val, int flags)
return NULL;
}
if (flags & ASSPM_WARN)
- check_warn_pm(v->pm, "scalar", flags & ASSPM_WARN_CREATE);
+ check_warn_pm(v->pm, "scalar", created);
if (flags & ASSPM_AUGMENT) {
if (v->start == 0 && v->end == -1) {
switch (PM_TYPE(v->pm->node.flags)) {
diff --git a/Test/E01options.ztst b/Test/E01options.ztst
index fd3263a..c265d78 100644
--- a/Test/E01options.ztst
+++ b/Test/E01options.ztst
@@ -1203,6 +1203,18 @@
>association-local
>foo
+ (
+ setopt warnnestedvar
+ () {
+ local var=(one two)
+ () { var=three; }
+ print $var
+ }
+ )
+0:Warn when changing type of nested variable.
+?(anon): scalar parameter var set in enclosing scope in function (anon)
+>three
+
# This really just tests if XTRACE is egregiously broken.
# To test it properly would need a full set of its own.
fn() { print message; }
next prev parent reply other threads:[~2017-01-26 19:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20170119070023epcas3p17d787fb31e7c04d5bcf2231020769b5f@epcas3p1.samsung.com>
2017-01-19 6:54 ` Daniel Shahaf
2017-01-19 9:43 ` Jens Elkner
2017-01-19 9:45 ` Peter Stephenson
2017-01-19 15:47 ` Bart Schaefer
2017-01-19 16:08 ` Peter Stephenson
2017-01-20 5:01 ` Bart Schaefer
2017-01-20 17:19 ` Peter Stephenson
2017-01-22 18:45 ` Bart Schaefer
2017-01-22 19:00 ` Peter Stephenson
2017-01-23 10:09 ` Peter Stephenson
2017-01-23 11:20 ` Daniel Shahaf
2017-01-23 11:37 ` Peter Stephenson
2017-01-25 5:50 ` Daniel Shahaf
2017-01-25 9:24 ` Peter Stephenson
2017-01-25 19:32 ` Daniel Shahaf
2017-01-25 21:50 ` Bart Schaefer
2017-01-29 21:21 ` Daniel Shahaf
2017-01-26 19:43 ` Peter Stephenson [this message]
2017-01-26 20:04 ` Peter Stephenson
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=20170126194328.5aa3d79d@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).