Re: Questions/comments on completion code that arise from PWS's zsh guide

Re: Questions/comments on completion code that arise from PWS's zsh guide

[Sven Wischnowsky]

Bart Schaefer wrote:

> Why does the users-hosts style want `user:host'? Is there a problem with
> the @ sign that I fail to see?

This changes _combination to accept a pattern after the -s
option. Then it changes the places where users-hosts is used to allow
both `user:host' and `user@host'.

Question: should we change the hosts-ports-users style to
`users-hosts-ports' and allow `user@host:port' (although that would
then also allow `user@host@port' because the separator is used for all 
parts)?

Bye
 Sven

diff -ru ../z.old/Completion/Base/_combination Completion/Base/_combination
--- ../z.old/Completion/Base/_combination	Fri Feb 25 11:15:31 2000
+++ Completion/Base/_combination	Fri Feb 25 14:07:16 2000
@@ -55,6 +55,9 @@
 if [[ "$1" = -s ]]; then
   sep="$2"
   shift 2
+elif [[ "$1" = -s* ]]; then
+  sep="${1[3,-1]}"
+  shift
 else
   sep=:
 fi
@@ -81,9 +84,9 @@
 if zstyle -a ":completion:${curcontext}:$tag" "$style" tmp; then
   eval "tmp=( \"\${(@M)tmp:#\${(j($sep))~pats}}\" )"
   if (( keys[(in:num:)$key] != 1 )); then
-    eval "tmp=( \${tmp#\${(j(${sep}))~\${(@)\${(@)keys[2,(rn:num:)\$key]}/*/*}}$sep} )"
+    eval "tmp=( \${tmp#\${(j(${sep}))~\${(@)\${(@)keys[2,(rn:num:)\$key]}/*/*}}${~sep}} )"
   fi
-  tmp=( ${tmp%%$sep*} )
+  tmp=( ${tmp%%${~sep}*} )
 
   compadd "$@" - $tmp || { (( $+functions[_$key] )) && "_$key" "$@" }
 else
diff -ru ../z.old/Completion/User/_rlogin Completion/User/_rlogin
--- ../z.old/Completion/User/_rlogin	Fri Feb 25 11:15:51 2000
+++ Completion/User/_rlogin	Fri Feb 25 14:07:49 2000
@@ -54,21 +54,21 @@
 }
 
 _rlogin_users () {
-  _tags users && _combination my-accounts users-hosts users "$@"
+  _tags users && _combination -s '[:@]' my-accounts users-hosts users "$@"
 }
 
 _rlogin_hosts () {
   _tags hosts &&
       if [[ "$IPREFIX" == *@ ]]; then
-        _combination my-accounts users-hosts "users=${IPREFIX/@}" hosts "$@"
+        _combination -s '[:@]' my-accounts users-hosts "users=${IPREFIX/@}" hosts "$@"
       else
-        _combination my-accounts users-hosts \
+        _combination -s '[:@]' my-accounts users-hosts \
             ${opt_args[-l]:+"users=${opt_args[-l]:q}"} hosts "$@"
       fi
 }
 
 _rlogin_all_hosts () {
-  _tags hosts && _combination my-accounts users-hosts hosts "$@"
+  _tags hosts && _combination -s '[:@]' my-accounts users-hosts hosts "$@"
 }
 
 _rlogin "$@"
diff -ru ../z.old/Completion/User/_ssh Completion/User/_ssh
--- ../z.old/Completion/User/_ssh	Fri Feb 25 11:15:51 2000
+++ Completion/User/_ssh	Fri Feb 25 14:09:23 2000
@@ -223,14 +223,14 @@
 }
 
 _ssh_users () {
-  _combination my-accounts users-hosts users "$@"
+  _combination -s '[:@]' my-accounts users-hosts users "$@"
 }
 
 _ssh_hosts () {
   if [[ "$IPREFIX" == *@ ]]; then
-    _combination my-accounts users-hosts "users=${IPREFIX/@}" hosts "$@"
+    _combination -s '[:@]' my-accounts users-hosts "users=${IPREFIX/@}" hosts "$@"
   else
-    _combination my-accounts users-hosts \
+    _combination -s '[:@]' my-accounts users-hosts \
       ${opt_args[-l]:+"users=${opt_args[-l]:q}"} hosts "$@"
   fi
 }
diff -ru ../z.old/Completion/User/_user_at_host Completion/User/_user_at_host
--- ../z.old/Completion/User/_user_at_host	Fri Feb 25 11:15:52 2000
+++ Completion/User/_user_at_host	Fri Feb 25 14:09:55 2000
@@ -23,8 +23,8 @@
   compset -P 1 '*@'
 
   _wanted -C user-at hosts expl "host for $user" &&
-      _combination "${tag}" users-hosts users="$user" hosts "$expl[@]" "$@"
+      _combination -s '[:@]' "${tag}" users-hosts users="$user" hosts "$expl[@]" "$@"
 else
   _wanted users expl "user" &&
-      _combination "${tag}" users-hosts users -S@ -q "$expl[@]" "$@"
+      _combination -s '[:@]' "${tag}" users-hosts users -S@ -q "$expl[@]" "$@"
 fi
diff -ru ../z.old/Doc/Zsh/compsys.yo Doc/Zsh/compsys.yo
--- ../z.old/Doc/Zsh/compsys.yo	Fri Feb 25 11:15:16 2000
+++ Doc/Zsh/compsys.yo	Fri Feb 25 14:12:59 2000
@@ -1456,7 +1456,8 @@
 )
 item(tt(users-hosts))(
 The values of this style should be of the form
-`var(user)tt(:)var(host)'. It is used for commands that need pairs of
+`var(user)tt(@)var(host)' or `var(user)tt(:)var(host)'. It is used for
+commands that need pairs of
 user- and hostnames. For such commands, only the pairs from this style 
 are used and if, for example, the username is already typed, then only 
 the hostnames for which there is a pair with that username is defined.
