diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-04-02 23:14:02 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-04-02 23:14:02 +0200 |
| commit | 3dbdc3e893bd4203707b1f0a6c30683a74c7e88c (patch) | |
| tree | f23334ab44c06624e4b48f4f1098f174276c5d70 | |
| parent | week-day-name rethrow with better error. (diff) | |
| download | calp-3dbdc3e893bd4203707b1f0a6c30683a74c7e88c.tar.gz calp-3dbdc3e893bd4203707b1f0a6c30683a74c7e88c.tar.xz | |
Remove ensure? for configs, built in instead.
| -rw-r--r-- | module/datetime/util.scm | 2 | ||||
| -rw-r--r-- | module/output/html.scm | 4 | ||||
| -rw-r--r-- | module/util/config.scm | 9 | ||||
| -rw-r--r-- | module/vcomponent/load.scm | 2 |
4 files changed, 4 insertions, 13 deletions
diff --git a/module/datetime/util.scm b/module/datetime/util.scm index 3ae270bd..059308e6 100644 --- a/module/datetime/util.scm +++ b/module/datetime/util.scm @@ -294,4 +294,4 @@ (define-config week-start sun "First day of week" - (ensure (lambda (x) (<= sun x sat)))) + (lambda (x) (<= sun x sat))) diff --git a/module/output/html.scm b/module/output/html.scm index 9cee3e26..c203c9fe 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -23,11 +23,11 @@ (define-config summary-filter (lambda (_ a) a) "" - (ensure procedure?)) + procedure?) (define-config description-filter (lambda (_ a) a) "" - (ensure procedure?)) + procedure?) (define (date-link date) (date->string date "~Y-~m-~d")) diff --git a/module/util/config.scm b/module/util/config.scm index fbf2bebe..68758ad0 100644 --- a/module/util/config.scm +++ b/module/util/config.scm @@ -15,15 +15,6 @@ :use-module (util) ) -(define-public (ensure pred?) - (lambda (v) - (unless (pred? v) - (error (format #f "Value [~s] doesn't satisfy condition ~a" - v (or (procedure-name pred?) "")))) - v)) - - - (define-once config-values (make-hash-table)) (define-record-type <config> diff --git a/module/vcomponent/load.scm b/module/vcomponent/load.scm index 8e11c9b2..065cafcb 100644 --- a/module/vcomponent/load.scm +++ b/module/vcomponent/load.scm @@ -15,7 +15,7 @@ :use-module ((vcomponent recurrence) :select (generate-recurrence-set repeating?)) :use-module ((vcomponent datetime) :select (ev-time<?))) -(define-config calendar-files '() "" (ensure list?)) +(define-config calendar-files '() "" list?) ;; Reads all calendar files from disk, generate recurence-sets for all repeating events, ;; and returns a list of calendars, and a stream of all events "ready" for display. |