From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-5471-mason-zsh=primenet.com.au@sunsite.auc.dk>
Received: (qmail 23124 invoked from network); 22 Feb 1999 12:56:19 -0000
Received: from sunsite.auc.dk (130.225.51.30)
  by ns1.primenet.com.au with SMTP; 22 Feb 1999 12:56:19 -0000
Received: (qmail 13097 invoked by alias); 22 Feb 1999 12:55:57 -0000
Mailing-List: contact zsh-workers-help@sunsite.auc.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 5471
Received: (qmail 13089 invoked from network); 22 Feb 1999 12:55:55 -0000
Date: Mon, 22 Feb 1999 13:55:03 +0100 (MET)
Message-Id: <199902221255.NAA21899@beta.informatik.hu-berlin.de>
From: Sven Wischnowsky <wischnow@informatik.hu-berlin.de>
To: zsh-workers@sunsite.auc.dk
In-reply-to: "Bart Schaefer"'s message of Sat, 20 Feb 1999 17:17:34 -0800
Subject: Re: Strange associative array stuff in pws-9


Bart Schaefer wrote:

> Has it always been like this?
> 
> zagzig% typeset -A foo
> zagzig% foo[a,b,c]=bar
> zagzig% echo $foo
> bar
> zagzig% echo $foo[a,b,c]
> bar[a,b,c]
> zagzig% echo ${foo[a,b,c]}
> bar
> zagzig% echo $foo['a,b,c'] 
> ['a,b,c']
> zagzig% 

I was fearing that I had broken something, but this was in a piece of
the code I haven't touched...
The loop in getarg() searched for the first comma or closing bracket
even when subscripting an associative array. Since it doesn't make
sense to use ranges for associative arrays (and the docs say that they
are not supported), we should tell the code about it.

Bye
 Sven

--- os/params.c	Mon Feb 22 10:49:22 1999
+++ Src/params.c	Mon Feb 22 13:49:42 1999
@@ -679,11 +679,13 @@
 static long
 getarg(char **str, int *inv, Value v, int a2, long *w)
 {
-    int num = 1, word = 0, rev = 0, ind = 0, down = 0, l, i;
+    int num = 1, word = 0, rev = 0, ind = 0, down = 0, l, i, ishash;
     char *s = *str, *sep = NULL, *t, sav, *d, **ta, **p, *tt;
     long r = 0;
     Comp c;
 
+    ishash = (v->pm && PM_TYPE(v->pm->flags) == PM_HASHED);
+
     /* first parse any subscription flags */
     if (v->pm && (*s == '(' || *s == Inpar)) {
 	int escapes = 0;
@@ -771,12 +773,13 @@
 	} else if (rev) {
 	    v->isarr |= SCANPM_WANTVALS;
 	}
-	if (!down && v->pm && PM_TYPE(v->pm->flags) == PM_HASHED)
+	if (!down && ishash)
 	    v->isarr &= ~SCANPM_MATCHMANY;
 	*inv = ind;
     }
 
-    for (t=s, i=0; *t && ((*t != ']' && *t != Outbrack && *t != ',') || i); t++)
+    for (t=s, i=0;
+	 *t && ((*t != ']' && *t != Outbrack && (ishash || *t != ',')) || i); t++)
 	if (*t == '[' || *t == Inbrack)
 	    i++;
 	else if (*t == ']' || *t == Outbrack)
@@ -791,7 +794,7 @@
     singsub(&s);
 
     if (!rev) {
-	if (v->pm && PM_TYPE(v->pm->flags) == PM_HASHED) {
+	if (ishash) {
 	    HashTable ht = v->pm->gets.hfn(v->pm);
 	    if (!ht) {
 		ht = newparamtable(17, v->pm->nam);
@@ -867,7 +870,7 @@
 
 	if ((c = parsereg(s))) {
 	    if (v->isarr) {
-		if (PM_TYPE(v->pm->flags) == PM_HASHED) {
+		if (ishash) {
 		    scancomp = c;
 		    if (ind)
 			v->isarr |= SCANPM_MATCHKEY;

--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de