Index: tests/.expect/io1.oast.txt
===================================================================
--- tests/.expect/io1.oast.txt	(revision 72c69507cb6bc3c50770545088eaf70248555a6d)
+++ tests/.expect/io1.oast.txt	(revision 72c69507cb6bc3c50770545088eaf70248555a6d)
@@ -0,0 +1,27 @@
+opening delimiters
+x (1 x [2 x {3 x =4 x $5 x £6 x ¥7 x ¡8 x ¿9 x «10
+
+closing delimiters
+1, x 2. x 3; x 4! x 5? x 6% x 7¢ x 8» x 9) x 10] x 11} x
+
+opening/closing delimiters
+x`1`x'2'x"3"x:4:x 5 x	6	x
+7
+x
+8
+x
+9
+x
+10
+x
+
+override opening/closing delimiters
+x ( 1 ) x 2 , x 3 :x: 4
+
+spacing
+0 1 2 3
+0123
+0123
+
+expressions
+9 6 28 0 7 1 2
Index: tests/.expect/io1.txt
===================================================================
--- tests/.expect/io1.txt	(revision d44723898fe033a5caabe13fab2c16251cdba3b1)
+++ 	(revision )
@@ -1,25 +1,0 @@
-9 6 28 0 7 1 2
-0 1 2 3
-0123
-0123
-
-opening delimiters
-x (1 x [2 x {3 x =4 x $5 x £6 x ¥7 x ¡8 x ¿9 x «10
-
-closing delimiters
-1, x 2. x 3; x 4! x 5? x 6% x 7 ¢ x 8 » x 9) x 10] x 11} x
-
-opening/closing delimiters
-x`1`x'2'x"3"x:4:x 5 x	6	x
-7
-x
-8
-x
-9
-x
-10
-x
-
-override opening/closing delimiters
-x ( 1 ) x 2 , x 3 :x: 4
-
Index: tests/.expect/io2.oast.txt
===================================================================
--- tests/.expect/io2.oast.txt	(revision 72c69507cb6bc3c50770545088eaf70248555a6d)
+++ tests/.expect/io2.oast.txt	(revision 72c69507cb6bc3c50770545088eaf70248555a6d)
@@ -0,0 +1,60 @@
+input bacis types
+
+output basic types
+false
+A 23 93
+1 2 3 4 5 6 7 8
+1.1 1.2 1.3
+1.1+2.3i 1.1-2.3i 1.1-2.3i
+
+tuples
+1, 2, 3 4, 5, 6
+
+toggle separator
+1.11.21.3
+1.1+2.3i1.1-2.3i1.1-2.3i
+1.1+2.3i 1.1-2.3i1.1-2.3i
+1.1+2.3i 1.1-2.3i 1.1-2.3i
+1.1+2.3i1.1-2.3i 1.1-2.3i
+abcxyz
+abcxyz
+
+change separator
+from " " to ", $"
+1.1, $1.2, $1.3
+1.1+2.3i, $1.1-2.3i, $1.1-2.3i
+abc, $xyz
+1, 2, 3, $4, 5, 6
+
+from ", $" to " "
+1.1 1.2 1.3
+1.1+2.3i 1.1-2.3i 1.1-2.3i
+abc xyz
+1, 2, 3 4, 5, 6
+
+check sepOn/sepOff
+1 2 3
+12 3
+1 2 3
+1 2 3
+
+1 2 3
+
+check enable/disable
+123
+1 23
+1 2 3
+123
+1 2 3
+123
+1 2 3
+
+1 2 3 4 5 6 " "
+1, 2, 3 4, 5, 6 " "
+1, 2, 3 4, 5, 6
+
+3, 4, a, 7.2
+3, 4, a, 7.2
+3 4 a 7.2
+3 4 a 7.234a7.23 4 a 7.2
+3-4-a-7.2^3^4^3-4-a-7.2
Index: tests/.expect/io2.txt
===================================================================
--- tests/.expect/io2.txt	(revision d44723898fe033a5caabe13fab2c16251cdba3b1)
+++ 	(revision )
@@ -1,60 +1,0 @@
-input bacis types
-
-output basic types
-false
-A 23 93
-1 2 3 4 5 6 7 8
-1.1 1.2 1.3
-1.1+2.3i 1.1-2.3i 1.1-2.3i
-
-tuples
-1, 2, 3 4, 5, 6
-
-toggle separator
-1.11.21.3
-1.1+2.3i1.1-2.3i1.1-2.3i
-1.1+2.3i 1.1-2.3i1.1-2.3i
-1.1+2.3i 1.1-2.3i 1.1-2.3i
-1.1+2.3i1.1-2.3i 1.1-2.3i
-abcxyz
-abcxyz
-
-change separator
-from " " to ", $"
-1.1, $1.2, $1.3
-1.1+2.3i, $1.1-2.3i, $1.1-2.3i
-abc, $xyz
-1, 2, 3, $4, 5, 6
-
-from ", $" to " "
-1.1 1.2 1.3
-1.1+2.3i 1.1-2.3i 1.1-2.3i
-abc xyz
-1, 2, 3 4, 5, 6
-
-check sepOn/sepOff
-1 2 3
-12 3
-1 2 3
-1 2 3
-
-1 2 3
-
-check enable/disable
-123
-1 23
-1 2 3
-123
-1 2 3
-123
-1 2 3
-
-1 2 3 4 5 6 " "
-1, 2, 3 4, 5, 6 " "
-1, 2, 3 4, 5, 6
-
-3, 4, a, 7.2
-3, 4, a, 7.2
-3 4 a 7.2
-3 4 a 7.234a7.23 4 a 7.2
-3-4-a-7.2^3^4^3-4-a-7.2
Index: tests/io1.cfa
===================================================================
--- tests/io1.cfa	(revision d44723898fe033a5caabe13fab2c16251cdba3b1)
+++ tests/io1.cfa	(revision 72c69507cb6bc3c50770545088eaf70248555a6d)
@@ -10,6 +10,6 @@
 // Created On       : Wed Mar  2 16:56:02 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar  4 21:42:47 2019
-// Update Count     : 115
+// Last Modified On : Sun Feb 21 10:07:07 2021
+// Update Count     : 119
 //
 
@@ -17,12 +17,6 @@
 
 int main() {
-	int x = 3, y = 5, z = 7;
-	sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2);
-	sout | 0 | 1 | 2 | 3;
-	sout | '0' | '1' | '2' | '3';
-	sout | 0 | "" | 1 | "" | 2 | "" | 3;
-	sout | nl;
+	sout | nlOff;										// auto nl off
 
-	sout | nlOff;
 	sout | "opening delimiters" | nl;
 	sout | "x (" | 1;
@@ -61,8 +55,19 @@
 	sout | nl | nl;
 
-	sout | nlOn;
+	sout | nlOn;										// auto nl on
+
 	sout | "override opening/closing delimiters";
 	sout | "x ( " | 1 | " ) x" | 2 | " , x" | 3 | " :x: " | 4;
 	sout | nl;
+
+	sout | "spacing";
+	sout | 0 | 1 | 2 | 3;
+	sout | '0' | '1' | '2' | '3';
+	sout | 0 | "" | 1 | "" | 2 | "" | 3;
+	sout | nl;
+
+	sout | "expressions";
+	int x = 3, y = 5, z = 7;
+	sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2);
 }
 
