dmbcs/mcron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vixie-time: Refactor 'parse-vixie-time'

Browse source 
* src/mcron/vixie-time.scm (parse-vixie-time): Use 'match' to avoid
complex 'car' and 'cdr' usage.
This commit is contained in:
Mathieu Lirzin 2018-04-08 16:00:25 +02:00
commit cf3146b3c5
No known key found for this signature in database
GPG key ID: 0ADEE10094604D37
1 changed files with 61 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/mcron/vixie-time.scm
View file

@ -307,8 +307,9 @@ accounted for."
((< (length tokens) 5) ((< (length tokens) 5)
(throw 'mcron-error 9 (throw 'mcron-error 9
"Not enough fields in Vixie-style time specification"))) "Not enough fields in Vixie-style time specification")))
(let ((time-spec-list (match (map-in-order
(map-in-order (lambda (x) (vector (λ (x)
(vector
(let* ((n (vector-ref x 0)) (let* ((n (vector-ref x 0))
(tok (list-ref tokens n))) (tok (list-ref tokens n)))
(cond (cond
@ -334,46 +335,40 @@ accounted for."
#( 1 0 24 ,tm:hour ,set-tm:hour ) #( 1 0 24 ,tm:hour ,set-tm:hour )
#( 2 1 32 ,tm:mday ,set-tm:mday ) #( 2 1 32 ,tm:mday ,set-tm:mday )
#( 3 0 12 ,tm:mon ,set-tm:mon ) #( 3 0 12 ,tm:mon ,set-tm:mon )
#( 4 0 7 ,tm:wday ,set-tm:wday ))))) ;; [1] #( 4 0 7 ,tm:wday ,set-tm:wday ))) ;; [1]
((and time-spec-list (min hour day month wday))
(vector-set! (car (last-pair time-spec-list)) (vector-set! wday
0 0
(map (lambda (time-spec) (map (lambda (time-spec)
(if (eqv? time-spec 7) 0 time-spec)) (if (eqv? time-spec 7) 0 time-spec))
(vector-ref (car (last-pair time-spec-list)) 0))) ;; [2] (vector-ref wday 0))) ;; [2]
(vector-set! (caddr time-spec-list) (vector-set! day
0 0
(remove (lambda (day) (eqv? day 0)) (remove (lambda (d) (eqv? d 0))
(vector-ref (caddr time-spec-list) 0))) ;; [2.1] (vector-ref day 0))) ;; [2.1]
(λ (current-time) ;; [3]
(lambda (current-time) ;; [3]
(let ((time (localtime current-time))) ;; [4] (let ((time (localtime current-time))) ;; [4]
(unless (member (tm:mon time) (time-spec:list month))
(if (not (member (tm:mon time)
(time-spec:list (cadddr time-spec-list))))
(begin
(nudge-month! time (cdddr time-spec-list)) (nudge-month! time (cdddr time-spec-list))
(set-tm:mday time 0))) (set-tm:mday time 0))
(if (or (eqv? (tm:mday time) 0) (when (or (eqv? (tm:mday time) 0)
(not (member (tm:mday time) (not (member (tm:mday time)
(interpolate-weekdays (interpolate-weekdays
(time-spec:list (caddr time-spec-list)) (time-spec:list day)
(time-spec:list (caddr (cddr time-spec-list))) (time-spec:list wday)
(tm:mon time) (tm:mon time)
(tm:year time))))) (tm:year time)))))
(begin (nudge-day! (pk time) (pk (cddr time-spec-list)))
(nudge-day! time (cddr time-spec-list)) (set-tm:hour time -1))
(set-tm:hour time -1))) (unless (member (tm:hour time)
(if (not (member (tm:hour time) (time-spec:list hour))
(time-spec:list (cadr time-spec-list))))
(begin
(nudge-hour! time (cdr time-spec-list)) (nudge-hour! time (cdr time-spec-list))
(set-tm:min time -1))) ;; [5] (set-tm:min time -1)) ;; [5]
(set-tm:sec time 0) (set-tm:sec time 0)
(nudge-min! time time-spec-list) ;; [6] (nudge-min! time time-spec-list) ;; [6]
(car (mktime time))))))) ;; [7] (first (mktime time)))))))) ;; [7]