Support Foment

Foment had some peculiarities:

1. Parameterize objects are initialized with the objects themselves at
   some point, which broke the previous code.
2. Foment cannot discard multiple value returns in some scenarios.

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/conspire.scm b/lib/conspire.scm
index 549bf11..74a4c03 100644
--- a/lib/conspire.scm
+++ b/lib/conspire.scm
@@ -178,7 +178,7 @@
                                              key)
                        (display (test-rewrite key))
                        (display ": ")
-                       (display (test-rewrite value))
+                       (write (test-rewrite value))
                        (newline)))
                    previous-dict)))
 
@@ -198,10 +198,10 @@
     (cond
       (success?
        (when (or verbose? specifically-verbose?)
-         (display (string-append "PASS:           \"" name "\"\n"))
-         (display-report previous-dto previous-test-info)))
+         (display (string-append "PASS:           \"" name "\"\n"))))
       (else
-       (display (string-append "FAIL:           \"" name "\"\n"))))
+       (display (string-append "FAIL:           \"" name "\"\n"))
+       (display-report previous-dto previous-test-info)))
     (values previous-dto previous-test-info)))
 
 (define (default-on-exception exn return)
@@ -290,6 +290,8 @@
    (list 'replace default-test-info-dto default-test-info-dict)
    (lambda (value)
      (cond
+       ;; TODO: Should putting in a new test info be allowed?
+       ((test-info? value) value)
        ((not (pair? value))
         (raise-conspire-error "invalid arguments to parameterize"
                               value))