From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-request@math.gatech.edu>
Received: (qmail 10927 invoked from network); 3 Oct 1997 12:56:07 -0000
Received: from math.gatech.edu (list@130.207.146.50)
  by ns1.primenet.com.au with SMTP; 3 Oct 1997 12:56:07 -0000
Received: (from list@localhost)
	by math.gatech.edu (8.8.5/8.8.5) id IAA20545;
	Fri, 3 Oct 1997 08:50:54 -0400 (EDT)
Resent-Date: Fri, 3 Oct 1997 08:50:54 -0400 (EDT)
Message-Id: <199710031251.OAA12551@sgi.ifh.de>
To: zsh-workers@math.gatech.edu (Zsh hackers list)
Subject: rcexpandparam fix
Date: Fri, 03 Oct 1997 14:51:29 +0200
From: Peter Stephenson <pws@ifh.de>
Resent-Message-ID: <"_GVh13.0.y05.keEDq"@math>
Resent-From: zsh-workers@math.gatech.edu
X-Mailing-List: <zsh-workers@math.gatech.edu> archive/latest/3547
X-Loop: zsh-workers@math.gatech.edu
Precedence: list
Resent-Sender: zsh-workers-request@math.gatech.edu

This seems to be the minimal fix to the rcexpandparam bug.  I think
the most general way it turned up was when rcexpandparam was set for
an array which expanded to no entries (i.e. not even an empty
string) and when there was some further expansion to be done on the line
(i.e. another parameter substitution further along, or a file substitution
anywhere).  Thus `print ${^*} $*' printed the second $* verbatim, as well
as what I originally reported, that `=ls ${^*}' didn't expand =ls.

This only comes into effect in the case where the rcexpandparam did
fail with a NULL return, and simply setting the node to the empty
string has the correct effect of forcing it to be removed later.
Failure presumably indicates that the array was empty; the current
rules state that that means the whole term with the embedded array
is dropped, so this can't be too far wrong.  The only way I can see
it would go wrong is if the plan9 expansion failed for some other reason
and a NULL should really be returned.  I can't see how that would be
necessary.

*** Src/subst.c.plan9	Mon Aug  4 10:01:57 1997
--- Src/subst.c	Fri Oct  3 14:27:02 1997
***************
*** 1429,1436 ****
  		    insertlinknode(l, n, (void *) y), incnode(n);
  	    }
  	    if (plan9) {
! 		uremnode(l, n);
! 		return NULL;
  	    }
  	} else {
  	    x = aval[0];
--- 1429,1440 ----
  		    insertlinknode(l, n, (void *) y), incnode(n);
  	    }
  	    if (plan9) {
! 		/* hello, I am a (lonely) comment.
! 		 * If we did nothing with plan9 mode, simply
! 		 * make the node empty: it will be removed later.
! 		 */
! 		setdata(n, (void *) dupstring(""));
! 		return n;
  	    }
  	} else {
  	    x = aval[0];

-- 
Peter Stephenson <pws@ifh.de>       Tel: +49 33762 77366
WWW:  http://www.ifh.de/~pws/       Fax: +49 33762 77413
Deutsches Elektronen-Synchrotron --- Institut fuer Hochenergiephysik Zeuthen
DESY-IfH, Platanenallee 6, 15738 Zeuthen, Germany.