@@ -2637,7 +2638,7 @@
 enditem()
 )
 findex(_combination)
-item(tt(_combination) [ tt(-s) var(spec) ] var(tag) var(style) var(specs) ... var(field) var(opts) ...)(
+item(tt(_combination) [ tt(-s) var(pattern) ] var(tag) var(style) var(specs) ... var(field) var(opts) ...)(
 This function is used to complete combinations of values such as pairs 
 of hostnames and usernames. The possible values will be taken from the 
 var(style) whose name is given as the second argument. The first argument
@@ -2652,8 +2653,10 @@
 
 The matches generated will be taken from the value of the style. These 
 values should contain the possible values for the combinations where
-the values for the different fields are separated by colons or the
-character given after the tt(-s) option to tt(_combination).
+the values for the different fields are separated by colons or
+characters matching the pattern given after the tt(-s) option to
+tt(_combination) (normally this is used to define character classes
+like the `tt(-s "[:@]")' used for the tt(users-hosts) style).
 
 Only the values for the requested fields for which the patterns given
 in the `var(field)tt(=)var(pattern)' match the respective fields in

--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de

Re: Questions/comments on completion code that arise from PWS's zsh guide

[Bart Schaefer]

On Feb 25,  2:16pm, Sven Wischnowsky wrote:
} Subject: Re: Questions/comments on completion code that arise from PWS's z
}
} Question: should we change the hosts-ports-users style to
} `users-hosts-ports' and allow `user@host:port' (although that would
} then also allow `user@host@port' because the separator is used for all 
} parts)?

I'd be in favor of that.

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Re: Questions/comments on completion code that arise from PWS's zsh guide

[Tanaka Akira]

In article <200002280936.KAA02281@beta.informatik.hu-berlin.de>,
  Sven Wischnowsky <wischnow@informatik.hu-berlin.de> writes:

> Maybe we should change _telnet, it's really broken for me because it
> doesn't even guess that my telnet supports -l. I think we should
> change the default specs to _arguments. Or are there any telnets
> without a -l option? Tanaka?

Most poor telnet I know is on SunOS 4.

Z:akr@sulfer% telnet -h
-h: unknown host
telnet> 

It supports no options.
-- 
Tanaka Akira

RE: Questions/comments on completion code that arise from PWS's zsh guide

[Andrej Borsenkow]

>
> Maybe we should change _telnet, it's really broken for me because it
> doesn't even guess that my telnet supports -l. I think we should
> change the default specs to _arguments. Or are there any telnets
> without a -l option? Tanaka?
>

Yes, it is broken because it assumes too much about telnet :-) What is -l
anyway?

bor@itsrm2:~%> telnet -h
telnet: Illegal option -- h
Usage: telnet [-7][-8] host [port]

That is the common denominator you can expect (not sure even about -7/-8
options). Anything else should ideally :)) be either autodected or
user-settable.

That applies (sigh) to too many completion functions currently.

/andrej

Re: Questions/comments on completion code that arise from PWS's zsh guide

[Sven Wischnowsky]

Bart Schaefer wrote:

> On Feb 25,  2:16pm, Sven Wischnowsky wrote:
> } Subject: Re: Questions/comments on completion code that arise from PWS's z
> }
> } Question: should we change the hosts-ports-users style to
> } `users-hosts-ports' and allow `user@host:port' (although that would
> } then also allow `user@host@port' because the separator is used for all 
> } parts)?
> 
> I'd be in favor of that.

Good.


Maybe we should change _telnet, it's really broken for me because it
doesn't even guess that my telnet supports -l. I think we should
change the default specs to _arguments. Or are there any telnets
without a -l option? Tanaka?

Bye
 Sven

diff -ru ../z.old/Completion/Base/_combination Completion/Base/_combination
--- ../z.old/Completion/Base/_combination	Mon Feb 28 10:02:50 2000
+++ Completion/Base/_combination	Mon Feb 28 10:17:24 2000
@@ -8,19 +8,19 @@
 #
 # Example: telnet
 #
-#  Assume an user sets the style `hosts-ports-users' as for the my-accounts
+#  Assume an user sets the style `users-hosts-ports' as for the my-accounts
 #  tag:
 #
