diff --git a/Examples/test-suite/guile/list_vector_runme.scm b/Examples/test-suite/guile/list_vector_runme.scm index c5ffa0784..d062b7a65 100644 --- a/Examples/test-suite/guile/list_vector_runme.scm +++ b/Examples/test-suite/guile/list_vector_runme.scm @@ -3,26 +3,29 @@ ;; current module. That's enough for such a simple test. (dynamic-call "scm_init_list_vector_module" (dynamic-link "./liblist_vector.so")) -(define-macro (check form) - `(if (not ,form) - (error "Check failed: " ',form))) +(define-macro (check-equality form1 form2) + `(let ((result1 ,form1) + (result2 ,form2)) + (if (not (equal? result1 result2)) + (error "Check failed:" + (list 'equal? ',form1 ',form2) + result1 result2)))) -(check (= (sum-list '(1 3 4 6 7)) 21)) -(check (= (sum-vector #(2 4 6 7 9)) 28)) -(check (equal? (one-to-seven-list) '(1 2 3 4 5 6 7))) -(check (equal? (one-to-seven-vector) #(1 2 3 4 5 6 7))) +(check-equality (sum-list '(1 3 4 6 7)) 21.0) +(check-equality (sum-vector #(2 4 6 7 9)) 28.0) +(check-equality (one-to-seven-list) '(1 2 3 4 5 6 7)) +(check-equality (one-to-seven-vector) #(1 2 3 4 5 6 7)) -(check (= (sum-list2 '(1 3 4 6 7)) 21)) -(check (= (sum-vector2 #(2 4 6 7 9)) 28)) -(check (equal? (one-to-seven-list2) '(1 2 3 4 5 6 7))) -(check (equal? (one-to-seven-vector2) #(1 2 3 4 5 6 7))) +(check-equality (sum-list2 '(1 3 4 6 7)) 21.0) +(check-equality (sum-vector2 #(2 4 6 7 9)) 28.0) +(check-equality (one-to-seven-list2) '(1 2 3 4 5 6 7)) +(check-equality (one-to-seven-vector2) #(1 2 3 4 5 6 7)) -(check (= (sum-lists '(1 2 3) '(4 5 6) '(7 8 9)) 45.0)) -(check (= (sum-lists2 '(1 2 3) '(4 5 6) '(7 8 9)) 45.0)) -(check (equal? (call-with-values produce-lists list) +(check-equality (sum-lists '(1 2 3) '(4 5 6) '(7 8 9)) 45.0) +(check-equality (sum-lists2 '(1 2 3) '(4 5 6) '(7 8 9)) 45.0) +(check-equality (call-with-values produce-lists list) '(#(0 1 2 3 4) #(0 1 4 9 16) - #(0.0 1.5 3.0 4.5 6.0)))) - + #(0.0 1.5 3.0 4.5 6.0))) (exit 0) diff --git a/Examples/test-suite/list_vector.i b/Examples/test-suite/list_vector.i index 244d10a0a..7f907d4f5 100644 --- a/Examples/test-suite/list_vector.i +++ b/Examples/test-suite/list_vector.i @@ -114,7 +114,7 @@ double sum_lists(int len, int *list3) { int i; - double sum; + double sum = 0.0; for (i = 0; i