Re: capturing output of !! not working

[Peter Stephenson <p.w.stephenson@xxxxxxxxxxxx>]

On Fri, 20 Mar 2015 09:04:20 -0700
Bart Schaefer <schaefer@xxxxxxxxxxxxxxxx> wrote:
> Your patch does not entirely resolve the problem -- this works:
> 
> torch% echo $(!!)
> echo $(echo foo bar)
> foo bar
> 
> But this does not:
> 
> torch% echo foo bar
> foo bar
> torch% echo $( !! )
> echo $( echo foo bar )
> zsh: command not found: !!echo

oh for @*!*!'s sake.

As I've noted in the comment, to get this stuff to work cleanly we need
to capture character-by-character input at a level over the history, but
we don't have one and there are probably too many levels anyway.  So
this will have to do --- it's at least fairly obvious what's going on.

pws

diff --git a/Src/hist.c b/Src/hist.c
index b7ef522..f3ab2b5 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -527,10 +527,20 @@ histsubchar(int c)
     static int marg = -1;
     static zlong mev = -1;
     char *buf, *ptr;
-    char *sline;
+    char *sline, *lexraw_mark;
     Histent ehist;
     size_t buflen;
 
+    /*
+     * If accumulating raw input for use in command substitution,
+     * we don't want the history text, so mark it for later removal.
+     * It would be better to do this at a level above the history
+     * and below the lexer --- but there isn't one.
+     *
+     * Include the character we are attempting to substitute.
+     */
+    lexraw_mark = zshlex_raw_mark(-1); 
+
     /* look, no goto's */
     if (isfirstch && c == hatchar) {
 	int gbal = 0;
@@ -864,6 +874,8 @@ histsubchar(int c)
 	}
     }
 
+    zshlex_raw_back_to_mark(lexraw_mark);
+
     /*
      * Push the expanded value onto the input stack,
      * marking this as a history word for purposes of the alias stack.
diff --git a/Src/lex.c b/Src/lex.c
index 1eb0bc7..6b9e942 100644
--- a/Src/lex.c
+++ b/Src/lex.c
@@ -1871,6 +1871,25 @@ zshlex_raw_back(void)
     lexbuf_raw.len--;
 }
 
+/**/
+char *
+zshlex_raw_mark(int offset)
+{
+    if (!lex_add_raw)
+	return NULL;
+    return lexbuf_raw.ptr + offset;
+}
+
+/**/
+void
+zshlex_raw_back_to_mark(char *mark)
+{
+    if (!lex_add_raw)
+	return;
+    lexbuf_raw.len -= lexbuf_raw.ptr - mark;
+    lexbuf_raw.ptr = mark;
+}
+
 /*
  * Skip (...) for command-style substitutions: $(...), <(...), >(...)
  *