From 13c37a9a7cc0e781a508462d8621e059de73abce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 4 May 2020 19:31:41 +0200 Subject: All warning procedures now uses warning system. --- module/vcomponent/recurrence/parse.scm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'module/vcomponent/recurrence') diff --git a/module/vcomponent/recurrence/parse.scm b/module/vcomponent/recurrence/parse.scm index 36026899..c72ec367 100644 --- a/module/vcomponent/recurrence/parse.scm +++ b/module/vcomponent/recurrence/parse.scm @@ -9,6 +9,7 @@ #:use-module (srfi srfi-26) #:use-module (vcomponent recurrence internal) #:use-module (util) + #:use-module (util exceptions) #:use-module (ice-9 match)) @@ -52,10 +53,11 @@ ,@(map (match-lambda ((key guard '=> body ...) `((,key) (if (not ,guard) - (begin (warning (quote ,key) - (quote ,guard) - (list ,@guard) - ) + (begin (warning + "RRULE guard failed for key ~a~% guard: ~a : ~s" + ,key ,guard (map (lambda (o) (if (procedure? o) + (procedure-name o) + o)) ,@guard)) ,@else-clause) (begin ,@body)))) ((key body ...) @@ -64,13 +66,6 @@ `(else ,@body))) cases)))) -(define (warning key guard extra) - (display (format #f "Warning RRULE guard failed for key ~a~% guard: ~a : ~s~%" - key guard (map (lambda (o) (if (procedure? o) - (procedure-name o) - o)) extra)) - (current-error-port))) - ;; RFC 5545, Section 3.3.10. Recurrence Rule, states that the UNTIL value MUST have ;; the same type as the DTSTART of the event (date or datetime). I have seen events -- cgit v1.2.3