-#    zstyle ':completion:*:*:telnet:*:my-accounts' hosts-ports-users \
-#      host0:: host1::user1 host2::user2
-#      mail-server:{smtp,pop3}:
-#      news-server:nntp:
-#      proxy-server:8000:
+#    zstyle ':completion:*:*:telnet:*:my-accounts' users-hosts-ports \
+#      @host0: user1@host1: user2@host2:
+#      @mail-server:{smtp,pop3}
+#      @news-server:nntp
+#      @proxy-server:8000
 # 
 #
 #  `_telnet' completes hosts as:
 #
-#    _combination my-accounts hosts-ports-users \
+#    _combination my-accounts users-hosts-ports \
 #      ${opt_args[-l]:+users=${opt_args[-l]:q}} \
 #      hosts "$expl[@]"
 #
@@ -30,7 +30,7 @@
 # 
 #  `_telnet' completes ports as:
 #
-#    _combination my-accounts hosts-ports-users \
+#    _combination my-accounts users-hosts-ports \
 #      ${opt_args[-l]:+users=${opt_args[-l]:q}} \
 #      hosts="${line[2]:q}" \
 #      ports "$expl[@]"
@@ -41,7 +41,7 @@
 #
 #  `_telnet' completes users for an argument of option `-l' as:
 #
-#    _combination my-accounts hosts-ports-users \
+#    _combination my-accounts users-hosts-ports \
 #      ${line[2]:+hosts="${line[2]:q}"} \
 #      ${line[3]:+ports="${line[3]:q}"} \
 #      users "$expl[@]"
diff -ru ../z.old/Completion/Builtins/_zstyle Completion/Builtins/_zstyle
--- ../z.old/Completion/Builtins/_zstyle	Mon Feb 28 10:02:53 2000
+++ Completion/Builtins/_zstyle	Mon Feb 28 10:33:46 2000
@@ -30,7 +30,7 @@
   hidden		 c:bool
   hosts			 c:_hosts
   hosts-ports		 c:host-port
-  hosts-ports-users	 c:host-port-user
+  users-hosts-ports	 c:user-host-port
   ignore-parents         c:ignorepar
   ignored-patterns	 c:
   insert-unambiguous	 c:bool
@@ -155,15 +155,24 @@
           _expand _list _menu _oldlist
       ;;
 
-    host-port*)
+    user-host-port)
+      if [[ $PREFIX != *[@:]* ]]; then
+	_users -S @
+      elif [[ $PREFIX = *[@:]*[[@:]* ]]; then
+	compset -P 2 '*[:@]'
+	_ports
+      else
+	compset -P 1 '*[:@]'
+	_hosts -S :
+      fi
+      ;;
+
+    host-port)
       if [[ $PREFIX != *:* ]]; then
 	_hosts -S :
-      elif [[ $ostate != *user || $PREFIX != *:*:* ]]; then
+      else
 	compset -P 1 '*:'
 	_ports
-      else
-	compset -P 2 '*:'
-        _users
       fi
       ;;
 
@@ -197,11 +206,11 @@
       ;;
 
     user-host)
-      if [[ $PREFIX = *:* ]]; then
-	compset -P '*:'
+      if [[ $PREFIX = *[@:]* ]]; then
+	compset -P '*[@:]'
 	_hosts
       else
-	_users
+	_users -S @
       fi
       ;;
 
