Changeset 85acec94 for libcfa/src/time.cfa

Timestamp:

Dec 12, 2018, 3:48:10 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

515a037

Parents:

90cfc16 (diff), 5ebb1368 (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:

• libcfa/src/time.cfa (modified) (3 diffs)

libcfa/src/time.cfa

@@ -10 +10 @@
 // Created On       : Tue Mar 27 13:33:14 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun May  6 22:26:00 2018
-// Update Count     : 37
+// Last Modified On : Tue Dec 11 21:32:15 2018
+// Update Count     : 53
 //
 
@@ -31 +31 @@
 
 
-forall( dtype ostype | ostream( ostype ) )
-ostype & ?|?( ostype & os, Duration dur ) with( dur ) {
-        os | tv / TIMEGRAN;                                                                     // print seconds
-        long int ns = (tv < 0 ? -tv : tv) % TIMEGRAN;           // compute nanoseconds
-        if ( ns != 0 ) {                                                                        // some ?
-                char buf[16];
-                os | nanomsd( ns, buf );                                                // print nanoseconds
-        } // if
-        return os;
-} // ?|?
+forall( dtype ostype | ostream( ostype ) ) {
+        ostype & ?|?( ostype & os, Duration dur ) with( dur ) {
+                (ostype)(os | tv / TIMEGRAN);                                   // print seconds
+                long int ns = (tv < 0 ? -tv : tv) % TIMEGRAN;   // compute nanoseconds
+                if ( ns != 0 ) {                                                                // some ?
+                        char buf[16];
+                        (ostype)(os | nanomsd( ns, buf ));                      // print nanoseconds
+                } // if
+                return os;
+        } // ?|?
+
+        void ?|?( ostype & os, Duration dur ) with( dur ) {
+                (ostype)(os | dur); if ( getANL( os ) ) nl( os );
+        } // ?|?
+} // distribution
 
 
@@ -137 +142 @@
 } // strftime
 
-forall( dtype ostype | ostream( ostype ) )
-ostype & ?|?( ostype & os, Time time ) with( time ) {
-        char buf[32];                                                                           // at least 26
-        time_t s = tv / TIMEGRAN;
-    ctime_r( &s, (char *)&buf );                                                // 26 characters: "Wed Jun 30 21:49:08 1993\n"
-        buf[24] = '\0';                                                                         // remove trailing '\n'
-        long int ns = (tv < 0 ? -tv : tv) % TIMEGRAN;           // compute nanoseconds
-        if ( ns == 0 ) {                                                                        // none ?
-                os | buf;                                                                               // print date/time/year
-        } else {
-                buf[19] = '\0';                                                                 // truncate to "Wed Jun 30 21:49:08"
-                os | buf;                                                                               // print date/time
-                char buf2[16];
-                nanomsd( ns, buf2 );                                                    // compute nanoseconds
-                os | buf2 | ' ' | &buf[20];                                             // print nanoseconds and year
-        } // if
-        return os;
-} // ?|?
+forall( dtype ostype | ostream( ostype ) ) {
+        ostype & ?|?( ostype & os, Time time ) with( time ) {
+                char buf[32];                                                                   // at least 26
+                time_t s = tv / TIMEGRAN;
+                ctime_r( &s, (char *)&buf );                                    // 26 characters: "Wed Jun 30 21:49:08 1993\n"
+                buf[24] = '\0';                                                                 // remove trailing '\n'
+                long int ns = (tv < 0 ? -tv : tv) % TIMEGRAN;   // compute nanoseconds
+                if ( ns == 0 ) {                                                                // none ?
+                        (ostype)(os | buf);                                                     // print date/time/year
+                } else {
+                        buf[19] = '\0';                                                         // truncate to "Wed Jun 30 21:49:08"
+                        char buf2[16];
+                        nanomsd( ns, buf2 );                                            // compute nanoseconds
+                        (ostype)(os | buf | buf2 | ' ' | &buf[20]);     // print date/time, nanoseconds and year
+                } // if
+                return os;
+        } // ?|?
+
+        void ?|?( ostype & os, Time time ) with( time ) {
+                (ostype)(os | time); if ( getANL( os ) ) nl( os );
+        } // ?|?
+} // distribution
 
 // Local Variables: //