Re: PATCH: completion for hosts and character classes

Re: PATCH: completion for hosts and character classes

[Sven Wischnowsky]

I wrote:

> -
> +set -x

Ahem.

Bye
 Sven

diff -u oc/Core/_expand Completion/Core/_expand
--- oc/Core/_expand	Fri Jul  2 15:06:51 1999
+++ Completion/Core/_expand	Fri Jul  2 15:06:55 1999
@@ -57,7 +57,7 @@
 #    `%o' in this string will be replaced by the original string.
 
 local exp word="$PREFIX$SUFFIX" group=-V
-set -x
+
 # Do this only for the first global matcher.
 
 [[ "$compstate[matcher]" -le 1 ]] || return 1

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

Re: PATCH: completion for hosts and character classes

[Sven Wischnowsky]

Oliver Kiddle wrote:

> The other part of the patch is
> to complete the character classes like [:blank:]. This seems to work but
> as with my other attempts to patch _subscript, will probably need a bit
> of tidying up.

Using a rather dirty trick ;-) I would never had thought of that...

There is a small problem because it doesn't work with `[:<TAB>'
because without any characters before the `[' this isn't recognised as 
a subscript. The only solution I can see for this now would be to put
some code into _first, but somehow I don't feel like doing that...

While testing the above I found a little buglet in _expand which
insisted on expand `[:' to `[:(N)'.

Bye
 Sven

diff -u oc/Core/_expand Completion/Core/_expand
--- oc/Core/_expand	Fri Jul  2 11:34:39 1999
+++ Completion/Core/_expand	Fri Jul  2 11:42:44 1999
@@ -57,7 +57,7 @@
 #    `%o' in this string will be replaced by the original string.
 
 local exp word="$PREFIX$SUFFIX" group=-V
-
+set -x
 # Do this only for the first global matcher.
 
 [[ "$compstate[matcher]" -le 1 ]] || return 1
@@ -88,7 +88,7 @@
 # as the original string, we let other completers run.
 
 [[ $#exp -eq 0 ||
-   ( $#exp -eq 1 && "$exp[1]" = "$word" ) ]] && return 1
+   ( $#exp -eq 1 && "$exp[1]" = "$word"(|\(N\)) ) ]] && return 1
 
 # We have expansions, should we menucomplete them?
 

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

Re: PATCH: completion for hosts and character classes

[Peter Stephenson]

Oliver Kiddle wrote:
> > I must have forgotten about that.  But we probably need more sophisticated
> > ways of generating host names from all sorts of different sources.
> > /etc/hosts isn't all that well used any more.
> 
> Have you got any suggestions for other ways of generating a hosts list.
> The only cases I can think of where there won't be a hosts file is if
> NIS is being used or if the computer is a nameserver itself. It's quite
> easy to generate a list of hosts in each of these cases but I'm not
> quite sure how to determine when these are the case.

It's actually years since I've consciously used a machine with a useful
/etc/hosts file, now that DNS is so widespread.  The way I generate a hosts
variable is by looking at .netrc or .rhosts or .ncftp/bookmarks, depending
how I feel when I write .zshrc.  This gets a much more personalised set of
hosts. 

> PS. If the patch doesn't work, check that none of the lines have been
> wrapped.

You should try and make sure you can create shorter lines by using
backslashes, or send it uuencoded or with mime quoting.

By the way, it's high time I pointed out that sending me a copy of a
message going to any of the zsh lists is futile as they get sorted into the
same folder and I just have to delete one.

Also, I'm working on compinstall, but I'm logged in from a maddening PC
terminal at a conference, so it will have to wait until the weekend.

Also, since I'm out of time, I'd also be quite glad to see some neater code
for keymaps.  Obviously this will be after 3.1.6.  If improvements can be
split into smaller chunks, that would help testing.

-- 
Peter Stephenson <pws@ibmth.df.unipi.it>       Tel: +39 050 844536
WWW:  http://www.ifh.de/~pws/
Dipartimento di Fisica, Via Buonarroti 2, 56127 Pisa, Italy

PATCH: completion for hosts and character classes

[Oliver Kiddle]

On 21 Jun, Peter Stephenson wrote:
> Oliver Kiddle wrote:
> > BTW, the _hosts change which I sent last Friday (and which isn't in pws-23)
> > doesn't work with my hosts file at home so I'll send a replacement later in
> > the week.

My mistake was using \t in the pattern to match tabs which ofcourse
doesn't work. The patch which follows uses [:blank:] and works with all
the host files I've tried. I've also included a patch for
compctl-examples which generated hosts and groups arrays, using the old
method with lots of (@). Interestingly, the replacements seem to be
noticeably faster (on my slow computer). The other part of the patch is
to complete the character classes like [:blank:]. This seems to work but
as with my other attempts to patch _subscript, will probably need a bit
of tidying up.
 
> I must have forgotten about that.  But we probably need more sophisticated
> ways of generating host names from all sorts of different sources.
> /etc/hosts isn't all that well used any more.

Have you got any suggestions for other ways of generating a hosts list.
The only cases I can think of where there won't be a hosts file is if
NIS is being used or if the computer is a nameserver itself. It's quite
easy to generate a list of hosts in each of these cases but I'm not
quite sure how to determine when these are the case.

In some contexts, we'll probably want to do something totally different
for completing hosts. For example, with ncftp, using the bookmarks and
for urls using the Netscape/Lynx bookmarks or history file.

Oliver Kiddle

PS. If the patch doesn't work, check that none of the lines have been
wrapped.

*** Completion/User/_hosts.old	Tue Apr 13 08:37:40 1999
--- Completion/User/_hosts	Thu Jul  1 13:58:17 1999
***************
*** 1,3 ****
! #compdef ftp ncftp ping rwho rup xping traceroute nslookup
  
! compgen -k hosts
--- 1,5 ----
! #compdef ftp ncftp ping rwho rup xping traceroute nslookup telnet
xhost
  
! : ${(A)hosts:=${(s:
:)${(ps:\t:)${${(f)"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}}
! 
! compgen -M 'm:{a-zA-Z}={A-Za-z} r:|.=* r:|=*' -k hosts
*** Misc/compctl-examples.old	Thu Jul  1 13:48:33 1999
--- Misc/compctl-examples	Thu Jul  1 13:52:16 1999
***************
*** 11,17 ****
  # page.
  #
 
#------------------------------------------------------------------------------
! hosts=("${(@)${(@s: :)${(@s:	:)${(@)${(@f)$(</etc/hosts)}%%\#*}#*[ 
]*}}:#}")
  ports=( "${(@)${(@)${(@f)$(</etc/services)}:#\#*}%%[ 	]*}" )
  
  # groups=( $(cut -d: -f1 /etc/group) )
--- 11,17 ----
  # page.
  #
 
#------------------------------------------------------------------------------
! hosts=( ${(s:
:)${(ps:\t:)${${(f)"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}} )
  ports=( "${(@)${(@)${(@f)$(</etc/services)}:#\#*}%%[ 	]*}" )
  
  # groups=( $(cut -d: -f1 /etc/group) )
***************
*** 18,25 ****
  # groups=( $(ypcat group.byname | cut -d: -f1) ) # if you use NIS
  
  # It can be done without forking, but it used too much memory in old
zsh's:
! groups=( "${(@)${(@f)$(</etc/group)}%%:*}" )
! #groups=( "${(@)${(@f)$(ypcat groups)}%%:*}" ) # if you use NIS
  
  # Completion for zsh builtins.
  compctl -z -P '%' bg
--- 18,25 ----
  # groups=( $(ypcat group.byname | cut -d: -f1) ) # if you use NIS
  
  # It can be done without forking, but it used too much memory in old
zsh's:
! groups=( ${${(s: :)$(</etc/group)}%%:*} )
! #groups=( ${${(s: :)$(ypcat groups)}%%:*} ) # if you use NIS
  
  # Completion for zsh builtins.
  compctl -z -P '%' bg
*** Completion/Base/_subscript.old	Mon Jun 21 13:25:51 1999
--- Completion/Base/_subscript	Thu Jul  1 14:41:54 1999
***************
*** 1,6 ****
  #compdef -subscript-
  
! if [[ ${(Pt)${compstate[parameter]}} = assoc* ]]; then
    if [[ "$RBUFFER" = \]* ]]; then
      compadd -S '' - "${(@kP)${compstate[parameter]}}"
    else
--- 1,9 ----
  #compdef -subscript-
  
! if [[ "$PREFIX" = :* ]]; then
!   compadd -p: -S ':]' alnum alpha blank cntrl digit graph lower print
punct \
!       space upper xdigit
! elif [[ ${(Pt)${compstate[parameter]}} = assoc* ]]; then
    if [[ "$RBUFFER" = \]* ]]; then
      compadd -S '' - "${(@kP)${compstate[parameter]}}"
    else