zsh-workers
 help / color / mirror / code / Atom feed
From: Bart Schaefer <schaefer@brasslantern.com>
To: zsh workers <zsh-workers@zsh.org>
Subject: Re: \## -> x when completing
Date: Thu, 09 Feb 2012 07:37:32 -0800	[thread overview]
Message-ID: <120209073732.ZM31309@torch.brasslantern.com> (raw)
In-Reply-To: <CAHYJk3TqqntLQ5fq6__eWCHp2WA4m7qAYx1VN1XwYXUL0QRPuA@mail.gmail.com>

This gets a bit stream-of-consciousness but maybe that's helpful.

On Feb 8, 11:37pm, Mikael Magnusson wrote:
} Subject: \## -> x when completing
}
} zsh -f
} touch xenon
} autoload compinit; compinit
} setopt globcomplete
} cat \##<tab> -> cat xenon

Hmm.  This is probably happening because the completion internals use
an "x" as a place-holder in some instances.  See the functions
comptils.c:comp_quote, compcore.c:tildequote, and zle_tricky.c:addx,
the latter of which has a big comment explaining what's going on.

However, I think it's more likely compcore.c:set_comp_sep that is the
culprit.  We can find out by changing the 'x' to something else in one
of addx or set_comp_sep and then trying the completion again.

Which reveals that it's neither of those; rather compcore.c:addmatches
is playing funny with us, at line 2302:

2293         if (comppatmatch && *comppatmatch) {
2294             int is = (*comppatmatch == '*');
2295             char *tmp = (char *) zhalloc(2 + llpl + llsl + gfl);
2296 
2297             if (gfl) {
2298                 strcpy(tmp, globflag);
2299                 strcat(tmp, lpre);
2300             } else
2301                 strcpy(tmp, lpre);
2302             tmp[llpl + gfl] = 'x';
2303             strcpy(tmp + llpl + gfl + is, lsuf);
2304 
2305             tokenize(tmp);
2306             remnulargs(tmp);
2307             if (haswilds(tmp)) {
2308                 if (is)
2309                     tmp[llpl + gfl] = Star;
2310                 if ((cp = patcompile(tmp, 0, NULL)))
2311                     haspattern = 1;
2312             }
2313         }

The problem seems to be that remnulargs() has shortened tmp so that
the count (llpl + gfl) is no longer correct.  I believe we can fix
that by moving remnulargs to after line 2309.

Index: Src/Zle/compcore.c
===================================================================
--- Src/Zle/compcore.c	20 Dec 2011 17:13:38 -0000	1.29
+++ Src/Zle/compcore.c	9 Feb 2012 15:33:44 -0000
@@ -2303,10 +2303,10 @@
 		strcpy(tmp + llpl + gfl + is, lsuf);
 
 		tokenize(tmp);
-		remnulargs(tmp);
 		if (haswilds(tmp)) {
 		    if (is)
 			tmp[llpl + gfl] = Star;
+		    remnulargs(tmp);
 		    if ((cp = patcompile(tmp, 0, NULL)))
 			haspattern = 1;
 		}


  reply	other threads:[~2012-02-09 15:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-08 22:37 Mikael Magnusson
2012-02-09 15:37 ` Bart Schaefer [this message]
2012-02-09 16:16   ` Mikael Magnusson
2012-02-09 18:22     ` Bart Schaefer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=120209073732.ZM31309@torch.brasslantern.com \
    --to=schaefer@brasslantern.com \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).