From 02bb3de2575aca2b0e823b96d8281c89a77eba42 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Sun, 4 Sep 2016 21:14:52 +0000 Subject: unposted: internals: Document zshcompwid(1) parameter implementations. --- Src/Zle/comp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Src/Zle/comp.h') diff --git a/Src/Zle/comp.h b/Src/Zle/comp.h index 023c41814..dfac35cfb 100644 --- a/Src/Zle/comp.h +++ b/Src/Zle/comp.h @@ -367,7 +367,7 @@ typedef void (*CLPrintFunc)(Cmgroup, Cmatch *, int, int, int, int); #define CP_QISUFFIX (1 << CPN_QISUFFIX) #define CPN_COMPSTATE 9 #define CP_COMPSTATE (1 << CPN_COMPSTATE) - +/* See comprpms */ #define CP_REALPARAMS 10 #define CP_ALLREALS ((unsigned int) 0x3ff) @@ -424,7 +424,7 @@ typedef void (*CLPrintFunc)(Cmgroup, Cmatch *, int, int, int, int); #define CP_QUOTES (1 << CPN_QUOTES) #define CPN_IGNORED 25 #define CP_IGNORED (1 << CPN_IGNORED) - +/* See compkpms */ #define CP_KEYPARAMS 26 #define CP_ALLKEYS ((unsigned int) 0x3ffffff) -- cgit v1.2.3 From b4d5a55b39399e391132fb15cc47533cc2547991 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Tue, 1 Nov 2016 17:26:10 +0000 Subject: 39804: internal: Document matchspec flags. --- ChangeLog | 3 +++ Src/Zle/comp.h | 6 ++++++ Src/Zle/complete.c | 8 ++++---- 3 files changed, 13 insertions(+), 4 deletions(-) (limited to 'Src/Zle/comp.h') diff --git a/ChangeLog b/ChangeLog index c761eb2c2..f2ec7cc25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2016-11-03 Daniel Shahaf + * 39804: Src/Zle/comp.h, Src/Zle/complete.c: internal: Document + matchspec flags. + * 39803: Src/Zle/complete.c: internal: Document bin_compadd(). * 39802: Src/Zle/compcore.c, Src/Zle/complete.c: internal: diff --git a/Src/Zle/comp.h b/Src/Zle/comp.h index dfac35cfb..14af6173c 100644 --- a/Src/Zle/comp.h +++ b/Src/Zle/comp.h @@ -160,9 +160,15 @@ struct cmatcher { int ralen; /* length of right anchor */ }; +/* Flags for cmatcher::flags */ +/* Upon match, insert the string from the line rather than the string + * from the trial completion ("word"). */ #define CMF_LINE 1 +/* Match with an anchor on the left. */ #define CMF_LEFT 2 +/* Match with an anchor on the right. */ #define CMF_RIGHT 4 +/* ... */ #define CMF_INTER 8 /* diff --git a/Src/Zle/complete.c b/Src/Zle/complete.c index 484754bee..7980518b7 100644 --- a/Src/Zle/complete.c +++ b/Src/Zle/complete.c @@ -249,14 +249,14 @@ parse_cmatcher(char *name, char *s) if (!*s) break; switch (*s) { - case 'b': fl2 = CMF_INTER; + case 'b': fl2 = CMF_INTER; /* FALLTHROUGH */ case 'l': fl = CMF_LEFT; break; - case 'e': fl2 = CMF_INTER; + case 'e': fl2 = CMF_INTER; /* FALLTHROUGH */ case 'r': fl = CMF_RIGHT; break; case 'm': fl = 0; break; - case 'B': fl2 = CMF_INTER; + case 'B': fl2 = CMF_INTER; /* FALLTHROUGH */ case 'L': fl = CMF_LEFT | CMF_LINE; break; - case 'E': fl2 = CMF_INTER; + case 'E': fl2 = CMF_INTER; /* FALLTHROUGH */ case 'R': fl = CMF_RIGHT | CMF_LINE; break; case 'M': fl = CMF_LINE; break; case 'x': break; -- cgit v1.2.3 From 4ad1ad9777d2bb27791043b306b65de62deb5f11 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Tue, 1 Nov 2016 17:26:11 +0000 Subject: 39805: internal: Document some compadd internals. --- ChangeLog | 3 +++ Src/Zle/comp.h | 19 +++++++++---------- Src/Zle/compcore.c | 12 ++++++++++-- 3 files changed, 22 insertions(+), 12 deletions(-) (limited to 'Src/Zle/comp.h') diff --git a/ChangeLog b/ChangeLog index f2ec7cc25..12cf892ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2016-11-03 Daniel Shahaf + * 39805: Src/Zle/comp.h, Src/Zle/compcore.c: internal: Document + some compadd internals. + * 39804: Src/Zle/comp.h, Src/Zle/complete.c: internal: Document matchspec flags. diff --git a/Src/Zle/comp.h b/Src/Zle/comp.h index 14af6173c..3711fde29 100644 --- a/Src/Zle/comp.h +++ b/Src/Zle/comp.h @@ -125,7 +125,7 @@ struct cmatch { #define CMF_REMOVE (1<< 1) /* remove the suffix */ #define CMF_ISPAR (1<< 2) /* is paramter expansion */ #define CMF_PARBR (1<< 3) /* paramter expansion with a brace */ -#define CMF_PARNEST (1<< 4) /* nested paramter expansion */ +#define CMF_PARNEST (1<< 4) /* nested parameter expansion */ #define CMF_NOLIST (1<< 5) /* should not be listed */ #define CMF_DISPLINE (1<< 6) /* display strings one per line */ #define CMF_HIDE (1<< 7) /* temporarily hide this one */ @@ -235,7 +235,6 @@ struct cpattern { * the anchor. */ typedef struct cline *Cline; -typedef struct clsub Clsub; struct cline { Cline next; @@ -291,14 +290,14 @@ struct menuinfo { /* Flags for compadd and addmatches(). */ -#define CAF_QUOTE 1 -#define CAF_NOSORT 2 -#define CAF_MATCH 4 -#define CAF_UNIQCON 8 -#define CAF_UNIQALL 16 -#define CAF_ARRAYS 32 -#define CAF_KEYS 64 -#define CAF_ALL 128 +#define CAF_QUOTE 1 /* compadd -Q: positional arguments already quoted */ +#define CAF_NOSORT 2 /* compadd -V: don't sort */ +#define CAF_MATCH 4 /* compadd without -U: do matching */ +#define CAF_UNIQCON 8 /* compadd -2: don't deduplicate */ +#define CAF_UNIQALL 16 /* compadd -1: deduplicate */ +#define CAF_ARRAYS 32 /* compadd -a or -k: array/assoc parameter names */ +#define CAF_KEYS 64 /* compadd -k: assoc parameter names */ +#define CAF_ALL 128 /* compadd -C: _all_matches */ /* Data for compadd and addmatches() */ diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index f69f68091..fe16c1300 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -1976,6 +1976,11 @@ get_user_var(char *nam) } } +/* + * If KEYS, then NAME is an associative array; return its keys. + * Else, NAME is a plain array; return its elements. + */ + static char ** get_data_arr(char *name, int keys) { @@ -2037,16 +2042,17 @@ addmatch(char *str, int flags, char ***dispp, int line) int addmatches(Cadata dat, char **argv) { + /* ms: "match string" - string to use as completion. + * Overloaded at one place as a temporary. */ char *s, *ms, *lipre = NULL, *lisuf = NULL, *lpre = NULL, *lsuf = NULL; char **aign = NULL, **dparr = NULL, *oaq = autoq, *oppre = dat->ppre; char *oqp = qipre, *oqs = qisuf, qc, **disp = NULL, *ibuf = NULL; char **arrays = NULL; - int lpl, lsl, sl, bcp = 0, bcs = 0, bpadd = 0, bsadd = 0; + int lpl, lsl, bcp = 0, bcs = 0, bpadd = 0, bsadd = 0; int ppl = 0, psl = 0, ilen = 0; int llpl = 0, llsl = 0, nm = mnum, gflags = 0, ohp = haspattern; int isexact, doadd, ois = instring, oib = inbackt; Cline lc = NULL, pline = NULL, sline = NULL; - Cmatch cm; struct cmlist mst; Cmlist oms = mstack; Patprog cp = NULL, *pign = NULL; @@ -2424,6 +2430,7 @@ addmatches(Cadata dat, char **argv) if (dat->psuf) psl = strlen(dat->psuf); for (; (s = *argv); argv++) { + int sl; bpl = obpl; bsl = obsl; if (disp) { @@ -2484,6 +2491,7 @@ addmatches(Cadata dat, char **argv) goto next_array; } if (doadd) { + Cmatch cm; Brinfo bp; for (bp = obpl; bp; bp = bp->next) -- cgit v1.2.3