Changeset 4f37255

Timestamp:

Jul 14, 2019, 11:46:01 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7dc2e57b

Parents:

ec72861

Message:

formatting

Location:

libcfa/src

Files:

• interpose.cfa (modified) (6 diffs)
• iostream.cfa (modified) (8 diffs)

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May  5 11:37:35 2018
-// Update Count     : 111
+// Last Modified On : Sun Jul 14 22:57:16 2019
+// Update Count     : 116
 //
 
@@ -81 +81 @@
 //=============================================================================================
 
-void sigHandler_segv ( __CFA_SIGPARMS__ );
-void sigHandler_ill  ( __CFA_SIGPARMS__ );
-void sigHandler_fpe  ( __CFA_SIGPARMS__ );
-void sigHandler_abort( __CFA_SIGPARMS__ );
-void sigHandler_term ( __CFA_SIGPARMS__ );
+void sigHandler_segv( __CFA_SIGPARMS__ );
+void sigHandler_ill ( __CFA_SIGPARMS__ );
+void sigHandler_fpe ( __CFA_SIGPARMS__ );
+void sigHandler_abrt( __CFA_SIGPARMS__ );
+void sigHandler_term( __CFA_SIGPARMS__ );
 
 struct {
@@ -110 +110 @@
                 __cfaabi_sigaction( SIGILL , sigHandler_ill  , SA_SIGINFO );
                 __cfaabi_sigaction( SIGFPE , sigHandler_fpe  , SA_SIGINFO );
-                __cfaabi_sigaction( SIGABRT, sigHandler_abort, SA_SIGINFO | SA_RESETHAND);
+                __cfaabi_sigaction( SIGABRT, sigHandler_abrt, SA_SIGINFO | SA_RESETHAND);
                 __cfaabi_sigaction( SIGTERM, sigHandler_term , SA_SIGINFO );
                 __cfaabi_sigaction( SIGINT , sigHandler_term , SA_SIGINFO );
@@ -204 +204 @@
                         if ( *p == '(' ) {
                                 name = p;
-                        }
-                        else if ( *p == '+' ) {
+                        } else if ( *p == '+' ) {
                                 offset_begin = p;
-                        }
-                        else if ( *p == ')' ) {
+                        } else if ( *p == ')' ) {
                                 offset_end = p;
                                 break;
@@ -223 +221 @@
 
                         __cfaabi_dbg_bits_print_nolock( "(%i) %s : %s + %s %s\n", frameNo, messages[i], name, offset_begin, offset_end);
-                }
-                // otherwise, print the whole line
-                else {
+                } else {                                                                                // otherwise, print the whole line
                         __cfaabi_dbg_bits_print_nolock( "(%i) %s\n", frameNo, messages[i] );
                 }
@@ -258 +254 @@
 }
 
-void sigHandler_abort( __CFA_SIGPARMS__ ) {
+void sigHandler_abrt( __CFA_SIGPARMS__ ) {
         __cfaabi_backtrace();
 

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 12 12:04:13 2019
-// Update Count     : 819
+// Last Modified On : Sat Jul 13 08:07:59 2019
+// Update Count     : 821
 //
 
@@ -499 +499 @@
                                 if ( ! f.flags.left ) { \
                                         buf[i] = '.'; buf[i + 1] = '\0'; \
-                                        if ( buf[0] == ' ' ) bufbeg = 1; /* decimal point within width */ \
+                                        if ( buf[0] == ' ' ) bufbeg = 1;        /* decimal point within width */ \
                                 } else { \
                                         for ( i = 0; i < len && buf[i] != ' '; i += 1 ); /* trailing blank ? */ \
@@ -546 +546 @@
 forall( dtype ostype | ostream( ostype ) ) {
         ostype & ?|?( ostype & os, _Ostream_Manip(char) f ) {
-                if ( f.base != 'c' ) {                                                          // bespoke binary/octal/hex format
+                if ( f.base != 'c' ) {                                                  // bespoke binary/octal/hex format
                         _Ostream_Manip(unsigned char) fmtuc @= { f.val, f.wd, f.pc, f.base, {'\0'} };
                         fmtuc.flags.pc = f.flags.pc;
@@ -558 +558 @@
 
                 #define CFMTNP "% * "
-                char fmtstr[sizeof(CFMTNP)];                                            // sizeof includes '\0'
+                char fmtstr[sizeof(CFMTNP)];                                    // sizeof includes '\0'
                 memcpy( &fmtstr, CFMTNP, sizeof(CFMTNP) );
-                int star = 1;                                                                           // position before first '*'
+                int star = 1;                                                                   // position before first '*'
 
                 // Insert flags into spaces before '*', from right to left.
@@ -566 +566 @@
                 fmtstr[star] = '%';
 
-                fmtstr[sizeof(CFMTNP)-2] = f.base;                                      // sizeof includes '\0'
+                fmtstr[sizeof(CFMTNP)-2] = f.base;                              // sizeof includes '\0'
                 // printf( "%d %s\n", f.wd, &fmtstr[star] );
                 fmt( os, &fmtstr[star], f.wd, f.val );
@@ -631 +631 @@
                 else {
                         fprintf( stderr, "invalid Boolean constant\n" );
-                        abort();
+                        abort();                                                                        // cannot use abort stream
                 } // if
                 return is;
@@ -639 +639 @@
                 char temp;
                 for () {
-                        fmt( is, "%c", &temp );                                                 // must pass pointer through varg to fmt
+                        fmt( is, "%c", &temp );                                         // must pass pointer through varg to fmt
                         // do not overwrite parameter with newline unless appropriate
                         if ( temp != '\n' || getANL( is ) ) { c = temp; break; }
@@ -773 +773 @@
         if ( ! f.s ) {
                 // printf( "skip %s %d\n", f.scanset, f.wd );
-                if ( f.wd == -1 ) fmt( is, f.scanset, "" ); // no input arguments
+                if ( f.wd == -1 ) fmt( is, f.scanset, "" );             // no input arguments
                 else for ( f.wd ) fmt( is, "%*c" );
                 return is;