mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

49456: clean up detection of private params in nested scopes, update doc

Browse source
This commit is contained in:
Bart Schaefer 2021-10-04 09:02:27 -07:00
parent 99d915330a
commit fa4c88ca25
6 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2021-10-04 Bart Schaefer <schaefer@zsh.org>
* 49456: Doc/Zsh/mod_private.yo, Doc/Zsh/params.yo,
Src/Modules/param_private.c, Src/params.c, Test/V10private.ztst:
clean up detection of private params in nested scopes, update doc
2021-09-28 Oliver Kiddle <opk@zsh.org>
* ivan tkachenko: 49440: Doc/Zsh/expn.yo: Make double-flag

9
Doc/Zsh/mod_private.yo
View file

@ -10,12 +10,16 @@ ifnzman()
startitem()
findex(private)
cindex(private parameter, creating)
item(tt(private) [ {tt(PLUS())|tt(-)}tt(AHUahlprtux) ] \
item(tt(private) [ {tt(PLUS())|tt(-)}tt(AHUahlmrtux) ] \
[ {tt(PLUS())|tt(-)}tt(EFLRZi) [ var(n) ] ] [ var(name)[tt(=)var(value)] ... ])(
The tt(private) builtin accepts all the same options and arguments as tt(local)
(ifzman(zmanref(zshbuiltins))ifnzman(noderef(Shell Builtin Commands))) except
for the `tt(-)tt(T)' option. Tied parameters may not be made private.
The `tt(-)tt(p)' option is presently a no-op because the state of
private parameters cannot reliably be reloaded. This also applies
to printing private parameters with `tt(typeset -p)'.
If used at the top level (outside a function scope), tt(private) creates a
normal parameter in the same manner as tt(declare) or tt(typeset). A
warning about this is printed if tt(WARN_CREATE_GLOBAL) is set
@ -75,7 +79,8 @@ itemiz(Within any other function called by the declaring function, the
private parameter does em(NOT) hide other parameters of the same name, so
for example a global parameter of the same name is visible and may be
assigned or unset. This includes calls to anonymous functions, although
that may also change in the future.)
that may also change in the future. However, the private name may not be
created outside the local scope when it was not previously declared.)
itemiz(An exported private remains in the environment of inner scopes but
appears unset for the current shell in those scopes. Generally, exporting
private parameters should be avoided.)

8
Doc/Zsh/params.yo
View file

@ -632,6 +632,14 @@ In the parameter lists that follow, the mark `<S>' indicates that the
parameter is special. `<Z>' indicates that the parameter does not exist
when the shell initializes in tt(sh) or tt(ksh) emulation mode.
The parameters `tt(!)', `tt(#)', `tt(*)', `tt(-)', `tt(?)', `tt(@)',
`tt($)', `tt(ARGC)', `tt(HISTCMD)', `tt(LINENO)', `tt(PPID)',
`tt(status)', `tt(TTYIDLE)', `tt(zsh_eval_context)',
`tt(ZSH_EVAL_CONTEXT)', and `tt(ZSH_SUBSHELL)' are read-only and thus
cannot be restored by the user, so they are not output by
`tt(typeset -p)'. This also applies to many read-only parameters loaded
from modules.
The following parameters are automatically set by the shell:
startitem()

12
Src/Modules/param_private.c
View file

@ -125,7 +125,7 @@ makeprivate(HashNode hn, UNUSED(int flags))
break;
}
/* PM_HIDE so new parameters in deeper scopes do not shadow */
pm->node.flags |= (PM_HIDE|PM_SPECIAL|PM_REMOVABLE);
pm->node.flags |= (PM_HIDE|PM_SPECIAL|PM_REMOVABLE|PM_RO_BY_DESIGN);
pm->level -= 1;
}
}
@ -171,7 +171,7 @@ bin_private(char *nam, char **args, LinkList assigns, Options ops, int func)
{
int from_typeset = 1;
int ofake = fakelevel; /* paranoia in case of recursive call */
int hasargs = *args != NULL || (assigns && firstnode(assigns));
int hasargs = /* *args != NULL || */ (assigns && firstnode(assigns));
makeprivate_error = 0;
if (!OPT_ISSET(ops, 'P')) {
@ -190,8 +190,10 @@ bin_private(char *nam, char **args, LinkList assigns, Options ops, int func)
return bin_typeset("private", args, assigns, ops, func);
}
ops->ind['g'] = 2; /* force bin_typeset() to behave as "local" */
if (OPT_ISSET(ops, 'p') || (!hasargs && OPT_ISSET(ops, '+'))) {
if (!(OPT_ISSET(ops, 'm') || OPT_ISSET(ops, '+')))
ops->ind['g'] = 2; /* force bin_typeset() to behave as "local" */
if (OPT_ISSET(ops, 'p') || OPT_ISSET(ops, 'm') ||
(!hasargs && OPT_ISSET(ops, '+'))) {
return bin_typeset("private", args, assigns, ops, func);
}
@ -559,7 +561,7 @@ printprivatenode(HashNode hn, int printflags)
static struct builtin bintab[] = {
/* Copied from BUILTIN("local"), "P" added */
BUILTIN("private", BINF_PLUSOPTS | BINF_MAGICEQUALS | BINF_PSPECIAL | BINF_ASSIGN, (HandlerFunc)bin_private, 0, -1, 0, "AE:%F:%HL:%PR:%TUZ:%ahi:%lprtux", "P")
BUILTIN("private", BINF_PLUSOPTS | BINF_MAGICEQUALS | BINF_PSPECIAL | BINF_ASSIGN, (HandlerFunc)bin_private, 0, -1, 0, "AE:%F:%HL:%PR:%TUZ:%ahi:%lmprtux", "P")
};
static struct features module_features = {

5
Src/params.c
View file

@ -1013,6 +1013,11 @@ createparam(char *name, int flags)
(oldpm->node.flags & PM_SPECIAL) ||
/* POSIXBUILTINS horror: we need to retain 'export' flags */
(isset(POSIXBUILTINS) && (oldpm->node.flags & PM_EXPORTED))) {
if (oldpm->node.flags & PM_RO_BY_DESIGN) {
zerr("%s: can't change parameter attribute",
name);
return NULL;
}
oldpm->node.flags &= ~PM_UNSET;
if ((oldpm->node.flags & PM_SPECIAL) && oldpm->ename) {
Param altpm =

6
Test/V10private.ztst
View file

@ -116,14 +116,14 @@
}
outer () {
local -PA hash_test=(in function)
typeset -p hash_test
private + hash_test
inner
}
outer
print ${(kv)hash_test}
0:private hides value from surrounding scope in nested scope
>typeset -a hash_test=( top level )
>typeset -A hash_test=( [in]=function )
>hash_test=( [in]=function )
>typeset -g -a hash_test=( top level )
>array-local top level
>top level
@ -246,7 +246,7 @@ F:note "typeset" rather than "private" in output from outer
1:privates are not visible in anonymous functions, part 3
>X top level
>array_test not set
?(anon):4: array_test: attempt to assign private in nested scope
?(anon):4: array_test: can't change parameter attribute
F:future revision will create a global with this assignment
typeset -a array_test