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

more problems with optional arguments in _arguments (11253)

Browse source
This commit is contained in:
Sven Wischnowsky 2000-05-08 10:37:58 +00:00
parent 9ae8f0fe09
commit cfcb3202ef
3 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2000-05-08 Sven Wischnowsky <wischnow@zsh.org>
* 11253: Completion/Base/_arguments, Src/Zle/computil.c: more
problems with optional arguments in _arguments
* 11248: Src/Zle/compmatch.c: better cursor positioning in words
with multiple ambiguous word parts

6
Completion/Base/_arguments
View file

@ -234,9 +234,8 @@ if (( $# )) && comparguments "$multi[@]" "$autod" "$@"; then
# An empty action means that we should just display a message.
[[ -n "$matched" ]] &&
compadd -n -Q -S '' -s "$SUFFIX" - "$PREFIX"
mesg="$descr"
_message "$descr"
mesg=yes
elif [[ "$action" = \(\(*\)\) ]]; then
@ -361,7 +360,6 @@ if (( $# )) && comparguments "$multi[@]" "$autod" "$@"; then
[[ -n "$aret" ]] && return 300
[[ -n "$mesg" ]] && _message "$mesg"
if [[ -n "$noargs" ]]; then
[[ -z "$ismulti" && nm -eq "$compstate[nmatches]" ]] && _message "$noargs"
else

18
Src/Zle/computil.c
View file

@ -1072,7 +1072,7 @@ struct castate {
Caarg def, ddef;
Caopt curopt;
int opt, arg, argbeg, optbeg, nargbeg, restbeg, curpos;
int inopt, inrest, inarg, nth, doff, singles, oopt;
int inopt, inrest, inarg, nth, doff, singles, oopt, actopts;
LinkList args;
LinkList *oargs;
};
@ -1121,7 +1121,7 @@ ca_parse_line(Cadef d, int multi)
state.nopts = d->nopts;
state.def = state.ddef = NULL;
state.curopt = NULL;
state.argbeg = state.optbeg = state.nargbeg = state.restbeg =
state.argbeg = state.optbeg = state.nargbeg = state.restbeg = state.actopts =
state.nth = state.inopt = state.inarg = state.opt = state.arg = 1;
state.inrest = state.doff = state.singles = state.doff = state.oopt = 0;
state.curpos = compcurrent;
@ -1136,7 +1136,7 @@ ca_parse_line(Cadef d, int multi)
if (!compwords[1]) {
ca_laststate.opt = ca_laststate.arg = 0;
return 0;
goto end;
}
/* Loop over the words from the line. */
@ -1349,6 +1349,13 @@ ca_parse_line(Cadef d, int multi)
}
}
}
end:
ca_laststate.actopts = 0;
for (ptr = d->opts; ptr; ptr = ptr->next)
if (ptr->active)
ca_laststate.actopts++;
return 0;
}
@ -1574,7 +1581,8 @@ bin_comparguments(char *nam, char **args, char *ops, int func)
return 1;
}
case 'O':
if ((ca_laststate.opt || (ca_laststate.doff && ca_laststate.def) ||
if (ca_laststate.actopts &&
(ca_laststate.opt || (ca_laststate.doff && ca_laststate.def) ||
(ca_laststate.def &&
(ca_laststate.def->type == CAA_OPT ||
(ca_laststate.def->type >= CAA_RARGS &&
@ -1632,7 +1640,7 @@ bin_comparguments(char *nam, char **args, char *ops, int func)
}
case 's':
if (ca_laststate.d->single && ca_laststate.singles &&
ca_laststate.opt) {
ca_laststate.actopts > 1 && ca_laststate.opt) {
setsparam(args[1],
ztrdup(ca_laststate.ddef ?
(ca_laststate.ddef->type == CAO_DIRECT ?