aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Isaac2021-03-06 00:34:37 +0530
committerArun Isaac2021-03-06 00:43:58 +0530
commit38656be861ce09142fbe676bfdd6b8a60848d2eb (patch)
tree2e2202c4c18b9c23559a7fddf8baa1a87d752b34
parentf10dfe8529cdba10f5a8cae1cb5b715cc8e9651a (diff)
downloadccwl-38656be861ce09142fbe676bfdd6b8a60848d2eb.tar.gz
ccwl-38656be861ce09142fbe676bfdd6b8a60848d2eb.tar.lz
ccwl-38656be861ce09142fbe676bfdd6b8a60848d2eb.zip
Combine <workflow-output> type into <output> type.
The user should not have to distinguish between regular outputs and workflow outputs. * ccwl/ccwl.scm (<output>): Add source field. (output): Add source field to constructor. (<workflow-output>): Delete type. (workflow-output): Delete function.
-rw-r--r--ccwl/ccwl.scm18
1 files changed, 3 insertions, 15 deletions
diff --git a/ccwl/ccwl.scm b/ccwl/ccwl.scm
index 06191d1..2dc3b66 100644
--- a/ccwl/ccwl.scm
+++ b/ccwl/ccwl.scm
@@ -14,7 +14,6 @@
input
output
step
- workflow-output
intermediate
clitool-step))
@@ -42,11 +41,11 @@
(id output-id)
(type output-type)
(binding output-binding)
+ (source output-source)
(other output-other))
-(define* (output id #:key type binding (other '()))
+(define* (output id #:key type binding source (other '()))
"Build and return an <output> object."
- (make-output id type binding other))
(define* (clitool-step id args #:key (additional-inputs '()) (outputs '()) stdout stderr (other '()))
(step id
@@ -119,6 +118,7 @@ lists---the base command and the actual arguments."
intermediate?
(input intermediate-input)
(output-source intermediate-output-source))
+ (make-output id type binding source other))
(define (input->tree input)
@@ -171,19 +171,7 @@ lists---the base command and the actual arguments."
`((stderr . ,stderr))
'()))))
-(define* (workflow-output id #:key type source (other '()))
- "Build and return a <workflow-output> object."
- (make-workflow-output id type source other))
-
(define* (workflow steps outputs #:key (other '()))
-(define-immutable-record-type <workflow-output>
- (make-workflow-output id type source other)
- workflow-output?
- (id workflow-output-id)
- (type workflow-output-type)
- (source workflow-output-source)
- (other workflow-output-other))
-
(define-immutable-record-type <step>
(make-step id run in out)
step?