PATCH: GLOB_ASSIGN only affects scalar assignments

PATCH: GLOB_ASSIGN only affects scalar assignments

[Mikael Magnusson]

---

isstr is set to (WC_ASSIGN_TYPE(ac) == WC_ASSIGN_SCALAR) a bit above this.
Previously, when setopt globassign was in effect, this would happen,
% typeset -A foo
% foo=(*)
% echo ${(t)foo}
array

when it should still say association, this is what caused _lastcomp to
change type and break completion.

 Src/exec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Src/exec.c b/Src/exec.c
index 007447d..2e996d4 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -2264,14 +2264,14 @@ addvars(Estate state, Wordcode pc, int addflags)
 		state->pc = opc;
 		return;
 	    }
-	    if (!isstr || (isset(GLOBASSIGN) &&
+	    if (!isstr || (isset(GLOBASSIGN) && isstr &&
 			   haswilds((char *)getdata(firstnode(vl)), 0))) {
 		globlist(vl, 0);
 		/* Unset the parameter to force it to be recreated
 		 * as either scalar or array depending on how many
 		 * matches were found for the glob.
 		 */
-		if (isset(GLOBASSIGN))
+		if (isset(GLOBASSIGN) && isstr)
 		    unsetparam(name);
 	    }
 	    if (errflag) {
-- 
2.4.0