Index: tests/io/.expect/manipulatorsOutput1.x64.txt =================================================================== --- tests/io/.expect/manipulatorsOutput1.x64.txt (revision d86e81422396169f518c31c2671901a695cdf139) +++ tests/io/.expect/manipulatorsOutput1.x64.txt (revision 0effb6a0cb50458d87e129f0bb8c9608ba98fe44) @@ -29,11 +29,11 @@ float 0 3 3.00000 3.537 3.537 4 4. 3.5 3.5 3 3.5 3.5 +3.5 +3.5 000003.5 3.54E+00 0x1.c5p+1 0X1.C5P+1 3.54e+00 -0. 3.000000 3.000000 3.537 3.537000 4 4 3.5 3.5 3. 3.5 3.5 +3.5 +3.5 000003.5 3.54E+00 0x1.c5p+1 0X1.C5P+1 3.54e+00 +0. 3. 3 3.537 3.537 4. 4 3.5 3.5 3. 3.5 3.5 +3.5 +3.5 000003.5 3.54E+00 0x1.c5p+1 0X1.C5P+1 3.54e+00 double -0 3.000000 3.537 3.537000 4. 4 3.54 3.54 +3.54 00003.54 3.54E+00 0x1.c5p+1 0X1.C5P+1 3.54e+00 -0. 3.000000 3.537 3.537000 4 4. 3.54 3.54 +3.54 00003.54 3.54E+00 0x1.c5p+1 0X1.C5P+1 3.54e+00 +0 3 3.00000 3.537 3.537 4 4. 3.5 3.5 3 3.5 3.5 +3.5 +3.5 000003.5 3.54E+00 0x1.c5p+1 0X1.C5P+1 3.54e+00 +0. 3. 3 3.537 3.537 4. 4 3.5 3.5 3. 3.5 3.5 +3.5 +3.5 000003.5 3.54E+00 0x1.c5p+1 0X1.C5P+1 3.54e+00 long double -0 3.000000 3.537 3.537000 4. 4 3.54 3.54 +3.54 00003.54 3.54E+00 0xe.26p-2 0XE.26P-2 3.54e+00 -0. 3.000000 3.53699999999999992 3.537000 4 4. 3.54 3.54 +3.54 00003.54 3.54E+00 0xe.26p-2 0XE.26P-2 3.54e+00 +0 3 3.00000 3.537 3.537 4 4. 3.5 3.5 3 3.5 3.5 +3.5 +3.5 000003.5 3.54E+00 0xe.26p-2 0XE.26P-2 3.54e+00 +0. 3. 3 3.53699999999999992 3.537 4. 4 3.5 3.5 3. 3.5 3.5 +3.5 +3.5 000003.5 3.54E+00 0xe.26p-2 0XE.26P-2 3.54e+00 char Index: tests/io/.expect/manipulatorsOutput2.x64.txt =================================================================== --- tests/io/.expect/manipulatorsOutput2.x64.txt (revision d86e81422396169f518c31c2671901a695cdf139) +++ tests/io/.expect/manipulatorsOutput2.x64.txt (revision 0effb6a0cb50458d87e129f0bb8c9608ba98fe44) @@ -9,13 +9,14 @@ -0x1.b8p+4 -0x1.b8p+4 -0xd.cp+1 0.000000e+00 2.750000e+01 -2.750000e+01 +0e0 27.5e0 -27.5e0 0B11011 0X1B 2.75E-09 0X1.B8P+4 11011 33 1b 0. 0 27. 27 27.5 -+27 -27 +27 -27 +27.5 -27.5 ++27 -27 +27. -27. +27.5 -27.5 34 34 34 - 4.000000 4.000000 4.000000 + 4. 4. 4. ab ab ab 34567 34567 34567 -3456.000000 3456.000000 3456.000000 +3456. 3456. 3456. abcde abcde abcde 034 0034 0000000034 @@ -24,5 +25,5 @@ 27.500 27.5 28. 27.50000000 27.000 27.500 27.5 28. 27.50000000 -27 27.000000 27.500000 027 27.500 +27 27. 27.5 027 27.500 234.567 234.57 234.6 235. 234567. 2.3457e+05 2.346e+05 2.35e+05 Index: tests/io/manipulatorsOutput1.cfa =================================================================== --- tests/io/manipulatorsOutput1.cfa (revision d86e81422396169f518c31c2671901a695cdf139) +++ tests/io/manipulatorsOutput1.cfa (revision 0effb6a0cb50458d87e129f0bb8c9608ba98fe44) @@ -7,6 +7,6 @@ // Created On : Sat Jun 8 18:04:11 2019 // Last Modified By : Peter A. Buhr -// Last Modified On : Fri May 1 11:51:44 2020 -// Update Count : 9 +// Last Modified On : Sat Apr 10 08:42:15 2021 +// Update Count : 18 // @@ -85,16 +85,17 @@ sout | "double"; double d = 3.537; - printf( "%g %#8f %g %8f %#8.0f %8.0f %8.2f %-8.2f %-+#8.2f %08.2F %8.2E %8.2a %8.2A %8.2e\n", - 0.0, 3.0, d, d, d, d, d, d, d, d, d, d, d, d ); - sout | 0.0 | wd(8, 3.0) | d | wd(8, d) | nodp(wd(8,0, d)) | wd(8,0, d) | wd(8,2, d) | nonl; - sout | left(wd(8,2, d)) | left(sign(wd(8,2, d))) | pad0(upcase(wd(8,2, d))) | upcase(wd(8,2, sci(d))) | wd(8,2, hex(d)) | upcase(wd(8,2, hex(d))) | wd(8,2, sci(d)); + printf( "%g %8g %#8g %g %8g %8.0g %#8.0g %8.2g %#8.2g %-8.2g %-8.2g %-#8.2g %-+8.2g %-+#8.2g %08.2g %8.2E %8.2a %#8.2A %#8.2e\n", + 0.0, 3.0, 3.0, d, d, d, d, d, d, 3.0, d, d, d, d, d, d, d, d, d ); + sout | 0.0 | wd(8, 3.0) | nodp(wd(8, 3.0)) | d | wd(8, d) | ws(8,0, d) | nodp(ws(8,0, d)) | ws(8,2, d) | nodp(ws(8,2, d)) | nonl; + sout | left(ws(8,2, 3.0)) | left(ws(8,2, d)) | left(nodp(ws(8,2, d))) | left(sign(ws(8,2, d))) | left(sign(nodp(ws(8,2, d)))) | nonl; + sout | pad0(ws(8,2, d)) | upcase(wd(8,2, sci(d))) | wd(8,2, hex(d)) | upcase(wd(8,2, hex(d))) | nodp(wd(8,2, sci(d))); sout | "long double"; long double ld = 3.537; - printf( "%Lg %#8Lf %Lg %8Lf %#8.0Lf %8.0Lf %8.2Lf %-8.2Lf %-+#8.2Lf %08.2LF %8.2LE %8.2La %8.2LA %8.2Le\n", - 0.0L, 3.0L, ld, ld, ld, ld, ld, ld, ld, ld, ld, ld, ld, ld ); - sout | 0.0L | wd(8, 3.0L) | ld | wd(8, ld) | nodp(wd(8,0, ld)) | wd(8,0, ld) | wd(8,2, ld) | nonl; - sout | left(wd(8,2, ld)) | left(sign(wd(8,2, ld))) | pad0(upcase(wd(8,2, ld))) | upcase(wd(8,2, sci(ld))) | wd(8,2, hex(ld)) | upcase(wd(8,2, hex(ld))) | wd(8,2, sci(ld)); - + printf( "%Lg %8Lg %#8Lg %Lg %8Lg %8.0Lg %#8.0Lg %8.2Lg %#8.2Lg %-8.2Lg %-8.2Lg %-#8.2Lg %-+8.2Lg %-+#8.2Lg %08.2Lg %8.2LE %8.2La %#8.2LA %#8.2Le\n", + 0.0L, 3.0L, 3.0L, ld, ld, ld, ld, ld, ld, 3.0L, ld, ld, ld, ld, ld, ld, ld, ld, ld ); + sout | 0.0L | wd(8, 3.0L) | nodp(wd(8, 3.0L)) | ld | wd(8, ld) | ws(8,0, ld) | nodp(ws(8,0, ld)) | ws(8,2, ld) | nodp(ws(8,2, ld)) | nonl; + sout | left(ws(8,2, 3.0L)) | left(ws(8,2, ld)) | left(nodp(ws(8,2, ld))) | left(sign(ws(8,2, ld))) | left(sign(nodp(ws(8,2, ld)))) | nonl; + sout | pad0(ws(8,2, ld)) | upcase(wd(8,2, sci(ld))) | wd(8,2, hex(ld)) | upcase(wd(8,2, hex(ld))) | nodp(wd(8,2, sci(ld))); sout | nl | "char"; @@ -117,4 +118,4 @@ // Local Variables: // // tab-width: 4 // -// compile-command: "cfa -Wall -Wextra amanipulatorsOutput1.cfa" // +// compile-command: "cfa -Wall -Wextra manipulatorsOutput1.cfa" // // End: // Index: tests/io/manipulatorsOutput2.cfa =================================================================== --- tests/io/manipulatorsOutput2.cfa (revision d86e81422396169f518c31c2671901a695cdf139) +++ tests/io/manipulatorsOutput2.cfa (revision 0effb6a0cb50458d87e129f0bb8c9608ba98fe44) @@ -7,6 +7,6 @@ // Created On : Sat Jun 8 18:04:11 2019 // Last Modified By : Peter A. Buhr -// Last Modified On : Sun Nov 15 08:11:53 2020 -// Update Count : 9 +// Last Modified On : Sat Apr 10 09:16:09 2021 +// Update Count : 11 // @@ -24,4 +24,5 @@ sout | hex(-27.5F) | hex(-27.5) | hex(-27.5L); sout | sci(0.0) | sci(27.5) | sci(-27.5); + sout | eng(0.0) | eng(27.5) | eng(-27.5); sout | upcase(bin(27)) | upcase(hex(27)) | upcase(27.5e-10) | upcase(hex(27.5)); sout | nobase(bin(27)) | nobase(oct(27)) | nobase(hex(27));