Re: PATCH: perform expansion for precommand modifiers

[Peter Stephenson <p.stephenson@samsung.com>]

On Thu, 27 Apr 2017 16:12:59 -0700
Bart Schaefer <schaefer@brasslantern.com> wrote:
> On Apr 27,  9:40am, Peter Stephenson wrote:
> }
> } +  (\exec /bin/sh -c 'echo Test one'; print Not reached)
> } +  ('exec' /bin/sh -c 'echo Test two'; print Not reached)
> } +0:exec with quotes
> } +>Test one
> } +>Test two
> 
> This isn't testing the right thing.  The complaint was that the -c option
> of exec was treated as a command name if the keyword was quoted.

I think we can fix this by adding a test for that.

> Similarly for "command -p" which now that I try it is still broken:
> 
> torch% \command -p echo
> zsh: command not found: -p

That's nothing to do with the quoting.  I assumed we had a test for -p
without -v or -V, but apparently we don't, so I didn't notice there was
an extra node to remove.

pws

diff --git a/Src/exec.c b/Src/exec.c
index 978a32d..15f663c 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -2824,7 +2824,7 @@ execcmd_exec(Estate state, Execcmd_params eparams,
 		 * Otherwise, just leave marked as BINF_COMMAND
 		 * modifier with no additional action.
 		 */
-		LinkNode argnode, oldnode;
+		LinkNode argnode, oldnode, pnode = NULL;
 		char *argdata, *cmdopt;
 		int has_p = 0, has_vV = 0, has_other = 0;
 		argnode = firstnode(preargs);
@@ -2845,6 +2845,7 @@ execcmd_exec(Estate state, Execcmd_params eparams,
 			     * also traditional behaviour.
 			     */
 			    has_p = 1;
+			    pnode = argnode;
 			    break;
 			case 'v':
 			case 'V':
@@ -2882,6 +2883,12 @@ execcmd_exec(Estate state, Execcmd_params eparams,
 		} else if (has_p) {
 		    /* Use default path */
 		    use_defpath = 1;
+		    /*
+		     * We don't need this node as we're not treating
+		     * "command" as a builtin this time.
+		     */
+		    if (pnode)
+			uremnode(preargs, pnode);
 		}
 		/*
 		 * Else just any trailing
diff --git a/Test/A01grammar.ztst b/Test/A01grammar.ztst
index 37311ce..9625a15 100644
--- a/Test/A01grammar.ztst
+++ b/Test/A01grammar.ztst
@@ -116,9 +116,11 @@
 
   (\exec /bin/sh -c 'echo Test one'; print Not reached)
   ('exec' /bin/sh -c 'echo Test two'; print Not reached)
-0:exec with quotes
+  (\exec -c /bin/sh -c 'echo Test three'; print Not reached)
+0:precommand modifiers with quotes
 >Test one
 >Test two
+>Test three
 
   cat() { echo Function cat executed; }
   command cat && unfunction cat
@@ -126,6 +128,14 @@
 <External command cat executed
 >External command cat executed
 
+  (command -p echo this is output)
+  (\command -p echo this is more output)
+  ('command' -p echo this is yet more output)
+0: command -p without -v or -V
+>this is output
+>this is more output
+>this is yet more output
+
   command -pv cat
   command -pv echo
   command -p -V cat