* PATCH: paramtab abstraction sanity
@ 2015-11-08 20:09 Bart Schaefer
0 siblings, 0 replies; only message in thread
From: Bart Schaefer @ 2015-11-08 20:09 UTC (permalink / raw)
To: zsh-workers
This fixes a few places where the code was ignoring the paramtab accessor
function abstraction, or adds comments explaining why the abstraction is
being bypassed.
diff --git a/Src/builtin.c b/Src/builtin.c
index 0be20a5..18dfdce 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -2334,7 +2334,8 @@ typeset_single(char *cname, char *pname, Param pm, UNUSED(int func),
} else if ((on & PM_LOCAL) && locallevel) {
*subscript = 0;
pm = (Param) (paramtab == realparamtab ?
- gethashnode2(paramtab, pname) :
+ /* getnode2() to avoid autoloading */
+ paramtab->getnode2(paramtab, pname) :
paramtab->getnode(paramtab, pname));
*subscript = '[';
if (!pm || pm->level != locallevel) {
@@ -2825,11 +2826,12 @@ bin_typeset(char *name, char **argv, LinkList assigns, Options ops, int func)
/* Take arguments literally. Don't glob */
while ((asg = getasg(&argv, assigns))) {
HashNode hn = (paramtab == realparamtab ?
- gethashnode2(paramtab, asg->name) :
+ /* getnode2() to avoid autoloading */
+ paramtab->getnode2(paramtab, asg->name) :
paramtab->getnode(paramtab, asg->name));
if (OPT_ISSET(ops,'p')) {
if (hn)
- printparamnode(hn, printflags);
+ paramtab->printnode(hn, printflags);
else {
zwarnnam(name, "no such variable: %s", asg->name);
returnval = 1;
@@ -3319,7 +3321,8 @@ bin_unset(char *name, char **argv, Options ops, int func)
*ss = 0;
}
pm = (Param) (paramtab == realparamtab ?
- gethashnode2(paramtab, s) :
+ /* getnode2() to avoid autoloading */
+ paramtab->getnode2(paramtab, s) :
paramtab->getnode(paramtab, s));
/*
* Unsetting an unset variable is not an error.
diff --git a/Src/params.c b/Src/params.c
index de456c1..3ed771e 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -447,7 +447,7 @@ newparamtable(int size, char const *name)
ht->cmpnodes = strcmp;
ht->addnode = addhashnode;
ht->getnode = getparamnode;
- ht->getnode2 = getparamnode;
+ ht->getnode2 = gethashnode2;
ht->removenode = removehashnode;
ht->disablenode = NULL;
ht->enablenode = NULL;
@@ -869,6 +869,7 @@ createparam(char *name, int flags)
if (name != nulstring) {
oldpm = (Param) (paramtab == realparamtab ?
+ /* gethashnode2() for direct table read */
gethashnode2(paramtab, name) :
paramtab->getnode(paramtab, name));
@@ -3111,7 +3112,8 @@ unsetparam(char *s)
queue_signals();
if ((pm = (Param) (paramtab == realparamtab ?
- gethashnode2(paramtab, s) :
+ /* getnode2() to avoid autoloading */
+ paramtab->getnode2(paramtab, s) :
paramtab->getnode(paramtab, s))))
unsetparam_pm(pm, 0, 1);
unqueue_signals();
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-11-08 20:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-08 20:09 PATCH: paramtab abstraction sanity Bart Schaefer
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).