diff options
| author | Arun Isaac | 2023-11-06 11:01:43 +0000 |
|---|---|---|
| committer | Arun Isaac | 2023-11-06 11:01:43 +0000 |
| commit | 31d0328abebcae98b21b57cecfc255ec6442e157 (patch) | |
| tree | 02adff614c5c72781a660f482f3df48a0de63656 /ccwl | |
| parent | 69ceaa5268810b099140aa14a68a36e7fc5a5106 (diff) | |
| download | ccwl-31d0328abebcae98b21b57cecfc255ec6442e157.tar.gz ccwl-31d0328abebcae98b21b57cecfc255ec6442e157.tar.lz ccwl-31d0328abebcae98b21b57cecfc255ec6442e157.zip | |
ccwl: Error out if #:other parameters are not serializable to YAML.
* ccwl/ccwl.scm (ensure-yaml-serializable): New function.
(input, output, command): Use ensure-yaml-serializable.
* tests/ccwl.scm ("inputs with #:other parameters that fail to
evaluate must raise a &ccwl-violation condition", "outputs with
#:other parameters that fail to evaluate must raise a &ccwl-violation
condition", "commands with #:other parameters that fail to evaluate
must raise a &ccwl-violation condition"): New tests.
Diffstat (limited to 'ccwl')
| -rw-r--r-- | ccwl/ccwl.scm | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ccwl/ccwl.scm b/ccwl/ccwl.scm index f3ff1f8..793facd 100644 --- a/ccwl/ccwl.scm +++ b/ccwl/ccwl.scm @@ -35,6 +35,7 @@ #:use-module (ice-9 match) #:use-module (ccwl conditions) #:use-module (ccwl utils) + #:use-module (ccwl yaml) #:use-module (yaml) #:export (command? command @@ -95,6 +96,15 @@ (make-unspecified-default) unspecified-default?) +(define (ensure-yaml-serializable tree) + "Raise an exception unless @var{tree} is serializable to YAML." + ;; TODO: If tree is a quoted expression, emit a warning. + (unless (false-if-exception + (scm->yaml-string (syntax->datum tree))) + (raise-exception + (condition (ccwl-violation tree) + (formatted-message "#:other parameter not serializable to YAML"))))) + (define (input input-spec) "Return syntax to build an <input> object from INPUT-SPEC." (syntax-case input-spec () @@ -136,6 +146,7 @@ (condition (ccwl-violation stage?) (formatted-message "Invalid #:stage? parameter ~a. #:stage? must either be #t or #f." (syntax->datum stage?))))) + (ensure-yaml-serializable other) (let ((position #f) (prefix #f)) #`(make-input '#,id '#,type #,label @@ -191,6 +202,7 @@ (condition (ccwl-violation output-spec) (formatted-message "Output has no identifier"))))))) (apply (syntax-lambda** (id #:key (type #'File) binding source (other #'())) + (ensure-yaml-serializable other) #`(make-output '#,id '#,type #,binding #,source '#,other)) #'(id args ...)))) (id (identifier? #'id) (output #'(id))) @@ -368,6 +380,7 @@ identifiers defined in the commands." (condition (ccwl-violation x) (formatted-message "Missing ~a key in command definition" #:run)))) + (ensure-yaml-serializable other) #`(make-command (list #,@(map (lambda (input-spec) (let ((id (input-spec-id input-spec))) |