_cvs(&_arguments) bug

_cvs(&_arguments) bug

[Felix Rosencrantz]

There is a bug with the _cvs completion functions.  Though, I would also
say it is also bug in _arguments.

The problem occurs with the functions _cvs_update & _cvs_checkout.
The problem is that the "-A" flag does not get completed for these
sub-commands, when it should be.  The reason is that the intended "-A"
specification is being interpreted as a flag to _arguments, rather than
as a specification.

The fix is easy for the _cvs_* functions; just move the intended -A
specifications from the front of the list.

Though, I think _arguments should also be modified to provide a way to say that
there is an end to the flags being given to _arguments, and the specifications
are starting.  It's an easy mistake to make.

-FR.

__________________________________________________
Do You Yahoo!?
Send your FREE holiday greetings online!
http://greetings.yahoo.com

Re: _cvs(&_arguments) bug

[Sven Wischnowsky]

Felix Rosencrantz wrote:

> There is a bug with the _cvs completion functions.  Though, I would also
> say it is also bug in _arguments.
> 
> The problem occurs with the functions _cvs_update & _cvs_checkout.
> The problem is that the "-A" flag does not get completed for these
> sub-commands, when it should be.  The reason is that the intended "-A"
> specification is being interpreted as a flag to _arguments, rather than
> as a specification.
> 
> The fix is easy for the _cvs_* functions; just move the intended -A
> specifications from the front of the list.
> 
> Though, I think _arguments should also be modified to provide a way to say that
> there is an end to the flags being given to _arguments, and the specifications
> are starting.  It's an easy mistake to make.

Yes, I've been thinking the same some time ago, but couldn't find a
good `marker' that can be used to separate the _arguments-options from
the specifications.  Any ideas?


Bye
  Sven

-- 
Sven Wischnowsky                           wischnow@berkom.de

Re: _cvs(&_arguments) bug

[Bart Schaefer]

On Jan 8,  4:15pm, Sven Wischnowsky wrote:
}
} Felix Rosencrantz wrote:
} 
} > Though, I think _arguments should also be modified to provide a way to
} > say that there is an end to the flags being given to _arguments, and the
} > specifications are starting.  It's an easy mistake to make.
} 
} Yes, I've been thinking the same some time ago, but couldn't find a
} good `marker' that can be used to separate the _arguments-options from
} the specifications.  Any ideas?

I always wondered about the wisdom of making `--' mean something other
than "end of the _arguments options."

Just pick another option character; -e or -E or -: or some such.

And document it in a less-well-hidden spot.  The -A might be less likely to
cause such problems with the following patch:

Index: Doc/Zsh/compsys.yo
===================================================================
RCS file: /extra/cvsroot/zsh/zsh-4.0/Doc/Zsh/compsys.yo,v
retrieving revision 1.13
diff -c -r1.13 compsys.yo
--- Doc/Zsh/compsys.yo	2002/01/07 15:18:21	1.13
+++ Doc/Zsh/compsys.yo	2002/01/08 17:05:05
@@ -2955,7 +2955,7 @@
 different name for the argument context field.
 )
 findex(_arguments)
-item(tt(_arguments) var(spec) ...)(
+item(tt(_arguments) [ tt(-ACS) ] [ tt(-O) var(name) ] [ tt(-M) var(matchspec) ] var(spec) ...)(
 This function can be used to complete words on the line by describing the
 options and arguments which may be passed to the command for which
 completion is being performed.  The description is given as arguments to


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

Zsh: http://www.zsh.org | PHPerl Project: http://phperl.sourceforge.net   

Re: _cvs(&_arguments) bug

[Sven Wischnowsky]

Felix Rosencrantz wrote:

> ...
> 
> Though, I think _arguments should also be modified to provide a way to say that
> there is an end to the flags being given to _arguments, and the specifications
> are starting.  It's an easy mistake to make.

Here is a patch. It uses `:' as the separator-argument (separating
options to _Arguments from specs). I hope that's ok for everyone, if
not it can easily be changed.

The patch neither cleans up the docs for _arguments nor changes it
functions using _Arguments to make use of `:'. Didn't have the time,
sorry.


Bye
  Sven

Index: Doc/Zsh/compsys.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/compsys.yo,v
retrieving revision 1.144
diff -u -r1.144 compsys.yo
--- Doc/Zsh/compsys.yo	12 Feb 2002 17:25:23 -0000	1.144
+++ Doc/Zsh/compsys.yo	18 Feb 2002 14:30:59 -0000
@@ -2996,12 +2996,15 @@
 different name for the argument context field.
 )
 findex(_arguments)
-item(tt(_arguments) [ tt(-ACS) ] [ tt(-O) var(name) ] [ tt(-M) var(matchspec) ] var(spec) ...)(
+item(tt(_arguments) [ tt(-ACS) ] [ tt(-O) var(name) ] [ tt(-M) var(matchspec) ] [ tt(:) ] var(spec) ...)(
 This function can be used to complete words on the line by describing the
 options and arguments which may be passed to the command for which
 completion is being performed.  The description is given as arguments to
 this function, with each var(spec) describing one option or normal
-argument of the command.  The forms of var(spec) understood are:
+argument of the command.  To separate these var(spec)s from the
+options given to tt(_arguments) itself, they can be preceeded by an
+argument containing a single colon.  The forms of var(spec)
+understood are:
 
 startitem()
 xitem(var(n)tt(:)var(message)tt(:)var(action))
Index: Src/Zle/computil.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/computil.c,v
retrieving revision 1.75
diff -u -r1.75 computil.c
--- Src/Zle/computil.c	7 Feb 2002 08:40:03 -0000	1.75
+++ Src/Zle/computil.c	18 Feb 2002 14:31:00 -0000
@@ -1065,6 +1065,8 @@
 
 	args++;
     }
+    if (*args && !strcmp(*args, ":"))
+        args++;
     if (!*args)
 	return NULL;
 

-- 
Sven Wischnowsky                          wischnow@berkom.de

Re: _cvs(&_arguments) bug

[Felix Rosencrantz]

I wouldn't mind "-:" or "---".  I really don't like -E or dash followed by any
letter, where it could accidentally be confused again.  Whatever, solution, it
should be something that couldn't accidentally be confused.

I've been big on automatically generating _arguments calls, and would like any
solution to be something that can be applied in brain dead manner without
problem.

The _argument docs could use a little reorganizing.

-FR.

__________________________________________________
Do You Yahoo!?
Send FREE video emails in Yahoo! Mail!
http://promo.yahoo.com/videomail/

Re: _cvs(&_arguments) bug

[Felix Rosencrantz]

Thanks Sven.  A single colon works for me.  I previously posted a patch that
fixed the problem in _cvs by reordering the arguments, so _cvs no longer has
the bug I hit.  I have some pending patches for _cvs that I want to submit
at some point.  Maybe I'll add in colons for _cvs, also.  But it might be a
while before I have time...

-FR.

__________________________________________________
Do You Yahoo!?
Yahoo! Sports - Coverage of the 2002 Olympic Games
http://sports.yahoo.com