(Arne Babenhauserheide)
2017-07-28: doctests: use a quoted symbol for the test name doctests: use a quoted symbol for the test name
diff --git a/examples/doctests-test.scm b/examples/doctests-test.scm
--- a/examples/doctests-test.scm
+++ b/examples/doctests-test.scm
@@ -7,7 +7,7 @@ exec guile -L $(dirname $(dirname $(real
(import (examples doctests))
(define (foo)
- "(test \"foo\"
+ "(test 'foo
(test-equal \"bar\" (foo)))
"
"bar")
@@ -15,7 +15,7 @@ exec guile -L $(dirname $(dirname $(real
(define %this-module (current-module))
(define (main args)
" Testing doctests
- (test \"mytest\"
+ (test 'mytest
(test-assert #t)
(test-assert #f))
"
diff --git a/examples/doctests-test.w b/examples/doctests-test.w
--- a/examples/doctests-test.w
+++ b/examples/doctests-test.w
@@ -9,7 +9,7 @@ define-module : examples doctests-test
import : examples doctests
define : foo
- . "(test \"foo\"
+ . "(test 'foo
(test-equal \"bar\" (foo)))
"
. "bar"
@@ -17,7 +17,7 @@ define : foo
define %this-module : current-module
define : main args
. " Testing doctests
- (test \"mytest\"
+ (test 'mytest
(test-assert #t)
(test-assert #f))
"
diff --git a/examples/doctests.scm b/examples/doctests.scm
--- a/examples/doctests.scm
+++ b/examples/doctests.scm
@@ -39,13 +39,13 @@ exec guile -L $(dirname $(dirname $(real
This is an example test:
- (test \"mytest\"
+ (test 'mytest
(define v (make-vector 5 99))
(test-assert (vector? v))
(test-eqv 99 (vector-ref v 2))
(vector-set! v 2 7)
(test-eqv 7 (vector-ref v 2)))
- (test \"mytest2\"
+ (test 'mytest2
(test-assert #t))
"
(let lp
@@ -91,7 +91,7 @@ exec guile -L $(dirname $(dirname $(real
(testid
(if (not (list? doctest))
#f
- (string-join (list filename (symbol->string name) (car (cdr doctest)))
+ (string-join (list filename (symbol->string name) (symbol->string (primitive-eval (car (cdr doctest)))))
"--")))
(cleaned
(if (not (list? doctest))
diff --git a/examples/doctests.w b/examples/doctests.w
--- a/examples/doctests.w
+++ b/examples/doctests.w
@@ -41,13 +41,13 @@ define : doctests-extract-from-string s
This is an example test:
- (test \"mytest\"
+ (test 'mytest
(define v (make-vector 5 99))
(test-assert (vector? v))
(test-eqv 99 (vector-ref v 2))
(vector-set! v 2 7)
(test-eqv 7 (vector-ref v 2)))
- (test \"mytest2\"
+ (test 'mytest2
(test-assert #t))
"
let lp
@@ -72,7 +72,7 @@ define : doctests-testmod mod
let*
: names : module-map (λ (sym var) sym) mod
filename
- if (module-filename mod) (string-join (string-split (module-filename mod) #\/) "-")
+ if (module-filename mod) (string-join (string-split (module-filename mod) #\/ ) "-")
string-join (cons "._" (map symbol->string (module-name mod))) "-"
docstrings
map (λ (x) (if (procedure? x) (procedure-documentation x)))
@@ -93,7 +93,7 @@ define : doctests-testmod mod
testid
if : not : list? doctest
. #f
- string-join : list filename (symbol->string name) : car : cdr doctest
+ string-join : list filename (symbol->string name) : symbol->string : primitive-eval : car : cdr doctest
. "--"
cleaned
if : not : list? doctest