Changeset 38128 in project


Ignore:
Timestamp:
01/17/20 02:04:29 (8 months ago)
Author:
Kon Lovett
Message:

rm "prims" (unused), add '17 JD entry

Location:
release/5/srfi-19/trunk
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • release/5/srfi-19/trunk/srfi-19-period.scm

    r38112 r38128  
    77;;
    88;; - Use a half-closed interval - [begin end)? Currently [B E]!
    9 
    10 (include "chicken-primitive-object-inlines")
    119
    1210(module srfi-19-period
     
    181179
    182180(define (tm:time-period-contains/period? loc per1 per2)
    183   (let ((tper
    184           (if (tm:time-period-type=? per1 per2)
    185             per2
    186             (%make-time-period
    187               (tm:ensure-compatible-time-period-begin loc per1 per2)
    188               (tm:ensure-compatible-time-period-end loc per1 per2)) ) ) )
     181  (let (
     182    (tper
     183      (if (tm:time-period-type=? per1 per2)
     184        per2
     185        (%make-time-period
     186          (tm:ensure-compatible-time-period-begin loc per1 per2)
     187          (tm:ensure-compatible-time-period-end loc per1 per2)) ) ) )
    189188    (tm:time-point-within?
    190189     (%time-period-begin per1) (%time-period-end per1)
     
    224223
    225224(define (make-time-period beg end . args)
    226   (let-optionals args ((tt (default-date-clock-type)))
     225  (let-optionals args (
     226    (tt (default-date-clock-type)) )
    227227    (check-clock-type 'make-time-period tt)
    228228    ;
     
    359359  (check-time-period 'time-period-intersection per1)
    360360  (check-time-period 'time-period-intersection per2)
    361   (let ((b1 (%time-period-begin per1))
    362         (e1 (%time-period-end per1)))
    363     (let ((b2 (tm:ensure-compatible-time 'time-period-intersection
    364                 b1 (%time-period-begin per2)))
    365           (e2 (tm:ensure-compatible-time 'time-period-intersection
    366                 e1 (%time-period-end per2))))
    367       (receive (bi ei) (tm:time-point-intersection b1 e1 b2 e2)
    368         (and (tm:time<=? bi ei)
    369              (%make-time-period bi ei)) ) ) ) )
     361  (let* (
     362    (b1
     363      (%time-period-begin per1))
     364    (e1
     365      (%time-period-end per1))
     366    (b2
     367      (tm:ensure-compatible-time 'time-period-intersection
     368        b1 (%time-period-begin per2)))
     369    (e2
     370      (tm:ensure-compatible-time 'time-period-intersection
     371        e1 (%time-period-end per2))) )
     372    (receive (bi ei) (tm:time-point-intersection b1 e1 b2 e2)
     373      (and
     374        (tm:time<=? bi ei)
     375        (%make-time-period bi ei)) ) ) )
    370376
    371377;#f when no overlap
     
    373379  (check-time-period 'time-period-union per1)
    374380  (check-time-period 'time-period-union per2)
    375   (let ((b1 (%time-period-begin per1))
    376         (e1 (%time-period-end per1)))
    377     (let ((b2 (tm:ensure-compatible-time 'time-period-union b1 (time-period-begin per2)))
    378           (e2 (tm:ensure-compatible-time 'time-period-union e1 (time-period-end per2))))
    379       (receive (bi ei) (tm:time-point-intersection b1 e1 b2 e2)
    380         (and (tm:time<=? bi ei)
    381              (receive (bu eu) (tm:time-point-union b1 e1 b2 e2)
    382                (%make-time-period bu eu) ) ) ) ) ) )
     381  (let* (
     382    (b1 (%time-period-begin per1))
     383    (e1 (%time-period-end per1))
     384    (b2 (tm:ensure-compatible-time 'time-period-union b1 (time-period-begin per2)))
     385    (e2 (tm:ensure-compatible-time 'time-period-union e1 (time-period-end per2))) )
     386    (receive (bi ei) (tm:time-point-intersection b1 e1 b2 e2)
     387      (and
     388        (tm:time<=? bi ei)
     389        (receive (bu eu) (tm:time-point-union b1 e1 b2 e2)
     390          (%make-time-period bu eu) ) ) ) ) )
    383391
    384392(define (time-period-span per1 per2)
    385393  (check-time-period 'time-period-span per1)
    386394  (check-time-period 'time-period-span per2)
    387   (let ((b1 (%time-period-begin per1))
    388         (e1 (%time-period-end per1)))
    389     (let ((b2 (tm:ensure-compatible-time 'time-period-span b1 (%time-period-begin per2)))
    390           (e2 (tm:ensure-compatible-time 'time-period-span e1 (%time-period-end per2))))
     395  (let* (
     396    (b1 (%time-period-begin per1))
     397    (e1 (%time-period-end per1))
     398    (b2 (tm:ensure-compatible-time 'time-period-span b1 (%time-period-begin per2)))
     399    (e2 (tm:ensure-compatible-time 'time-period-span e1 (%time-period-end per2))))
    391400    (receive (bu eu) (tm:time-point-union b1 e1 b2 e2)
    392       (%make-time-period bu eu) ) ) ) )
     401      (%make-time-period bu eu) ) ) )
    393402
    394403(define (time-period-shift per dur)
  • release/5/srfi-19/trunk/tai-utc.dat

    r38082 r38128  
    3939 2012 JUL  1 =JD 2456109.5  TAI-UTC=  35.0       S + (MJD - 41317.) X 0.0      S
    4040 2015 JUL  1 =JD 2457204.5  TAI-UTC=  36.0       S + (MJD - 41317.) X 0.0      S
     41 2017 JAN  1 =JD 2457754.5  TAI-UTC=  37.0       S + (MJD - 41317.) X 0.0      S
Note: See TracChangeset for help on using the changeset viewer.