From a36007a22fa963ac3d88c7b9d2c57e641d1ac6c0 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 15 May 2021 20:25:36 +0530 Subject: Use symbols as input identifiers instead of strings. * ccwl/ccwl.scm (input=?): Compare using eq? instead of string=?. (command->cwl, write-cwl): Convert input-id to string before appending. --- ccwl/ccwl.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ccwl/ccwl.scm b/ccwl/ccwl.scm index 7b8d59c..b656d36 100644 --- a/ccwl/ccwl.scm +++ b/ccwl/ccwl.scm @@ -133,8 +133,8 @@ (make-command additional-inputs outputs run stdin other))) (define (input=? input1 input2) - (string=? (input-id input1) - (input-id input2))) + (eq? (input-id input1) + (input-id input2))) (define (invoke-command step-id command . args) (make-step step-id @@ -221,7 +221,7 @@ (input=? arg x))) (command-args command)) position))) - (string-append "$(inputs." (input-id arg) ")") + (string-append "$(inputs." (symbol->string (input-id arg)) ")") arg) position)) (command-args command) @@ -269,7 +269,8 @@ (outputs . ,(map output->cwl (command-outputs command))) ,@(if (command-stdin command) `((stdin . ,(string-append "$(inputs." - (input-id (command-stdin command)) + (symbol->string + (input-id (command-stdin command))) ".path)"))) '())))) -- cgit v1.2.3