Changeset 44aad8f for tests

Timestamp:

Apr 27, 2020, 4:36:58 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, stuck-waitfor-destruct

Children:

c59a346

Parents:

038be32 (diff), c680a4b (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) (2 diffs)

tests/manipulatorsOutput3.cfa

@@ -1 +1 @@
 #include <fstream.hfa>
 int main() {
-    int128 x = 0xffff;
-    x <<= 64;;
+    int128 x = 0xffff, y = 0x2;
+    x <<= 64;
     x += 0xffff;
+    y <<= 64;
+    y += 0123;
+    y |= 0x8000000000000000;
     x = -x;
     sout | x;
@@ -19 +22 @@
     sout | nl;
 
+    printf( "%#.10o\n", 0123 );
+    sout | wd( 1,10, oct(0123) );
     sout | oct(x);
     sout | nobase(oct(x));
-    sout | wd( 45, upcase(oct(123)) );
-    sout | wd( 45,40, upcase(oct(123)) );
-    sout | wd( 40,45, upcase(oct(123)) );
-    sout | wd( 45, upcase(oct(x)) );
-    sout | wd( 45,40, upcase(oct(x)) );
-    sout | wd( 40,45, upcase(oct(x)) );
-    sout | left(wd( 45, upcase(oct(x)) )) | 'X';
-    int128 y = 123456789;
-    sout | left(wd( 45, 49, upcase(oct(y)) )) | 'X';
+    sout | wd( 45, oct(0123) );
+    sout | wd( 45,40, oct(0123) );
+    sout | wd( 40,45, oct(0123) );
+    sout | wd( 45, oct(x) );
+    sout | wd( 45,40, oct(x) );
+    sout | wd( 40,45, oct(x) );
+
+    sout | left(wd( 45, oct(0123) )) | 'X';
+    sout | left(wd( 45, oct(x) )) | 'X';
+    sout | left(wd( 45, oct(y) )) | 'X';
+    sout | left(wd( 45,40, oct(0123) )) | 'X';
+    sout | left(wd( 45,40, oct(x) )) | 'X';
+    sout | left(wd( 45,40, oct(y) )) | 'X';
+    sout | left(wd( 40,45, oct(0123) )) | 'X';
+    sout | left(wd( 40,45, oct(x) )) | 'X';
+    sout | left(wd( 40,45, oct(y) )) | 'X';
+    printf( "%#-1.10oX\n", 0123 );
+    sout | left(wd( 1,10, oct(0123) )) | 'X';
+    printf( "%#-40.10oX\n", 0123 );
+    sout | left(wd( 40,10, oct(0123) )) | 'X';
+    sout | left(wd( 40,10, oct(x) )) | 'X';
+    sout | left(wd( 40,10, oct(y) )) | 'X';
+    sout | left(wd( 10,40, oct(0123) )) | 'X';
+    sout | left(wd( 10,40, oct(x) )) | 'X';
+    sout | left(wd( 10,40, oct(y) )) | 'X';
+
+    y = 123456789;
+    sout | left(wd( 45, 49, oct(y) )) | 'X';
     sout | nl;