Changeset 38676 in project for release

Timestamp:

05/03/20 02:55:09 (9 months ago)

Author:

Kon Lovett

Message:

fix NS/MS & NS/MuS name, only unix ts

Location:

release/5/srfi-19/trunk

Files:

• srfi-19-common.scm (modified) (1 diff)
• srfi-19-tm.scm (modified) (6 diffs)
• srfi-19-tmctm.scm (deleted)
• srfi-19.egg (modified) (2 diffs)

release/5/srfi-19/trunk/srfi-19-common.scm

@@ -3 +3 @@
 ;; -- Miscellaneous Constants.
 
-(define-constant NS/MS  1000000)
-(define-constant NS/MuS 1000)
+(define-constant MS/NS  1000000)
+(define-constant MuS/NS 1000)
 
 (define-constant MS/S  1000)

release/5/srfi-19/trunk/srfi-19-tm.scm

@@ -92 +92 @@
   tm:seconds->time-values
   tm:seconds->time
-  tm:current-time-values
   tm:current-time-utc
   tm:current-time-tai
@@ -546 +545 @@
 
 (define (tm:time->milliseconds tim)
-  (+ (/ (%time-nanosecond tim) NS/MS) (* (%time-second tim) MS/S)) )
+  (+ (/ (%time-nanosecond tim) MS/NS) (* (%time-second tim) MS/S)) )
 
 (define (tm:nanoseconds->seconds ns)
@@ -564 +563 @@
           milliseconds microseconds nanoseconds)
         (let (
-          (nanos (+ (* milliseconds NS/MS) (* microseconds NS/MuS) nanoseconds))
+          (nanos (+ (* milliseconds MS/NS) (* microseconds MuS/NS) nanoseconds))
     (secs (+ (* days SEC/DY) (* hours SEC/HR) (* minutes SEC/MIN) seconds)) )
     (let-values (
@@ -580 +579 @@
     ((sec ms-sec) (quotient&remainder ms MS/S)) )
     (let (
-      (ns (* (number->integer ms-sec) NS/MS)) )
+      (ns (* (number->integer ms-sec) MS/NS)) )
       (values ns sec) ) ) )
 
@@ -597 +596 @@
 ;; Current time routines
 
-(import (only srfi-19-tmctm tm:current-time-values))
+(cond-expand
+  (unix
+    ;add back C_startup_time_seconds
+    (define tm:current-time-values
+      (let ((t0 (current-seconds)))
+        (lambda ()
+          (let-values (((s ms) (quotient&remainder (current-milliseconds) MS/S)))
+            (values (* ms MS/NS) (+ t0 s)) ) ) ) ) )
+  (else
+    (define (tm:current-time-values)
+      (values 0 (current-seconds)) ) ) )
 
 (define (tm:current-time-utc)
@@ -627 +636 @@
 
 (define (tm:time-resolution tt)
-  NS/MS )
+  MS/NS )
 
 ;; Time Comparison

release/5/srfi-19/trunk/srfi-19.egg

@@ -2 +2 @@
 
 ((synopsis "Time Data Types and Procedures")
- (version "4.4.1")
+ (version "4.4.2")
  (category data)
  (author "Will Fitzgerald (for Chicken by [[/users/kon-lovett]])")
@@ -54 +54 @@
     (component-dependencies srfi-19-support srfi-19-tm srfi-19-io)
     (csc-options "-O3" "-d1" "-strict-types" "-no-procedure-checks" "-no-bound-checks"))
-  (extension srfi-19-tmctm
-    (types-file)
-    (csc-options "-O4" "-d0" "-strict-types" "-no-procedure-checks" "-no-bound-checks" "-no-argc-checks"))
   (extension srfi-19-tm
     (types-file)
-    (component-dependencies srfi-19-timezone srfi-19-tmctm)
+    (component-dependencies srfi-19-timezone)
     (csc-options "-O4" "-d0" "-strict-types" "-no-procedure-checks" "-no-bound-checks" "-no-argc-checks"))
   (extension srfi-19-timezone