diff options
| author | Arun Isaac | 2024-03-22 00:00:03 +0000 |
|---|---|---|
| committer | Arun Isaac | 2024-03-22 00:00:03 +0000 |
| commit | d005c17106add8bd9ab07eddc30e9cf9b17de544 (patch) | |
| tree | 37017e67902656c3bf15b246428a663b9d836670 | |
| parent | caab675d8fb37fcc6e7e5904879a68364440d92a (diff) | |
| download | ccwl-d005c17106add8bd9ab07eddc30e9cf9b17de544.tar.gz ccwl-d005c17106add8bd9ab07eddc30e9cf9b17de544.tar.lz ccwl-d005c17106add8bd9ab07eddc30e9cf9b17de544.zip | |
scripts: Use unified function terminology.
Call workflows and commands by our unified notion of "function". This
makes it more succinct when adding more kinds of functions.
* ccwl/cwl.scm (workflow-or-command->cwl): Rename to function->cwl.
* ccwl/graphviz.scm (workflow-or-command->dot): Rename to
function->dot.
* scripts/ccwl (main): Use function->cwl and function->dot.
| -rw-r--r-- | ccwl/cwl.scm | 6 | ||||
| -rw-r--r-- | ccwl/graphviz.scm | 6 | ||||
| -rwxr-xr-x | scripts/ccwl | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/ccwl/cwl.scm b/ccwl/cwl.scm index b4a6025..3479492 100644 --- a/ccwl/cwl.scm +++ b/ccwl/cwl.scm @@ -1,5 +1,5 @@ ;;; ccwl --- Concise Common Workflow Language -;;; Copyright © 2021, 2023 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2021, 2023–2024 Arun Isaac <arunisaac@systemreboot.net> ;;; ;;; This file is part of ccwl. ;;; @@ -32,11 +32,11 @@ #:use-module (ccwl yaml) #:export (workflow->cwl command->cwl - workflow-or-command->cwl)) + function->cwl)) (define %cwl-version "v1.2") -(define workflow-or-command->cwl +(define function->cwl (match-lambda* (((? workflow? workflow) port) (workflow->cwl workflow port)) diff --git a/ccwl/graphviz.scm b/ccwl/graphviz.scm index 820aadc..2d39156 100644 --- a/ccwl/graphviz.scm +++ b/ccwl/graphviz.scm @@ -1,5 +1,5 @@ ;;; ccwl --- Concise Common Workflow Language -;;; Copyright © 2021, 2023 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2021, 2023–2024 Arun Isaac <arunisaac@systemreboot.net> ;;; ;;; This file is part of ccwl. ;;; @@ -34,9 +34,9 @@ #:use-module (ccwl utils) #:export (workflow->dot command->dot - workflow-or-command->dot)) + function->dot)) -(define workflow-or-command->dot +(define function->dot (match-lambda* (((? workflow? workflow) port) (workflow->dot workflow port)) diff --git a/scripts/ccwl b/scripts/ccwl index 4114cc7..43cf224 100755 --- a/scripts/ccwl +++ b/scripts/ccwl @@ -3,7 +3,7 @@ exec guile --no-auto-compile -e main -s "$0" "$@" !# ;;; ccwl --- Concise Common Workflow Language -;;; Copyright © 2021–2023 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2021–2024 Arun Isaac <arunisaac@systemreboot.net> ;;; ;;; This file is part of ccwl. ;;; @@ -112,8 +112,8 @@ Compile SOURCE-FILE. (set! %load-should-auto-compile #f) (let ((to (assq-ref args 'to))) ((cond - ((string=? to "cwl") workflow-or-command->cwl) - ((string=? to "dot") workflow-or-command->dot)) + ((string=? to "cwl") function->cwl) + ((string=? to "dot") function->dot)) (guard (exception ;; Handle syntax violation exceptions by reporting ;; them and exiting. |