Index: src/tests/.expect/tupleAssign.txt
===================================================================
--- src/tests/.expect/tupleAssign.txt	(revision 2988eebb61a23bfe28efea59b2bdd2e4fb6028c1)
+++ src/tests/.expect/tupleAssign.txt	(revision 7fe2498de54b785431b0abbd1e1ae3dc01786b82)
@@ -1,6 +1,12 @@
+u=5 v=6 x=10 y=11 z=[100, 200]
 u=5 v=6 x=10 y=11 z=[100, 200]
 u=11 v=10 x=11 y=10 z=[11, 10]
+u=11 v=10 x=11 y=10 z=[11, 10]
+u=10 v=11 z=[10, 11]
 u=10 v=11 z=[10, 11]
 u=123 v=456 z=[111, 222]
-d=-2153.12 i=-2153 c=-105 t=[-2153, -2153.12, -2153]
-d=-2153.12 i=-2153 c=-105 t=[-2153, -2153.12, -2153]
+u=123 v=456 z=[111, 222]
+d=94.12 i=94 c=^ t=[94, 94.12, 94]
+d=94.12 i=94 c=^ t=[94, 94.12, 94]
+d=-94.12 i=-94 c=¢ t=[-94, -94.12, -94]
+d=-94.12 i=-94 c=¢ t=[-94, -94.12, -94]
Index: src/tests/tupleAssign.c
===================================================================
--- src/tests/tupleAssign.c	(revision 2988eebb61a23bfe28efea59b2bdd2e4fb6028c1)
+++ src/tests/tupleAssign.c	(revision 7fe2498de54b785431b0abbd1e1ae3dc01786b82)
@@ -9,8 +9,10 @@
 // Author           : Rob Schluntz
 // Created On       : Tue Nov 15 17:24:32 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Nov 15 17:27:28 2016
-// Update Count     : 3
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Mar  6 21:23:58 2017
+// Update Count     : 34
 //
+
+#include <fstream>
 
 int main() {
@@ -21,18 +23,21 @@
 
 		// swap x, y and store the new [x, y] in [u, v] and in z;
-		printf("u=%d v=%d x=%d y=%d z=[%d, %d]\n", u, v, x, y, z);
+		printf( "u=%d v=%d x=%d y=%d z=[%d, %d]\n", u, v, x, y, z );
+		sout | "u=" | u | "v=" | v | "x=" | x | "y=" | y | "z=[" | z | "]" | endl;
 		z = [u, v] = [x, y] = [y, x];
-		printf("u=%d v=%d x=%d y=%d z=[%d, %d]\n", u, v, x, y, z);
+		printf( "u=%d v=%d x=%d y=%d z=[%d, %d]\n", u, v, x, y, z );
+		sout | "u=" | u | "v=" | v | "x=" | x | "y=" | y | "z=[" | z | "]" | endl;
 
 		// shuffle elements -- v = z.0, z.0 = z.1, z.1 = u, u = v
 		[v, z, u] = [z, u, v];
-		printf("u=%d v=%d z=[%d, %d]\n", u, v, z);
+		printf( "u=%d v=%d z=[%d, %d]\n", u, v, z );
+		sout | "u=" | u | "v=" | v | "z=[" | z | "]" | endl;
 
 		// multiple assignment with tuple expression on right
 		z = [111, 222];
 		[u, v] = [123, 456];
-		printf("u=%d v=%d z=[%d, %d]\n", u, v, z);
+		printf( "u=%d v=%d z=[%d, %d]\n", u, v, z );
+		sout | "u=" | u | "v=" | v | "z=[" | z | "]" | endl;
 	}
-
 	{
 		// test mass assignment
@@ -48,8 +53,10 @@
 		// no conversion from X to integral types, so this serves as a santiy
 		// check that as long as this compiles, ?=?(_, x) is not generated.
-		[t, x, d, i, c, x] = (double)-2153.12;
-		printf("d=%lg i=%d c=%d t=[%d, %lg, %d]\n", d, i, (int)c, t);
-		[x, c, i, d, x, t] = (double)-2153.12;
-		printf("d=%lg i=%d c=%d t=[%d, %lg, %d]\n", d, i, (int)c, t);
+		[t, x, d, i, c, x] = (double)94.12;
+		printf( "d=%lg i=%d c=%c t=[%d, %lg, %d]\n", d, i, (int)c, t );
+		sout | "d=" | d | "i=" | i | "c=" | c | ' ' | "t=[" | t | "]" | endl;
+		[x, c, i, d, x, t] = (double)-94.12;
+		printf( "d=%lg i=%d c=%c t=[%d, %lg, %d]\n", d, i, c, t );
+		sout | "d=" | d | "i=" | i | "c=" | c | ' ' | "t=[" | t | "]" | endl;
 	}
 }