Changes in libcfa/src/time.cfa [ff2a33e:ef346f7c]

File:

• libcfa/src/time.cfa (modified) (10 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 : Sat Jul 13 08:41:55 2019
-// Update Count     : 65
+// Last Modified On : Sun Dec 23 22:57:48 2018
+// Update Count     : 57
 //
 
 #include "time.hfa"
-#include "fstream.hfa"
+#include "iostream.hfa"
 #include <stdio.h>                                                                              // snprintf
 #include <assert.h>
@@ -37 +37 @@
                 if ( ns != 0 ) {                                                                // some ?
                         char buf[16];
-                        (ostype &)(os | nanomsd( ns, buf ));            // print nanoseconds
+                        (ostype &)(os | nanomsd( ns, buf ));                    // print nanoseconds
                 } // if
                 return os;
@@ -43 +43 @@
 
         void ?|?( ostype & os, Duration dur ) with( dur ) {
-                (ostype &)(os | dur); ends( os );
+                (ostype &)(os | dur); nl( os );
         } // ?|?
 } // distribution
@@ -52 +52 @@
 
 #ifdef __CFA_DEBUG__
-static void tabort( int year, int month, int day, int hour, int min, int sec, int nsec ) {
-        abort | "Attempt to create Time( year=" | year | "(>=1970), month=" | month | "(1-12), day=" | day | "(1-31), hour=" | hour | "(0-23), min=" | min | "(0-59), sec=" | sec
-                  | "(0-60), nsec=" | nsec | "(0-999_999_999), which exceeds range 00:00:00 UTC, January 1, 1970 to 03:14:07 UTC, January 19, 2038.";
-} // tabort
+#define CreateFmt "Attempt to create Time( year=%d (>=1970), month=%d (1-12), day=%d (1-31), hour=%d (0-23), min=%d (0-59), sec=%d (0-60), nsec=%d (0-999_999_999), " \
+        "which exceeds range 00:00:00 UTC, January 1, 1970 to 03:14:07 UTC, January 19, 2038."
 #endif // __CFA_DEBUG__
 
@@ -65 +63 @@
 #ifdef __CFA_DEBUG__
         if ( month < 1 || 12 < month ) {
-                tabort( year, month, day, hour, min, sec, nsec );
+                abort( CreateFmt, year, month, day, hour, (int)min, sec, nsec );
         } // if
 #endif // __CFA_DEBUG__
@@ -71 +69 @@
 #ifdef __CFA_DEBUG__
         if ( day < 1 || 31 < day ) {
-                tabort( year, month, day, hour, min, sec, nsec );
+                abort( CreateFmt, year, month, day, hour, (int)min, sec, nsec );
         } // if
 #endif // __CFA_DEBUG__
@@ -81 +79 @@
 #ifdef __CFA_DEBUG__
         if ( epochsec == (time_t)-1 ) {
-                tabort( year, month, day, hour, min, sec, nsec );
+                abort( CreateFmt, year, month, day, hour, (int)min, sec, nsec );
         } // if
 #endif // __CFA_DEBUG__
@@ -87 +85 @@
 #ifdef __CFA_DEBUG__
         if ( tv > 2147483647LL * TIMEGRAN ) {                           // between 00:00:00 UTC, January 1, 1970 and 03:14:07 UTC, January 19, 2038.
-                tabort( year, month, day, hour, min, sec, nsec );
+                abort( CreateFmt, year, month, day, hour, (int)min, sec, nsec );
         } // if
 #endif // __CFA_DEBUG__
@@ -152 +150 @@
                 long int ns = (tv < 0 ? -tv : tv) % TIMEGRAN;   // compute nanoseconds
                 if ( ns == 0 ) {                                                                // none ?
-                        (ostype &)(os | buf);                                           // print date/time/year
+                        (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
+                        (ostype &)(os | buf | buf2 | ' ' | &buf[20]);   // print date/time, nanoseconds and year
                 } // if
                 return os;
@@ -163 +161 @@
 
         void ?|?( ostype & os, Time time ) with( time ) {
-                (ostype &)(os | time); ends( os );
+                (ostype &)(os | time); nl( os );
         } // ?|?
 } // distribution