From 900c76a29726778a34ba0cbeb832cddd618783f4 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 16 Nov 2023 13:35:40 +0000 Subject: ccwl: Support nested arrays. * ccwl/ccwl.scm (construct-type-syntax): Construct types recursively to support nested arrays. (key->output): Recursively convert stdout types to File types. * ccwl/cwl.scm (type->cwl): New function. (input->cwl-scm, output->cwl-scm): Use type->cwl. * tests/ccwl.scm (make-array-type): New function. (construct-type-syntax-wrapper): New syntax. ("construct-type-syntax on primitive types", "construct-type-syntax on array types", "construct-type-syntax on nested array types"): New tests. * tests/cwl.scm, doc/array-types.scm, doc/nested-array-types.scm: New files. * doc/ccwl.skb (Cookbook)[Array types]: New section. --- tests/ccwl.scm | 22 ++++++++++++++++++++++ tests/cwl.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 tests/cwl.scm (limited to 'tests') diff --git a/tests/ccwl.scm b/tests/ccwl.scm index 117f93f..6890017 100644 --- a/tests/ccwl.scm +++ b/tests/ccwl.scm @@ -27,6 +27,16 @@ (define output (@@ (ccwl ccwl) output)) +(define make-array-type + (@@ (ccwl ccwl) make-array-type)) + +(define-syntax construct-type-syntax-wrapper + (lambda (x) + (syntax-case x () + ((_ type-spec) + ((@@ (ccwl ccwl) construct-type-syntax) + #'type-spec))))) + (test-begin "ccwl") (test-assert "stdin input should not have inputBinding" @@ -317,4 +327,16 @@ #:other '((secondaryFiles . ".fai")))) #f))) +(test-eq "construct-type-syntax on primitive types" + 'File + (construct-type-syntax-wrapper File)) + +(test-eq "construct-type-syntax on array types" + (make-array-type 'File) + (construct-type-syntax-wrapper (array File))) + +(test-eq "construct-type-syntax on nested array types" + (make-array-type (make-array-type 'File)) + (construct-type-syntax-wrapper (array (array File)))) + (test-end "ccwl") diff --git a/tests/cwl.scm b/tests/cwl.scm new file mode 100644 index 0000000..ba619ab --- /dev/null +++ b/tests/cwl.scm @@ -0,0 +1,44 @@ +;;; ccwl --- Concise Common Workflow Language +;;; Copyright © 2023 Arun Isaac +;;; +;;; This file is part of ccwl. +;;; +;;; ccwl is free software: you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation, either version 3 of the License, or +;;; (at your option) any later version. +;;; +;;; ccwl is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;;; General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with ccwl. If not, see . + +(use-modules (srfi srfi-64)) + +(define type->cwl + (@@ (ccwl cwl) type->cwl)) + +(define make-array-type + (@@ (ccwl ccwl) make-array-type)) + +(test-begin "cwl") + +(test-equal "type->cwl on primitive types" + 'File + (type->cwl 'File)) + +(test-equal "type->cwl on array types" + '((type . array) + (items . File)) + (type->cwl (make-array-type 'File))) + +(test-equal "type->cwl on nested array types" + '((type . array) + (items . ((type . array) + (items . File)))) + (type->cwl (make-array-type (make-array-type 'File)))) + +(test-end "cwl") -- cgit v1.2.3