[PATCH] Add glob qualifier grouping operator to completion

[PATCH] Add glob qualifier grouping operator to completion

[Atte Peltomäki]

Also improve wording in documentation to make glob qualifier grouping
easier to find by explicit use of terms 'logical OR' and 'logical AND'.
---
 Completion/Zsh/Type/_globquals | 1 +
 Doc/Zsh/expn.yo                | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Completion/Zsh/Type/_globquals b/Completion/Zsh/Type/_globquals
index bc3165eba..beb47ed30 100644
--- a/Completion/Zsh/Type/_globquals
+++ b/Completion/Zsh/Type/_globquals
@@ -268,6 +268,7 @@ case $state in
     "P:prepend word"
     "Y:+ at most ARG matches"
     "[:+ range of files"
+    ",:logical OR"
     "):end of qualifiers"
     "\::modifier"
     )
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index 7bc736470..742a31870 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -3079,9 +3079,10 @@ so both can be used on the same glob expression; for example by writing
 )
 enditem()
 
-More than one of these lists can be combined, separated by commas. The
-whole list matches if at least one of the sublists matches (they are
-`or'ed, the qualifiers in the sublists are `and'ed).  Some qualifiers,
+Multiple consequtive qualifiers are joined into a list by implicit logical AND.
+More than one of these lists can be combined using comma `tt(,)' as logical OR.
+The whole list matches if at least one of the sublists matches.
+Some qualifiers,
 however, affect all matches generated, independent of the sublist in
 which they are given.  These are the qualifiers `tt(M)', `tt(T)',
 `tt(N)', `tt(D)', `tt(n)', `tt(o)', `tt(O)' and the subscripts given

-- 
Atte Peltomäki
"Your effort to remain what you are is what limits you"

Re: [PATCH] Add glob qualifier grouping operator to completion

[Bart Schaefer]

On Thu, Jul 20, 2023 at 3:52 AM Atte Peltomäki <koston@iki.fi> wrote:
>
> Also improve wording in documentation to make glob qualifier grouping
> easier to find by explicit use of terms 'logical OR' and 'logical AND'.

Not to rule out applying this patch, but I don't suppose anyone is
interested in trying to convert _globquals to use e.g. _sequence so
that comma can be treated as a separator instead of as another
qualifier?  This might require changes in the callers of _globquals.
It might also make it more complicated to generate a description for
comma in the manner of this patch.

While wishlisting, it'd also be nice if typing ")" auto-removed a
trailing comma, because an empty OR-condition is not an "unknown file
attribute" but renders the whole thing moot.