Merge pull request #16 from melloc/assign-expr

Fix issues with assigning during concatenation

bugs-fixed/README

@@ -24,11 +24,18 @@ and also if CONVFMT changed.
 7. unary-plus: Unary plus on a string constant returned the string.
 Instead, it should convert the value to numeric and give that value.
 
-8. missing-precision: When using the format string "%*s", the precision
+8. concat-assign-same: Concatenation previously evaluated both sides of the
+expression before doing its work, which, since assign() evaluates to the cell
+being assigned to, meant that expressions like "print (a = 1) (a = 2)" would
+print "22" rather than "12".
+
+9. missing-precision: When using the format string "%*s", the precision
 argument was used without checking if it was present first.
 
-9. fmt-overflow: The buffer used for OFMT/CONVFMT conversions was written
+10. missing-precision: When using the format string "%*s", the precision
+argument was used without checking if it was present first.
+
+11. fmt-overflow: The buffer used for OFMT/CONVFMT conversions was written
 to with sprintf(), which meant that some conversions could write past the
 end.
 
-

bugs-fixed/concat-assign-same.awk

@@ -0,0 +1,4 @@
+BEGIN {
+    print (a = 1) (a = 2) (a = 3) (a = 4) (a = 5);
+    print (a = 1), (a = 2), (a = 3), (a = 4), (a = 5);
+}

bugs-fixed/concat-assign-same.bad

@@ -0,0 +1,2 @@
+22345
+1 2 3 4 5

bugs-fixed/concat-assign-same.ok

@@ -0,0 +1,2 @@
+12345
+1 2 3 4 5

run.c

@@ -1178,25 +1178,26 @@ Cell *cat(Node **a, int q)	/* a[0] cat a[1] */
 {
 	Cell *x, *y, *z;
 	int n1, n2;
-	char *s;
+	char *s = NULL;
+	int ssz = 0;
 
 	x = execute(a[0]);
+	n1 = strlen(getsval(x));
+	adjbuf(&s, &ssz, n1 + 1, recsize, 0, "cat1");
+	(void) strncpy(s, x->sval, ssz);
+
 	y = execute(a[1]);
-	getsval(x);
+	n2 = strlen(getsval(y));
-	getsval(y);
+	adjbuf(&s, &ssz, n1 + n2 + 1, recsize, 0, "cat2");
-	n1 = strlen(x->sval);
+	(void) strncpy(s + n1, y->sval, ssz - n1);
-	n2 = strlen(y->sval);
+
-	s = (char *) malloc(n1 + n2 + 1);
-	if (s == NULL)
-		FATAL("out of space concatenating %.15s... and %.15s...",
-			x->sval, y->sval);
-	strcpy(s, x->sval);
-	strcpy(s+n1, y->sval);
 	tempfree(x);
 	tempfree(y);
+
 	z = gettemp();
 	z->sval = s;
 	z->tval = STR;
+
 	return(z);
 }