* [PATCH] _mkdir, _stat: Use _pick_variant -b
@ 2019-03-20 12:56 Matthew Martin
0 siblings, 0 replies; only message in thread
From: Matthew Martin @ 2019-03-20 12:56 UTC (permalink / raw)
To: zsh-workers
Remove the custom precommand parsing from _mkdir and _stat.
_calendar also inspects precommand; but since it's a function not
a builtin, -b isn't suitable.
- Matthew Martin
---
Completion/Unix/Command/_mkdir | 16 +---------------
Completion/Unix/Command/_stat | 16 +++++-----------
2 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/Completion/Unix/Command/_mkdir b/Completion/Unix/Command/_mkdir
index e4308c304..58d1b8f48 100644
--- a/Completion/Unix/Command/_mkdir
+++ b/Completion/Unix/Command/_mkdir
@@ -9,21 +9,7 @@ args=(
'(-)*: :->directories'
)
-# It can still happen that there is a precommand command or builtin in the line.
-# In such cases, the variant has to be modified suitably, after further checking
-# the variant of the _command_ mkdir.
-#
-# $precommands is defined in _main_complete
-if (( ${+precommands[(r)command]} )); then
- _mkdir_command () { command mkdir "$@" }
- _pick_variant -c _mkdir_command -r variant gnu=gnu unix --help
- unfunction _mkdir_command
-elif (( ${+precommands[(r)builtin]} )) || (( ${+builtins[mkdir]} )) || [[ "$(type -w mkdir)" == "*: builtin" ]]; then
- variant=zsh
-else
- _pick_variant -r variant gnu=gnu zsh='\(eval\)' $OSTYPE --help
-fi
-# Now $variant is set.
+_pick_variant -r variant -b zsh gnu=gnu $OSTYPE --help
case $variant in
gnu|freebsd*|dragonfly*|darwin*)
diff --git a/Completion/Unix/Command/_stat b/Completion/Unix/Command/_stat
index 2e84d6bf0..03b4552de 100644
--- a/Completion/Unix/Command/_stat
+++ b/Completion/Unix/Command/_stat
@@ -6,20 +6,14 @@
# Dragonfly by parsing the output of `lsof -N`, but it's not available by
# default — is there another way?
-local expl variant precmd ret=1
+local expl variant ret=1
local -a context line state state_descr args aopts=( -A '-*' )
local -A opt_args
-if [[ $service == zstat ]] || [[ $precommands[-1] == builtin ]]; then
- variant=zsh
-else
- [[ $precommands[-1] == command ]] && precmd=command
- _pick_variant -c "${precmd:+$precmd }${words[1]}" -r variant \
- gnu='Free Soft' zsh='no files given' unix --version
-fi
+_pick_variant -r variant -b zsh gnu='Free Soft' $OSTYPE --version
-case $OSTYPE-$variant in
- *-zsh)
+case $variant in
+ zsh)
args=(
"(-H)-A[assign the results to array, don't print]:array variable:_parameters -g '*array*'"
- set1
@@ -43,7 +37,7 @@ case $OSTYPE-$variant in
'-l[list stat types]'
)
;;
- *-gnu)
+ gnu)
aopts=( )
args=(
'*: :_files'
--
2.21.0
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-03-20 12:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-20 12:56 [PATCH] _mkdir, _stat: Use _pick_variant -b Matthew Martin
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).