From 270f7bab16308ec9a5c2e6ee4abbdb4639ef2d9f Mon Sep 17 00:00:00 2001
From: Arun Isaac
Date: Tue, 17 Oct 2023 19:19:05 +0100
Subject: ccwl: Add "Invalid parameter" to #:stderr and #:stdout error
 messages.

* ccwl/ccwl.scm (command): Add "Invalid parameter" to #:stderr and
#:stdout error messages.
* tests/ccwl.scm ("commands with non-string #:stderr parameters must
raise a &ccwl-violation condition", "commands with non-string #:stdout
parameters must raise a &ccwl-violation condition"): Adjust tests.
---
 ccwl/ccwl.scm  | 6 ++++--
 tests/ccwl.scm | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ccwl/ccwl.scm b/ccwl/ccwl.scm
index 98bc8ae..ca02cea 100644
--- a/ccwl/ccwl.scm
+++ b/ccwl/ccwl.scm
@@ -383,13 +383,15 @@ identifiers defined in the commands."
                                 (not (string? (syntax->datum stderr))))
                            (raise-exception
                             (condition (ccwl-violation stderr)
-                                       (formatted-message "#:stderr parameter must be a string")))
+                                       (formatted-message "Invalid #:stderr parameter ~a. #:stderr parameter must be a string"
+                                                          (syntax->datum stderr))))
                            stderr)
                      #,(if (and stdout
                                 (not (string? (syntax->datum stdout))))
                            (raise-exception
                             (condition (ccwl-violation stdout)
-                                       (formatted-message "#:stdout parameter must be a string")))
+                                       (formatted-message "Invalid #:stdout parameter ~a. #:stdout parameter must be a string"
+                                                          (syntax->datum stdout))))
                            stdout)
                      #,requirements
                      #,other))
diff --git a/tests/ccwl.scm b/tests/ccwl.scm
index e60a035..d8100c5 100644
--- a/tests/ccwl.scm
+++ b/tests/ccwl.scm
@@ -212,7 +212,7 @@
   (guard (exception
           (else (and (ccwl-violation? exception)
                      (string=? (formatted-message-format exception)
-                               "#:stderr parameter must be a string"))))
+                               "Invalid #:stderr parameter ~a. #:stderr parameter must be a string"))))
     (begin (macroexpand
             '(command #:inputs (message #:type string)
                       #:run "echo" message
@@ -224,7 +224,7 @@
   (guard (exception
           (else (and (ccwl-violation? exception)
                      (string=? (formatted-message-format exception)
-                               "#:stdout parameter must be a string"))))
+                               "Invalid #:stdout parameter ~a. #:stdout parameter must be a string"))))
     (begin (macroexpand
             '(command #:inputs (message #:type string)
                       #:run "echo" message
-- 
cgit v1.2.3