Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: PATCH: updated _zstyle and cleanup of related stuff



Only half a dozen years since we switched to sending replies to the originator
instead of the list, so I haven't quite got the hang of it yet...

Oliver wrote:
> I wish multiple glob qualifiers in series (e.g. *(@)(u0)) were allowed
> because it would make it much easier for completion functions to add
> qualifiers to existing globs. I can't remember details off the top of
> my head but I've come across a number of minor problems resulting from
> this.

It's easy (almost trivial, if I've got it right) to fix, but it might cause
other problems --- there may be cases when you don't want anything before
the qualifiers to be indentified as a qualifier.  The usual difficulty is
the other way round --- you want to suppress all qualifiers --- but I'm not
entirely happy with changing it.

It could be controlled by an option, of course.  Turning it on just for the
completion code probably wouldn't be too hairy.

Here's the patch, which I won't commit.

Index: Src/glob.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/glob.c,v
retrieving revision 1.22
diff -u -r1.22 glob.c
--- Src/glob.c	2001/10/08 08:13:11	1.22
+++ Src/glob.c	2002/01/14 13:51:29
@@ -941,7 +941,6 @@
     save_globstate(saved);
 
     str = dupstring(ostr);
-    sl = strlen(str);
     uremnode(list, np);
 
     /* Initialise state variables for current file pattern */
@@ -956,7 +955,8 @@
     gf_sorts = gf_nsorts = 0;
 
     /* Check for qualifiers */
-    if (isset(BAREGLOBQUAL) && str[sl - 1] == Outpar) {
+    while (isset(BAREGLOBQUAL) && (sl = strlen(str)) &&
+	   str[sl - 1] == Outpar) {
 	char *s;
 
 	/* Check these are really qualifiers, not a set of *
@@ -1383,6 +1383,8 @@
 		}
 	    }
 	}
+	else
+	    break;
     }
     q = parsepat(str);
     if (!q || errflag) {	/* if parsing failed */

-- 
Peter Stephenson <pws@xxxxxxx>                  Software Engineer
CSR Ltd., Science Park, Milton Road,
Cambridge, CB4 0WH, UK                          Tel: +44 (0)1223 392070


**********************************************************************
The information transmitted is intended only for the person or
entity to which it is addressed and may contain confidential 
and/or privileged material. 
Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by 
persons or entities other than the intended recipient is 
prohibited.  
If you received this in error, please contact the sender and 
delete the material from any computer.
**********************************************************************



Messages sorted by: Reverse Date, Date, Thread, Author