Changeset 39373 in project

Timestamp:

11/24/20 03:36:27 (5 months ago)

Author:

Kon Lovett

Message:

C5.3 changes (record-printer & current-milliseconds)

Location:

release/5/srfi-19/trunk

Files:

• srfi-19-literals.scm (modified) (8 diffs)
• srfi-19.egg (modified) (1 diff)

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

@@ -9 +9 @@
   time-literal-form
   read-date-literal
-  write-date-literal
-  ;DEPERECATED
-  date-record-printer-format
-  time-record-printer-format)
+  write-date-literal)
 
 (import scheme)
 (import (chicken base))
+(import utf8)
 (import (chicken type))
 (import (chicken module))
+(import (only (chicken condition) handle-exceptions))
+(import (only (chicken io) read-token))
+(import (only (chicken read-syntax) define-reader-ctor))
+(import (only (chicken format) format))
+(import (only (chicken read-syntax) define-reader-ctor))
+(import (only (chicken read-syntax) set-sharp-read-syntax!))
+(import (only utf8-srfi-13 string-index))
 (import srfi-19-tm)
 (import srfi-19-core)
+(import srfi-19-io)
+
 
 (include "srfi-19-common")
@@ -44 +51 @@
 ;;
 
-(import (only (chicken format) format))
-(import (only (chicken read-syntax) define-reader-ctor))
-(import (only (chicken read-syntax) set-sharp-read-syntax!))
-
 (define (bracket-date-literals)
   ;default output form
-  (##sys#register-record-printer *date-tag*
-    (lambda (dat out) (date-record-formatter dat out))) )
+  (cond-expand
+    (chicken-5.3
+      (set! (record-printer *date-tag*)
+        (lambda (dat out) (date-record-formatter dat out))) )
+    (else
+      (##sys#register-record-printer *date-tag*
+        (lambda (dat out) (date-record-formatter dat out))) ) ) )
 
 (define (srfi-10-date-literals)
   ;srfi-10 output form
-  (##sys#register-record-printer *date-tag*
-    (lambda (dat out) (date-record-formatter dat out)))
+  (cond-expand
+    (chicken-5.3
+      (set! (record-printer *date-tag*)
+        (lambda (dat out) (date-record-formatter dat out))) )
+    (else
+      (##sys#register-record-printer *date-tag*
+        (lambda (dat out) (date-record-formatter dat out))) ) )
   ;srfi-10 input handler
   (define-reader-ctor 'srfi-19-date
@@ -64 +77 @@
 (define (date-literals)
   ;human legible output form
-  (##sys#register-record-printer *date-tag*
-    (lambda (dat out) (write-date-literal dat out)))
+  (cond-expand
+    (chicken-5.3
+      (set! (record-printer *date-tag*)
+        (lambda (dat out) (write-date-literal dat out))) )
+    (else
+      (##sys#register-record-printer *date-tag*
+        (lambda (dat out) (write-date-literal dat out))) ) )
   ;human legible input handler
   (set-sharp-read-syntax! #\@ (cut read-date-literal <>)) )
@@ -112 +130 @@
 ;; IN THE SOFTWARE.
 
-(import (only (chicken condition) handle-exceptions))
-(import (only (chicken io) read-token))
-(import (only srfi-13 string-index))
-(import srfi-19-io)
-
 ;; Constants
 
@@ -158 +171 @@
 
 ;;; Time Literal Syntax
-
-(import (only (chicken read-syntax) define-reader-ctor))
-(import (only (chicken format) format))
 
 (define-constant TIME-FORMAT-BRACKET "#<srfi-19#time ~S ~S ~S>")
@@ -188 +198 @@
 (define (bracket-time-literals)
   ;default output form
-  (##sys#register-record-printer *time-tag*
-    (lambda (tim out) (time-record-formatter tim out))) )
+  (cond-expand
+    (chicken-5.3
+      (set! (record-printer *time-tag*)
+        (lambda (tim out) (time-record-formatter tim out))) )
+    (else
+      (##sys#register-record-printer *time-tag*
+        (lambda (tim out) (time-record-formatter tim out))) ) ) )
 
 (define (srfi-10-time-literals)
   ;srfi-10 output form
-  (##sys#register-record-printer *time-tag*
-    (lambda (tim out) (time-record-formatter tim out)))
+  (cond-expand
+    (chicken-5.3
+      (set! (record-printer *time-tag*)
+        (lambda (tim out) (time-record-formatter tim out))) )
+    (else
+      (##sys#register-record-printer *time-tag*
+        (lambda (tim out) (time-record-formatter tim out))) ) )
   ;srfi-10 input handler
   (define-reader-ctor 'srfi-19-time
@@ -203 +223 @@
 (define (time-literals)
   ;human legible output form
-  (##sys#register-record-printer *time-tag*
-    (lambda (tim out) (write-time-literal tim out)))
+  (cond-expand
+    (chicken-5.3
+      (set! (record-printer *time-tag*)
+        (lambda (tim out) (write-time-literal tim out))) )
+    (else
+      (##sys#register-record-printer *time-tag*
+        (lambda (tim out) (write-time-literal tim out))) ) )
   ;human legible input handler
   (set-sharp-read-syntax! #\# (cut read-time-literal <>)) )
@@ -221 +246 @@
     (tm:time-second tim)) )
 
-;;;
-
-(: date-record-printer-format (deprecated date-literal-form))
-(: time-record-printer-format (deprecated time-literal-form))
-
-(define date-record-printer-format date-literal-form)
-(define time-record-printer-format time-literal-form)
-
 ) ;module srfi-19-literals

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

@@ -4 +4 @@
  (version "4.4.3")
  (category data)
- (author "Will Fitzgerald (for Chicken by [[kon lovett]])")
+ (author "Will Fitzgerald (for CHICKEN by [[kon lovett]])")
  (license "BSD")
- (dependencies srfi-1 srfi-13 srfi-18 srfi-69 miscmacros
-  (locale "0.8.1")
-  (srfi-29 "3.0.0")
-  (record-variants "1.1")
-  (check-errors "3.1.1"))
+ (dependencies
+  srfi-1 utf8 srfi-18 srfi-29 srfi-69
+  miscmacros locale record-variants check-errors)
   (test-dependencies test format)
  (components