Changeset 15776 in project


Ignore:
Timestamp:
09/07/09 17:40:46 (10 years ago)
Author:
Kon Lovett
Message:

Save.

Location:
release/4/srfi-19/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • release/4/srfi-19/trunk/srfi-19-io.scm

    r15751 r15776  
    541541;; In some cases (e.g., ~A) the action is to do nothing
    542542
    543 (define tm:read-directives
     543(define read-directives
    544544  (let ((ireader4 (make-integer-reader 4))
    545545        (ireader2 (make-integer-reader 2))
     
    635635                (else
    636636                 (let* ((format-char (cadr format-rem))
    637                         (format-info (assoc format-char tm:read-directives)))
     637                        (format-info (assoc format-char read-directives)))
    638638                   (unless format-info
    639639                     (error-bad-date-template 'scan-date "" (list->string format-rem)))
  • release/4/srfi-19/trunk/srfi-19-support.scm

    r15755 r15776  
    882882  (check-date-nanoseconds loc ns)
    883883  (check-date-seconds loc sec)
    884   (check-date-minutes loc sec)
    885   (check-date-hours loc sec)
     884  (check-date-minutes loc min)
     885  (check-date-hours loc hr)
    886886  (check-date-year loc yr)
    887887  (check-date-month loc mn)
  • release/4/srfi-19/trunk/srfi-19.meta

    r15754 r15776  
    1414        "srfi-19-support.scm"
    1515        "srfi-19-timezone.scm"
    16         #;"srfi-19-core.scm"
     16        "srfi-19-core.scm"
    1717        "srfi-19-time.scm"
    1818        "srfi-19-date.scm"
  • release/4/srfi-19/trunk/srfi-19.setup

    r15757 r15776  
    77(required-extension-version
    88  'setup-helper        "1.1.1"
     9  'srfi-29             "2.0.1"
    910  'type-errors         "1.4.0"
    1011  'locale              "0.6.2")
     
    1920
    2021(setup-shared-extension-module 'srfi-19-support (extension-version "3.0.0")
    21   #:compile-options '(-optimize-level 4 -debug-level 0))
     22  #:compile-options '(-optimize-level 2 -debug-level 1) #;'(-optimize-level 4 -debug-level 0))
    2223
    2324(setup-shared-extension-module 'srfi-19-time (extension-version "3.0.0")
  • release/4/srfi-19/trunk/tests/run.scm

    r15754 r15776  
    5454(define-s19-test! "Creating time structures"
    5555  (lambda ()
    56     (not (null? (list (current-time 'time-tai)
    57                       (current-time 'time-utc)
    58                       (current-time 'time-monotonic)
    59                       (current-time 'time-thread)
    60                       (current-time 'time-process))))))
     56    (not (null? (list (current-time time-tai)
     57                      (current-time time-utc)
     58                      (current-time time-monotonic)
     59                      (current-time time-thread)
     60                      (current-time time-process))))))
    6161
    6262(define-s19-test! "Testing time resolutions"
    6363  (lambda ()
    64     (not (null? (list (time-resolution 'time-tai)
    65                       (time-resolution 'time-utc)
    66                       (time-resolution 'time-monotonic)
    67                       (time-resolution 'time-thread)
    68                       (time-resolution 'time-process))))))
     64    (not (null? (list (time-resolution time-tai)
     65                      (time-resolution time-utc)
     66                      (time-resolution time-monotonic)
     67                      (time-resolution time-thread)
     68                      (time-resolution time-process))))))
    6969
    7070(define-s19-test! "Time comparisons (time=?, etc.)"
    7171  (lambda ()
    72     (let ((t1 (make-time 'time-utc 0 1))
    73           (t2 (make-time 'time-utc 0 1))
    74           (t3 (make-time 'time-utc 0 2))
    75           (t11 (make-time 'time-utc 1001 1))
    76           (t12 (make-time 'time-utc 1001 1))
    77           (t13 (make-time 'time-utc 1001 2)))
     72    (let ((t1 (make-time time-utc 0 1))
     73          (t2 (make-time time-utc 0 1))
     74          (t3 (make-time time-utc 0 2))
     75          (t11 (make-time time-utc 1001 1))
     76          (t12 (make-time time-utc 1001 1))
     77          (t13 (make-time time-utc 1001 2)))
    7878      (and (time=? t1 t2)
    7979           (time>? t3 t2)
     
    9494(define-s19-test! "Time difference"
    9595  (lambda ()
    96     (let ((t1 (make-time 'time-utc 0 3000))
    97           (t2 (make-time 'time-utc 0 1000))
    98           (t3 (make-time 'time-duration 0 2000))
    99           (t4 (make-time 'time-duration 0 -2000)))
     96    (let ((t1 (make-time time-utc 0 3000))
     97          (t2 (make-time time-utc 0 1000))
     98          (t3 (make-time time-duration 0 2000))
     99          (t4 (make-time time-duration 0 -2000)))
    100100      (and
    101101       (time=? t3 (time-difference t1 t2))
     
    104104(define (test-one-utc-tai-edge utc tai-diff tai-last-diff)
    105105  (let* (;; right on the edge they should be the same
    106          (utc-basic (make-time 'time-utc 0 utc))
    107          (tai-basic (make-time 'time-tai 0 (+ utc tai-diff)))
     106         (utc-basic (make-time time-utc 0 utc))
     107         (tai-basic (make-time time-tai 0 (+ utc tai-diff)))
    108108         (utc->tai-basic (time-utc->time-tai utc-basic))
    109109         (tai->utc-basic (time-tai->time-utc tai-basic))
    110110         ;; a second before they should be the old diff
    111          (utc-basic-1 (make-time 'time-utc 0 (- utc 1)))
    112          (tai-basic-1 (make-time 'time-tai 0 (- (+ utc tai-last-diff) 1)))
     111         (utc-basic-1 (make-time time-utc 0 (- utc 1)))
     112         (tai-basic-1 (make-time time-tai 0 (- (+ utc tai-last-diff) 1)))
    113113         (utc->tai-basic-1 (time-utc->time-tai utc-basic-1))
    114114         (tai->utc-basic-1 (time-tai->time-utc tai-basic-1))
    115115         ;; a second later they should be the new diff
    116          (utc-basic+1 (make-time 'time-utc 0 (+ utc 1)))
    117          (tai-basic+1 (make-time 'time-tai 0 (+ (+ utc tai-diff) 1)))
     116         (utc-basic+1 (make-time time-utc 0 (+ utc 1)))
     117         (tai-basic+1 (make-time time-tai 0 (+ (+ utc tai-diff) 1)))
    118118         (utc->tai-basic+1 (time-utc->time-tai utc-basic+1))
    119119         (tai->utc-basic+1 (time-tai->time-utc tai-basic+1))
     
    122122         (hs (/ (expt 10 9) 2))
    123123         ;; a second later they should be the new diff
    124          (utc-basic+2 (make-time 'time-utc hs (+ utc shy)))
    125          (tai-basic+2 (make-time 'time-tai hs (+ (+ utc tai-diff) shy)))
     124         (utc-basic+2 (make-time time-utc hs (+ utc shy)))
     125         (tai-basic+2 (make-time time-tai hs (+ (+ utc tai-diff) shy)))
    126126         (utc->tai-basic+2 (time-utc->time-tai utc-basic+2))
    127127         (tai->utc-basic+2 (time-tai->time-utc tai-basic+2))
Note: See TracChangeset for help on using the changeset viewer.