mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-04 10:41:11 +02:00
17682: add support for -H and -p in typeset completion
This commit is contained in:
Oliver Kiddle
parent
88adedc1d5
commit
770d437504
3 changed files with 48 additions and 35 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2002-09-16 Oliver Kiddle <opk@zsh.org>
|
||||
|
||||
* Completion/Zsh/Command/_typeset, Doc/Zsh/builtins.yo:
|
||||
add support for -H and -p options to completion
|
||||
|
||||
* 17542 (Thomas Stromberg <thomas@stromberg.org>):
|
||||
Completion/Unix/Command/_mount: most systems don't have /etc/mtab
|
||||
|
||||
2002-09-06 Oliver Kiddle <opk@zsh.org>
|
||||
|
||||
* 17632: Completion/Unix/Command/_cvs: add descriptions for keyword
|
||||
|
|
|
|||
|
|
@ -4,42 +4,48 @@ local expl state line func i use curcontext="$curcontext"
|
|||
local -A allargs
|
||||
local -a args
|
||||
|
||||
allargs=( \
|
||||
A '(-E -F -L -R -T -U -Z -a -f -i -m)-A[specify that arguments refer to associative arrays]' \
|
||||
E '(-A -F -L -R -T -U -Z -a -f -i -m)-E[floating point, use engineering notation on output]' \
|
||||
F '(-A -E -L -R -T -U -Z -a -f -i -m)-F[floating point, use fixed point decimal on output]' \
|
||||
L '(-A -E -F -f -i)-L+[left justify and remove leading blanks from value]:width' \
|
||||
R '(-A -E -F -f -i)-R+[right justify and fill with leading blanks]:width' \
|
||||
T '(-A -E -F -a -f -g -h -i -l -m -t)-T[tie scalar to array]' \
|
||||
U '(-A -E -F -i)-U[keep array values unique and suppress alias expansion for functions]' \
|
||||
Uf '(-E -F -i)-U[suppress alias expansion for functions]' \
|
||||
Up '(-E -F -i)-U[keep array values unique]' \
|
||||
Z '(-A -E -F -f -i)-Z+[right justify and fill with leading zeros]:width' \
|
||||
a '(-A -E -F -T -f -i)-a[specify that arguments refer to arrays]' \
|
||||
f '(-A -E -F -L -R -T -Z -a -g -h -i -l -r -x)-f[specify that arguments refer to functions]' \
|
||||
g '(-T -f)-+g[do not restrict parameter to local scope]' \
|
||||
h '(-T -f)-+h[hide parameter]' \
|
||||
i '(-A -E -F -T -f)-+i[represent internally as an integer]' \
|
||||
l '(-T -f)-l[convert the value to lowercase]' \
|
||||
m '(-A -E -F -T -i)-m[treat arguments as patterns]' \
|
||||
r '(-f)-+r[mark parameters as readonly]' \
|
||||
t '(-T)-+t[tag parameters and turn on execution tracing for functions]' \
|
||||
tf '(-T)-+t[turn on execution tracing for functions]' \
|
||||
tp '(-T)-+t[tag parameters]' \
|
||||
u '-u[convert the value to uppercase or mark function for autoloading]' \
|
||||
uf '-u[mark function for autoloadling]' \
|
||||
up '-u[convert the value to uppercase]' \
|
||||
x '(-f)-+x[export parameter]' )
|
||||
allargs=(
|
||||
A '(-E -F -L -R -T -U -Z -a -f -i -m)-A[specify that arguments refer to associative arrays]'
|
||||
E '(-A -F -L -R -T -U -Z -a -f -i -m)-E[floating point, use engineering notation on output]'
|
||||
F '(-A -E -L -R -T -U -Z -a -f -i -m)-F[floating point, use fixed point decimal on output]'
|
||||
L '(-A -E -F -f -i)-L+[left justify and remove leading blanks from value]:width'
|
||||
R '(-A -E -F -f -i)-R+[right justify and fill with leading blanks]:width'
|
||||
T '(-A -E -F -a -f -g -h -i -l -m -t)-T[tie scalar to array]'
|
||||
U '(-A -E -F -i)-U[keep array values unique and suppress alias expansion for functions]'
|
||||
Uf '(-E -F -i)-U[suppress alias expansion for functions]'
|
||||
Up '(-E -F -i)-U[keep array values unique]'
|
||||
Z '(-A -E -F -f -i)-Z+[right justify and fill with leading zeros]:width'
|
||||
a '(-A -E -F -T -f -i)-a[specify that arguments refer to arrays]'
|
||||
f '(-A -E -F -L -R -T -Z -a -g -h -i -l -r -x)-f[specify that arguments refer to functions]'
|
||||
g '(-T -f)-+g[do not restrict parameter to local scope]'
|
||||
h '(-T -f)-+h[hide specialness of parameter]'
|
||||
H '(-T -f)-+H[hide value of parameter in listings]'
|
||||
i '(-A -E -F -T -f)-+i[represent internally as an integer]'
|
||||
l '(-T -f)-l[convert the value to lowercase]'
|
||||
m '(-A -E -F -T -i)-m[treat arguments as patterns]'
|
||||
p '-p[output parameters in form of calls to typeset]'
|
||||
r '(-f)-+r[mark parameters as readonly]'
|
||||
t '(-T)-+t[tag parameters and turn on execution tracing for functions]'
|
||||
tf '(-T)-+t[turn on execution tracing for functions]'
|
||||
tp '(-T)-+t[tag parameters]'
|
||||
u '-u[convert the value to uppercase or mark function for autoloading]'
|
||||
uf '-u[mark function for autoloadling]'
|
||||
up '-u[convert the value to uppercase]'
|
||||
x '(-f)-+x[export parameter]'
|
||||
)
|
||||
|
||||
use="AEFLRTUZafghilmrtux"
|
||||
use="AEFHLRTUZafghilmprtux"
|
||||
|
||||
case ${service} in
|
||||
float) use="EFghlrtux";;
|
||||
float) use="EFHghlprtux";;
|
||||
functions)
|
||||
use="Umtu"
|
||||
func=f
|
||||
;;
|
||||
integer) use="ghilrtux" ;;
|
||||
integer)
|
||||
use="Hghilprtux"
|
||||
allargs[i]='-i[specify arithmetic base for output]' \
|
||||
;;
|
||||
readonly) use="${use/r/}" ;;
|
||||
local) use="${use/f/}" ;&
|
||||
export) use="${${use/g/}/x/}" ;;
|
||||
|
|
@ -49,8 +55,7 @@ esac
|
|||
[[ -z "${words[(r)-*[aA]*]}" ]] || func=p
|
||||
|
||||
for ((i=1;i<=$#use;++i)); do
|
||||
args=( "${args[@]}" \
|
||||
${allargs[${use[$i]}${${(s::)use[$i]}[(r)[Uut]]:+$func}]} )
|
||||
args+=( ${allargs[${use[$i]}${${(s::)use[$i]}[(r)[Uut]]:+$func}]} )
|
||||
done
|
||||
|
||||
_arguments -C -s -A "-*" -S "${args[@]}" '*:vars:->vars_eq'
|
||||
|
|
|
|||
|
|
@ -424,7 +424,7 @@ Bring each specified var(job) in turn to the foreground.
|
|||
If no var(job) is specified, resume the current job.
|
||||
)
|
||||
findex(float)
|
||||
item(tt(float) [ {tt(PLUS())|tt(-)}tt(EFghlprtux) ] [ var(name)[tt(=)var(value)] ... ])(
|
||||
item(tt(float) [ {tt(PLUS())|tt(-)}tt(EFHghlprtux) ] [ var(name)[tt(=)var(value)] ... ])(
|
||||
Equivalent to tt(typeset -E), except that options irrelevant to floating
|
||||
point numbers are not permitted.
|
||||
)
|
||||
|
|
@ -526,7 +526,7 @@ the form of a call to hash.
|
|||
)
|
||||
alias(history)(fc -l)
|
||||
findex(integer)
|
||||
item(tt(integer) [ {tt(PLUS())|tt(-)}tt(ghilprtux) ] [ var(name)[tt(=)var(value)] ... ])(
|
||||
item(tt(integer) [ {tt(PLUS())|tt(-)}tt(Hghilprtux) ] [ var(name)[tt(=)var(value)] ... ])(
|
||||
Equivalent to tt(typeset -i), except that options irrelevant to
|
||||
integers are not permitted.
|
||||
)
|
||||
|
|
@ -625,7 +625,7 @@ sitem([var(mm)tt(:)]var(ss))(minutes and seconds)
|
|||
endsitem()
|
||||
)
|
||||
findex(local)
|
||||
item(tt(local) [ {tt(PLUS())|tt(-)}tt(AEFLRUZahilprtux) [var(n)]] [ var(name)[tt(=)var(value)] ] ...)(
|
||||
item(tt(local) [ {tt(PLUS())|tt(-)}tt(AEFHLRUZahilprtux) [var(n)]] [ var(name)[tt(=)var(value)] ] ...)(
|
||||
Same as tt(typeset), except that the options tt(-g), and
|
||||
tt(-f) are not permitted. In this case the tt(-x) option does not force
|
||||
the use of tt(-g), i.e. exported variables will be local to functions.
|
||||
|
|
@ -1080,7 +1080,7 @@ Equivalent to tt(whence -v).
|
|||
findex(typeset)
|
||||
cindex(parameters, setting)
|
||||
cindex(parameters, declaring)
|
||||
xitem(tt(typeset) [ {tt(PLUS())|tt(-)}tt(AEFLRUZafghilprtuxm) [var(n)]] [ \
|
||||
xitem(tt(typeset) [ {tt(PLUS())|tt(-)}tt(AEFHLRUZafghilprtuxm) [var(n)]] [ \
|
||||
var(name)[tt(=)var(value)] ... ])
|
||||
item(tt(typeset) -T [ {tt(PLUS()|tt(-))}tt(LRUZrux) ] \
|
||||
var(SCALAR)[tt(=)var(value)] var(array))(
|
||||
|
|
|
|||
Loading…
Reference in a new issue