Changeset cefc59f

Timestamp:

Apr 24, 2020, 12:11:44 PM (5 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:

13099a8b

Parents:

93ace83 (diff), 2a01c9b (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

Files:

• libcfa/src/concurrency/io.cfa (modified) (1 diff)
• libcfa/src/iostream.cfa (modified) (3 diffs)
• tests/manipulatorsOutput3.cfa (modified) (1 diff)

libcfa/src/concurrency/io.cfa

@@ -603 +603 @@
         int async_statx(int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf) {
                 #if !defined(IORING_OP_STATX)
-                        return statx( dirfd, pathname, flags, mask, statxbuf );
+                        //return statx( dirfd, pathname, flags, mask, statxbuf );
+                        return syscall( __NR_io_uring_setup, dirfd, pathname, flags, mask, statxbuf );
                 #else
                         __submit_prelude

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr 22 10:50:46 2020
-// Update Count     : 933
+// Last Modified On : Thu Apr 23 17:33:32 2020
+// Update Count     : 942
 //
 
@@ -593 +593 @@
                                         (ostype &)(os | fmt | "" | fmt2); \
                                 } else if ( f.base == 'o' ) { \
-                                        if ( fmt.flags.pc && fmt.pc > 21 ) fmt.pc -= 21; \
+                                        if ( fmt.flags.pc && fmt.pc > 22 ) fmt.pc -= 22; \
                                         if ( fmt.flags.left ) { \
                                                 fmt.flags.left = false; \
                                                 fmt.wd = 1; \
                                                 fmt.val = (unsigned long long int)fmt.val >> 2; \
+                                                printf( "L %llo %d %d '%c' %x\n", fmt.val, fmt.wd, fmt.pc, fmt.base, fmt.all ); \
                                                 fmt2.wd = 1; \
                                                 fmt2.val = ((msig & 0x3) << 1) + 1; \
@@ -603 +604 @@
                                                 sepOff( os ); \
                                                 fmt2.flags.left = true; \
-                                                fmt2.wd = f.wd - ( ceiling( high1( fmt.val ), 3 ) + 1 ); \
+                                                int msigd = ceiling( high1( fmt.val ), 3 ) + 1; \
+                                                fmt2.wd = f.wd - (fmt.pc > msigd ? fmt.pc : msigd); \
+                                                if ( fmt2.wd < 0 ) fmt2.wd = 21; \
                                                 fmt2.flags.pc = true; fmt2.pc = 21; \
-                                                if ( ! fmt.flags.nobsdp ) { fmt2.wd -= 1; } \
+                                                if ( ! fmt.flags.nobsdp ) { if ( fmt.pc < fmt.wd ) fmt.wd -= 1; else fmt.pc -= 1; } \
                                                 fmt2.val = lsig & 0x7fffffffffffffff; \
                                                 (ostype &)(os | fmt2); \

tests/manipulatorsOutput3.cfa

@@ -19 +19 @@
     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';
+    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,40, oct(0123) )) | 'X';
+    sout | left(wd( 45,40, oct(x) )) | 'X';
+    sout | left(wd( 40,45, oct(0123) )) | 'X';
+    sout | left(wd( 40,45, oct(x) )) | '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( 10,40, oct(0123) )) | 'X';
+    sout | left(wd( 10,40, oct(x) )) | 'X';
+
     int128 y = 123456789;
-    sout | left(wd( 45, 49, upcase(oct(y)) )) | 'X';
+    sout | left(wd( 45, 49, oct(y) )) | 'X';
     sout | nl;