diff -ru ../z.old/Completion/User/_telnet Completion/User/_telnet
--- ../z.old/Completion/User/_telnet	Mon Feb 28 10:03:10 2000
+++ Completion/User/_telnet	Mon Feb 28 10:32:13 2000
@@ -47,14 +47,14 @@
 case "$state" in
 hosts)
   _wanted hosts expl host &&
-      _combination '' hosts-ports-users \
+      _combination -s '[@:]' '' users-hosts-ports \
           ${opt_args[-l]:+users=${opt_args[-l]:q}} \
           hosts "$expl[@]"
   ;;
 
 ports)
   _wanted ports expl port &&
-      _combination '' hosts-ports-users \
+      _combination -s '[@:]' '' users-hosts-ports \
           ${opt_args[-l]:+users=${opt_args[-l]:q}} \
           hosts="${line[1]:q}" \
           ports "$expl[@]"
@@ -62,7 +62,7 @@
 
 users)
   _wanted users expl user &&
-      _combination '' hosts-ports-users \
+      _combination -s '[@:]' '' users-hosts-ports \
       ${line[2]:+hosts="${line[2]:q}"} \
       ${line[3]:+ports="${line[3]:q}"} \
       users "$expl[@]"
diff -ru ../z.old/Doc/Zsh/compsys.yo Doc/Zsh/compsys.yo
--- ../z.old/Doc/Zsh/compsys.yo	Mon Feb 28 09:08:57 2000
+++ Doc/Zsh/compsys.yo	Mon Feb 28 10:24:16 2000
@@ -935,10 +935,6 @@
 example, the hostname is already typed, only those ports will be
 completed for which pairs with the hostname from the line exist.
 )
-item(tt(hosts-ports-users))(
-Like tt(hosts-ports) but used for commands like tt(telnet) and
-containing strings of the form `var(host)tt(:)var(port)tt(:)var(user)'.
-)
 item(tt(ignore-parents))(
 When completing files it is possible to make names of directories
 already mentioned on the line or the current working directory be
@@ -1468,6 +1464,10 @@
 commands such as tt(talk) and tt(finger) and should contain other
 people's accounts. Finally, this may also be used by some commands with
 the tt(accounts) tag.
+)
+item(tt(users-hosts-ports))(
+Like tt(users-hosts) but used for commands like tt(telnet) and
+containing strings of the form `var(user)tt(@)var(host)tt(:)var(port)'.
 )
 item(tt(verbose))(
 This is used in several contexts to decide if only a simple or a

--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de

Re: Questions/comments on completion code that arise from PWS's zsh guide

[Bart Schaefer]

On Feb 24,  9:51am, Sven Wischnowsky wrote:
} Subject: Re: Questions/comments on completion code that arise from PWS's z
}
} Bart Schaefer wrote:
} 
} > Completing files after `=' is enabled for `dd' even if `magicequalsubst'
} > is not set -- but of course tilde-expansion doesn't happen when the
} > command is finally executed unless `magicequalsubst' IS set.
} 
} Hm, right. One solution would be to add a new option to _path_files
} [...] But a better solution might to just make _path_files check [...]
} Hrm, just make _path_files add a warning to the list?

This isn't really a _path_files problem, is it?  It's the caller that
has put the `=' into IPREFIX.  I suppose it could produce a warning as
a courtesy, but it's really not _path_files job to figure out what that
equal sign means.  For all it knows, the command to which the x=y arg
is being passed is one that is able to expand the tilde internally.

Why don't we have _dd expand the tilde when magicequalsubst is not set,
and leave _path_files alone?

} > No one has ever explained adequately why accept-and-infer-next-history
} > is overloaded in menu-selection, rather than accept-and-menu-complete.
} 
} I once had this idea of adding dummy widgets in the complist module,
} like menu-select-{up,down,...,accept} and so on. The problem is that I 
} would also like to automatically allow users to continue using their
} bindkeys if, for example, they happen to have reverse-menu-complete on 
} some key.

Hmmm ... so the issue really is that the entire notions of both "accept"
and "history" have been overloaded when menu-selection is active.  OK, I
drop the complaint for now ....

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Re: Questions/comments on completion code that arise from PWS's zsh guide

[Sven Wischnowsky]

Bart Schaefer wrote:

> These are mostly things I've been wondering about for a while, but
> reading their descriptions all in one place has set me off.
> 
> Completing files after `=' is enabled for `dd' even if `magicequalsubst'
> is not set -- but of course tilde-expansion doesn't happen when the
> command is finally executed unless `magicequalsubst' IS set.

Hm, right. One solution would be to add a new option to _path_files
saying that it shouldn't complete ~/... But a better solution might to 
just make _path_files check if $IPREFIX ends is not empty and if it
is, only complete after `~' if it ends with a `=' and magicequalsubst
is set. But then... it will always be the user's fault if there is a
tilde in such a place. Hrm, just make _path_files add a warning to the 
list?

