* Re: PATCH: _zmodload
@ 2000-08-21 8:00 Sven Wischnowsky
2000-08-21 8:34 ` Andrej Borsenkow
0 siblings, 1 reply; 4+ messages in thread
From: Sven Wischnowsky @ 2000-08-21 8:00 UTC (permalink / raw)
To: zsh-workers
Oliver Kiddle wrote:
> ...
>
> Well here is the _arguments version and I've also tried to make use of
> the $modules parameter where possible. Is my strategy of retricting the
> arguments to _tags and then completing everything in the while _tags
> loop okay? It seems to work and was the easiest way I could find to
> handle _zmodload seeing as it has all the flags first.
Yes, that's ok. Of course, one could use multiple loops when _zmodload
is changed to complete the things needed by zmodload. E.g. completion
after `zmodload -ac foo <TAB>' completes builtins, which is wrong. The
same for -ap etc.
Another questionable completion is `zmodload -A <TAB>'. That completes
modules files, but we need an alias name (something we can't really
complete at that point, because the user almost certainly wants a new
alias name).
And those builtins completed... offering the builtins currently
defined is a simple solution for a hard problem, but will be wrong in
most cases. For the modules we have currently, the builtins could be
derived with something like `nm <module> | grep bin_'. Unfortunately,
this isn't guaranteed to be correct and won't work for autoloaded
parameters, conditions and so on anyway. Maybe trying to find a .mdd
file and looking at it would be a better solution. Or maybe giving up
and doing what _zmodload does now... sigh.
The patch makes the return value built be used.
Bye
Sven
Index: Completion/Builtins/_zmodload
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Builtins/_zmodload,v
retrieving revision 1.6
diff -u -r1.6 _zmodload
--- Completion/Builtins/_zmodload 2000/08/18 17:21:58 1.6
+++ Completion/Builtins/_zmodload 2000/08/21 07:59:44
@@ -44,3 +44,5 @@
_requested aliases expl 'module alias' \
compadd "$suf[@]" -k 'modules[(R)alias*]' && ret=0
done
+
+return ret
--
Sven Wischnowsky wischnow@informatik.hu-berlin.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: PATCH: _zmodload
2000-08-21 8:00 PATCH: _zmodload Sven Wischnowsky
@ 2000-08-21 8:34 ` Andrej Borsenkow
0 siblings, 0 replies; 4+ messages in thread
From: Andrej Borsenkow @ 2000-08-21 8:34 UTC (permalink / raw)
To: Sven Wischnowsky, zsh-workers
>
> And those builtins completed... offering the builtins currently
> defined is a simple solution for a hard problem, but will be wrong in
> most cases. For the modules we have currently, the builtins could be
> derived with something like `nm <module> | grep bin_'. Unfortunately,
> this isn't guaranteed to be correct and won't work for autoloaded
> parameters, conditions and so on anyway. Maybe trying to find a .mdd
> file and looking at it would be a better solution. Or maybe giving up
> and doing what _zmodload does now... sigh.
>
Or define extra entry point, load module, ask it about autoloaded objects and
unload. This should be the most portable. Or just leave it loaded assuming
that user will need it anyway.
Can it be useful for something else?
-andrej
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: PATCH: _zmodload
2000-08-18 14:43 ` PATCH: _zmodload Oliver Kiddle
@ 2000-08-21 6:04 ` Andrej Borsenkow
0 siblings, 0 replies; 4+ messages in thread
From: Andrej Borsenkow @ 2000-08-21 6:04 UTC (permalink / raw)
To: Oliver Kiddle, zsh-workers
>
> Well here is the _arguments version and I've also tried to make use of
> the $modules parameter where possible. Is my strategy of retricting the
> arguments to _tags and then completing everything in the while _tags
> loop okay? It seems to work and was the easiest way I could find to
> handle _zmodload seeing as it has all the flags first.
>
This lists modules twice - once with extension and once without:
bor@itsrm2% zmodload zsh/cap
Completing module file
cap cap.so* clone clone.so*
compctl compctl.so* complete complete.so*
complist complist.so* computil computil.so*
deltochar deltochar.so* example example.so*
files files.so* mapfile mapfile.so*
mathfunc mathfunc.so* parameter parameter.so*
rlimits rlimits.so* sched sched.so*
stat stat.so* zftp zftp.so*
zle zle.so* zleparameter zleparameter.so*
zprof zprof.so* zpty zpty.so*
zutil zutil.so*
-andrej
^ permalink raw reply [flat|nested] 4+ messages in thread
* PATCH: _zmodload
2000-08-16 9:23 PATCH: $modules (was: Re: Seg fault with zmodload -u) Sven Wischnowsky
@ 2000-08-18 14:43 ` Oliver Kiddle
2000-08-21 6:04 ` Andrej Borsenkow
0 siblings, 1 reply; 4+ messages in thread
From: Oliver Kiddle @ 2000-08-18 14:43 UTC (permalink / raw)
To: zsh-workers
On 16 Aug, Sven wrote:
> Oliver Kiddle wrote:
>
> > On the subject of zmodload completion, how would I prevent the 'module
> > alias' description from being displayed when there are no module
> > aliases
>
> Eh? The description for the aliases should not be displayed when there
> are no matches added for it
That was what I had thought. I've just had a closer look and the problem
was something to do with ${${(f)"$(zmodload -A)"}%% *} returning a
single blank or something when there were no aliases. It's irrelevant
now anyway.
> Anyway. Here is the change to the parameter module to report aliases
> correctly in the $modules parameter. They have values of the form
> `alias:<name>', where <name> is, of course, the aliased-to-name.
>
> No changes to _zmodload. If Oliver is working on the _arguments
> version anyway...
Well here is the _arguments version and I've also tried to make use of
the $modules parameter where possible. Is my strategy of retricting the
arguments to _tags and then completing everything in the while _tags
loop okay? It seems to work and was the easiest way I could find to
handle _zmodload seeing as it has all the flags first.
Shouldn't we maybe have an option to remove module aliases (-u combined
with -A) or have I missed something?
Oliver
--- Completion/Builtins/_zmodload Fri Aug 18 11:26:53 2000
+++ Completion/Builtins/_zmodload Fri Aug 18 16:31:09 2000
@@ -1,21 +1,46 @@
#compdef zmodload
-local fl="$words[2]" expl ret=1
+local suf comp state line expl curcontext="$curcontext" ret=1
+typeset -A opt_args
+suf=()
-if [[ "$fl" = -*(a*u|u*a)* || "$fl" = -*a* && CURRENT -ge 4 ]]; then
- _wanted builtins expl 'builtin command' compadd "$@" -k builtins
-elif [[ "$fl" = -*u* ]]; then
- _wanted modules expl module compadd -k modules
-else
- _tags files aliases
- while _tags; do
- _requested files expl 'module file' \
- _files -W module_path -/g '*.(dll|s[ol])(:r)' && ret=0
- if _requested aliases expl 'module alias'; then
- local array
- array=(${${(f)"$(zmodload -A)"}%% *})
- (( $#array )) && compadd "${expl[@]}" -- $array && ret=0
- fi
- (( ret )) || break
- done
+_arguments -C -A "-*" -s \
+ '(-d -e)-i[suppress error if command would do nothing]' \
+ '-u[unload module]' \
+ '(-i)-d[list or specify module dependencies]' \
+ '(-e)-a[autoload module]' \
+ '(-c -I -p -f)-b[autoload module for builtins]' \
+ '(-b -I -p -f)-c[autoload module for condition codes]' \
+ '(-b -c -p -f)-I[define infix condition names]' \
+ '(-b -c -I -f)-p[autoload module for parameters]' \
+ '(-b -c -I -p)-f[autoload module for math functions]' \
+ '(-i -u -d -a -b -c -p -f -L -A)-e[test if modules are loaded]' \
+ '(-e -u)-L[output in the form of calls to zmodload]' \
+ '(-i -u -d -a -b -c -I -p -f -e)-A[create module aliases]' \
+ '*:params:->params' && ret=0
+
+[[ $state = params ]] || return ret
+
+(( $+opt_args[-A] )) && compset -P '*=' || suf=( -S '=' )
+
+comp=( files aliases )
+if (( $+opt_args[-u] )); then
+ if (( $+opt_args[-b] || $+opt_args[-a] )); then
+ comp=( builtins )
+ else
+ comp=( loadedmodules aliases )
+ fi
fi
+(( $+opt_args[-a] && CURRENT > 3 )) && comp=( builtins )
+
+_tags "$comp[@]"
+while _tags; do
+ _requested builtins expl 'builtin command' \
+ compadd "$@" -k builtins && ret=0
+ _requested loadedmodules expl 'loaded modules' \
+ compadd -k 'modules[(R)loaded]' && ret=0
+ _requested files expl 'module file' \
+ _files -W module_path -/g '*.(dll|s[ol])(:r)' && ret=0
+ _requested aliases expl 'module alias' \
+ compadd "$suf[@]" -k 'modules[(R)alias*]' && ret=0
+done
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2000-08-21 8:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2000-08-21 8:00 PATCH: _zmodload Sven Wischnowsky
2000-08-21 8:34 ` Andrej Borsenkow
-- strict thread matches above, loose matches on Subject: below --
2000-08-16 9:23 PATCH: $modules (was: Re: Seg fault with zmodload -u) Sven Wischnowsky
2000-08-18 14:43 ` PATCH: _zmodload Oliver Kiddle
2000-08-21 6:04 ` Andrej Borsenkow
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).