Changeset 6c12fd28 for tests/manipulatorsOutput3.cfa

Timestamp:

May 8, 2020, 2:42:45 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

5c581cc

Parents:

dd4e2d7 (diff), 0dedf027 (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

File:

• tests/manipulatorsOutput3.cfa (modified) (4 diffs)

tests/manipulatorsOutput3.cfa

@@ -52 +52 @@
     sout | left(wd( 10,40, oct(y) )) | 'X';
 
-    y = 123456789;
+    y = 01234567;
     sout | left(wd( 45, 49, oct(y) )) | 'X';
+    y = -y;
+    sout | wd(0, oct(y)) | 'Y';
+    sout | left(wd(0, oct(y))) | 'Y';
     sout | nl;
 
@@ -66 +69 @@
     sout | left(wd( 45,49, upcase(hex(x)) )) | 'X';
 
-    sout | nl | nl;
+    sout | nl;
 
     int128 divisor = 0x4b3b4ca85a86c47a;
     divisor <<= 16;
     divisor += 0x98a224000000000;
+    
+    // base 2
+    sout | "base 2";
+    sout | bin(divisor);
+    sout | upcase(bin(divisor));
+    sout | wd(38, upcase(bin(divisor)));
+    sout | wd(40, upcase(bin(divisor)));
+    sout | wd(40, 38, upcase(bin(divisor)));
+    sout | wd(40, 30, upcase(bin(divisor)));
+    sout | pad0(sign(wd(40, 38, upcase(bin(divisor)))));
+    sout | nl;
+    
+    // oct
+    sout | "base 8";
+    sout | upcase(oct(divisor));
+    sout | wd(38, upcase(oct(divisor)));
+    sout | wd(40, upcase(oct(divisor)));
+    sout | wd(40, 38, upcase(oct(divisor)));
+    sout | wd(40, 30, upcase(oct(divisor)));
+    sout | pad0(sign(wd(40, 38, upcase(oct(divisor)))));
+    sout | nl;
 
-    // base 10
+    // decimal
+    sout | "base 10";
     sout | divisor;
     sout | wd(2, divisor);
@@ -87 +112 @@
     sout | pad0(wd(40, divisor));
     sout | pad0(sign(wd(40,divisor)));
-    
-    // base 2
-    sout | upcase(bin(divisor));
-    sout | wd(38, upcase(bin(divisor)));
-    sout | wd(40, upcase(bin(divisor)));
-    sout | wd(40, 38, upcase(bin(divisor)));
-    sout | wd(40, 30, upcase(bin(divisor)));
-    sout | pad0(sign(wd(40, 38, upcase(bin(divisor)))));
-    
-    // oct
-    sout | upcase(oct(divisor));
-    sout | wd(38, upcase(oct(divisor)));
-    sout | wd(40, upcase(oct(divisor)));
-    sout | wd(40, 38, upcase(oct(divisor)));
-    sout | wd(40, 30, upcase(oct(divisor)));
-    sout | pad0(sign(wd(40, 38, upcase(oct(divisor)))));
+    sout | nl;
     
     // hex
+    sout | "base 16";
     sout | upcase(hex(divisor));
     sout | wd(38, upcase(hex(divisor)));
@@ -111 +122 @@
     sout | wd(40, 30, upcase(hex(divisor)));
     sout | pad0(sign(wd(40, 38, upcase(hex(divisor)))));
+    sout | nl;