> No one has ever explained adequately why accept-and-infer-next-history
> is overloaded in menu-selection, rather than accept-and-menu-complete.
> If it's to preserve accept-and-menu-complete's semantics of starting
> a new completion at the current level, then what about preserving the
> semantics of accept-and-infer-next-history? Why preempt an existing
> widget at all? Just to keep somebody from binding the new one in the
> wrong keymap? (The "history" in there bugs me, it has nothing to do
> with history.) At least choose one that no one would reasonably want to
> invoke in the middle of menu-selection, perhaps even "menu-complete"
> itself!

Hm. First: as the manual says (see? I *did* explain it -- almost),
accept-and-menu-complete and accept-and-hold make the selected match
be kept and selection be continued -- just what a-a-m-c normally does.
I once had this idea of adding dummy widgets in the complist module,
like menu-select-{up,down,...,accept} and so on. The problem is that I 
would also like to automatically allow users to continue using their
bindkeys if, for example, they happen to have reverse-menu-complete on 
some key.

> Why doesn't _multi_parts accept and pass through the -f option of
> compadd?

_multi_parts was added when we wrote the function for tar and there it 
simply won't work (I mean the list_types bit). But yes, we could
easily change that... see the patch below.

> Why does the users-hosts style want `user:host'? Is there a problem with
> the @ sign that I fail to see?

That part of the guide made me think about it, too. As far as I can
see, it shouldn't be too hard to change _combinations to allow this.


Bye
 Sven

diff -ru ../z.old/Completion/Core/_multi_parts Completion/Core/_multi_parts
--- ../z.old/Completion/Core/_multi_parts	Wed Feb 23 14:43:41 2000
+++ Completion/Core/_multi_parts	Thu Feb 24 09:49:35 2000
@@ -15,7 +15,7 @@
 
 zparseopts -D -a sopts \
     'J:=group' 'V:=group' 'X:=expl' 'P:=opts' 'F:=opts' \
-    S: r: R: q 1 2 n 'M+:=match' 'i=imm'
+    S: r: R: q 1 2 n f 'M+:=match' 'i=imm'
 
 sopts=( "$sopts[@]" "$opts[@]" )
 if (( $#match )); then
diff -ru ../z.old/Doc/Zsh/compsys.yo Doc/Zsh/compsys.yo
--- ../z.old/Doc/Zsh/compsys.yo	Wed Feb 23 14:43:23 2000
+++ Doc/Zsh/compsys.yo	Thu Feb 24 09:50:00 2000
@@ -2121,7 +2121,7 @@
 like completing pathnames, the tt(-i) option should not be used.
 
 Like other utility functions, this function accepts the `tt(-V)',
-`tt(-J)', `tt(-1)', `tt(-2)', `tt(-n)', `tt(-X)', `tt(-M)', `tt(-P)',
+`tt(-J)', `tt(-1)', `tt(-2)', `tt(-n)', `tt(-f)', `tt(-X)', `tt(-M)', `tt(-P)',
 `tt(-S)', `tt(-r)', `tt(-R)', and `tt(-q)' options and passes them to
 the tt(compadd) builtin.
 )

--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de

Questions/comments on completion code that arise from PWS's zsh guide

[Bart Schaefer]

These are mostly things I've been wondering about for a while, but
reading their descriptions all in one place has set me off.

Completing files after `=' is enabled for `dd' even if `magicequalsubst'
is not set -- but of course tilde-expansion doesn't happen when the
command is finally executed unless `magicequalsubst' IS set.

No one has ever explained adequately why accept-and-infer-next-history
is overloaded in menu-selection, rather than accept-and-menu-complete.
If it's to preserve accept-and-menu-complete's semantics of starting
a new completion at the current level, then what about preserving the
semantics of accept-and-infer-next-history? Why preempt an existing
widget at all? Just to keep somebody from binding the new one in the
wrong keymap? (The "history" in there bugs me, it has nothing to do
with history.) At least choose one that no one would reasonably want to
invoke in the middle of menu-selection, perhaps even "menu-complete"
itself!

Why doesn't _multi_parts accept and pass through the -f option of
compadd?

Why does the users-hosts style want `user:host'? Is there a problem with
the @ sign that I fail to see?

I'm sure I'll have more of these ... I haven't started section 6.7 yet.

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com