Changeset fc12f05 for tests/io

Timestamp:

Nov 13, 2023, 3:43:43 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

25f2798

Parents:

0030b508 (diff), 2174191 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests/io

Files:

• .expect/manipulatorsInput.arm64.txt (modified) (1 diff)
• .expect/manipulatorsInput.x64.txt (modified) (1 diff)
• .expect/manipulatorsInput.x86.txt (modified) (1 diff)
• .expect/manipulatorsOutput4.txt (modified) (1 diff)
• manipulatorsOutput4.cfa (modified) (2 diffs)

tests/io/.expect/manipulatorsInput.arm64.txt

@@ -24 +24 @@
 3 abcxxx
 4 aaaaaaaa
-5 aaaaaaaa
+5
 6 aabbccbb
 7 dddwww
-8 dddwww
-9 dddwww
+8
+9
 10 aaaaaaaa
 11 wwwwwwww
-12 wwwwwwww
-13 wwwwwwww
+12
+13
 14 cccc
 15

tests/io/.expect/manipulatorsInput.x64.txt

@@ -24 +24 @@
 3 abcxxx
 4 aaaaaaaa
-5 aaaaaaaa
+5
 6 aabbccbb
 7 dddwww
-8 dddwww
-9 dddwww
+8
+9
 10 aaaaaaaa
 11 wwwwwwww
-12 wwwwwwww
-13 wwwwwwww
+12
+13
 14 cccc
 15

tests/io/.expect/manipulatorsInput.x86.txt

@@ -24 +24 @@
 3 abcxxx
 4 aaaaaaaa
-5 aaaaaaaa
+5
 6 aabbccbb
 7 dddwww
-8 dddwww
-9 dddwww
+8
+9
 10 aaaaaaaa
 11 wwwwwwww
-12 wwwwwwww
-13 wwwwwwww
+12
+13
 14 cccc
 15

tests/io/.expect/manipulatorsOutput4.txt

@@ -225 +225 @@
 -1.55051464826854e+28 -15.5051e27 -15.5051e27   -15.505e27   -15.505e27 -15.50515e27 -15.50515e27 -0015.505e27 -0015.505e27 -15.50515e27 -15.50515e27 -15.505e27   -15.505e27   -15.50515e27 -15.50515e27 -15.505e27   -15.505e27   -15.50515e27 -15.50515e27
 -6.51216152272788e+29 -651.216e27 -651.216e27   -651.22e27   -651.22e27 -651.21615e27 -651.21615e27 -00651.22e27 -00651.22e27 -651.21615e27 -651.21615e27 -651.22e27   -651.22e27   -651.21615e27 -651.21615e27 -651.22e27   -651.22e27   -651.21615e27 -651.21615e27
+0 1 1 1.0 1
+1 2 2 2.0 2
+2 4 4 4.0 4
+3 8 8 8.0 8
+4 16 16 16.0 16
+5 32 32 32.0 32
+6 64 64 64.0 64
+7 128 128 128.0 128
+8 256 256 256.0 256
+9 512 512 512.0 512
+10 1024 1.024K 1.0K 1K
+11 2048 2.048K 2.0K 2K
+12 4096 4.096K 4.1K 4K
+13 8192 8.192K 8.2K 8K
+14 16384 16.384K 16.4K 16K
+15 32768 32.768K 32.8K 33K
+16 65536 65.536K 65.5K 66K
+17 131072 131.072K 131.1K 131K
+18 262144 262.144K 262.1K 262K
+19 524288 524.288K 524.3K 524K
+20 1048576 1.04858M 1.0M 1M
+21 2097152 2.09715M 2.1M 2M
+22 4194304 4.1943M 4.2M 4M
+23 8388608 8.38861M 8.4M 8M
+24 16777216 16.7772M 16.8M 17M
+25 33554432 33.5544M 33.6M 34M
+26 67108864 67.1089M 67.1M 67M
+27 134217728 134.218M 134.2M 134M
+28 268435456 268.435M 268.4M 268M
+29 536870912 536.871M 536.9M 537M
+30 1073741824 1.07374G 1.1G 1G
+31 2147483648 2.14748G 2.1G 2G

tests/io/manipulatorsOutput4.cfa

@@ -7 +7 @@
 // Created On       : Tue Apr 13 17:55:02 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Apr 13 18:00:33 2021
-// Update Count     : 4
+// Last Modified On : Tue Oct 17 08:37:42 2023
+// Update Count     : 5
 // 
 
@@ -42 +42 @@
                          | left(ws(12,5, eng(w) )) | left(sign(ws(12,5, eng(w) ))) | left(wd(12,5, eng(w) )) | left(sign(wd(12,5, eng(w) ))) | left(pad0(ws(12,5, eng(w) ))) | left(pad0(sign(ws(12,5, eng(w) )))) | left(pad0(wd(12,5, eng(w) ))) | left(pad0(sign(wd(12,5, eng(w) ))));
         } // for
+
+        for ( exp; sizeof(int) * 8 ) {
+                size_t pow2 = 1z << exp;
+                sout | exp | pow2 | unit(eng(pow2)) | wd(0,1, unit(eng( pow2 ))) | wd(0,0, unit(eng(pow2)));
+        } // for
 } // main