Changeset 030653a

Timestamp:

Jun 18, 2020, 6:58:33 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

91e52be

Parents:

c1ee231

Message:

add unit conversions from duration to double

Files:

• libcfa/src/time.hfa (modified) (3 diffs)
• tests/.expect/time.txt (modified) (1 diff)
• tests/time.cfa (modified) (2 diffs)

libcfa/src/time.hfa

@@ -10 +10 @@
 // Created On       : Wed Mar 14 23:18:57 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Feb  4 08:24:32 2020
-// Update Count     : 654
+// Last Modified On : Wed Jun 17 16:13:00 2020
+// Update Count     : 663
 //
 
@@ -20 +20 @@
 
 #include <time.h>                                                                               // timespec
-extern "C" {
 #include <sys/time.h>                                                                   // timeval
-}
 #include <time_t.hfa>                                                                   // Duration/Time types
 
@@ -91 +89 @@
         int64_t ?`w( Duration dur ) { return dur.tn / (7LL * 24LL * 60LL * 60LL * TIMEGRAN); }
 
+        double ?`dns( Duration dur ) { return dur.tn; }
+        double ?`dus( Duration dur ) { return dur.tn / ((double)TIMEGRAN / 1_000_000.); }
+        double ?`dms( Duration dur ) { return dur.tn / ((double)TIMEGRAN / 1_000.); }
+        double ?`ds( Duration dur ) { return dur.tn / (double)TIMEGRAN; }
+        double ?`dm( Duration dur ) { return dur.tn / (60. * TIMEGRAN); }
+        double ?`dh( Duration dur ) { return dur.tn / (60. * 60. * (double)TIMEGRAN); }
+        double ?`dd( Duration dur ) { return dur.tn / (24. * 60. * 60. * (double)TIMEGRAN); }
+        double ?`dw( Duration dur ) { return dur.tn / (7. * 24. * 60. * 60. * (double)TIMEGRAN); }
+
         Duration max( Duration lhs, Duration rhs ) { return  (lhs.tn < rhs.tn) ? rhs : lhs;}
         Duration min( Duration lhs, Duration rhs ) { return !(rhs.tn < lhs.tn) ? lhs : rhs;}

tests/.expect/time.txt

@@ -1 +1 @@
 10800 2 3.375 12 1.00001
+0.125 0.0333333333333333 3.375 12000. 1000010.
 0 2 3.375
 7 7 7

tests/time.cfa

@@ -10 +10 @@
 // Created On       : Tue Mar 27 17:24:56 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jan  5 18:27:37 2020
-// Update Count     : 34
+// Last Modified On : Thu Jun 18 18:14:49 2020
+// Update Count     : 37
 //
 
@@ -20 +20 @@
         Duration d1 = 3`h, d2 = 2`s, d3 = 3.375`s, d4 = 12`s, d5 = 1`s + 10_000`ns;
         sout | d1 | d2 | d3 | d4 | d5;
+        sout | d1`dd | d2`dm | d3`ds | d4`dms | d5`dus;
         d1 = 0;
         sout | d1 | d2 | d3;