Commit 9e89272d authored by pfdietz's avatar pfdietz

Patched some tests (problems found by SDS

parent 5e6e13eb
......@@ -382,34 +382,34 @@
t)
(deftest macrolet.43
(let ((*x* nil))
(declare (special *x*))
(let ((*f* #'(lambda () *x*)))
(let ((*x-in-macrolet.43* nil))
(declare (special *x-in-macrolet.43*))
(let ((*f* #'(lambda () *x-in-macrolet.43*)))
(declare (special *f*))
(eval `(macrolet ((%m (*x*)
(eval `(macrolet ((%m (*x-in-macrolet.43*)
(declare (special *f*))
(funcall *f*)))
(%m t)))))
nil)
(deftest macrolet.44
(let ((*x* nil))
(declare (special *x*))
(let ((*f* #'(lambda () *x*)))
(let ((*x-in-macrolet.44* nil))
(declare (special *x-in-macrolet.44*))
(let ((*f* #'(lambda () *x-in-macrolet.44*)))
(declare (special *f*))
(eval `(macrolet ((%m (*x*)
(declare (special *f* *x*))
(eval `(macrolet ((%m (*x-in-macrolet.44*)
(declare (special *f* *x-in-macrolet.44*))
(funcall *f*)))
(%m t)))))
t)
(deftest macrolet.45
(let ((*x* nil))
(declare (special *x*))
(let ((*f* #'(lambda () *x*)))
(let ((*x-in-macrolet.45* nil))
(declare (special *x-in-macrolet.45*))
(let ((*f* #'(lambda () *x-in-macrolet.45*)))
(declare (special *f*))
(eval `(macrolet ((%m ((*x*))
(declare (special *f* *x*))
(eval `(macrolet ((%m ((*x-in-macrolet.45*))
(declare (special *f* *x-in-macrolet.45*))
(funcall *f*)))
(%m (t))))))
t)
......
......@@ -23,7 +23,11 @@
(let ((ns (ignore-errors (namestring p))))
"Read 22.1.3.11 before commenting on this test"
(when ns
(let ((expected-result (concatenate 'string "#P\"" ns "\""))
(let ((expected-result
(concatenate 'string "#P"
(with-standard-io-syntax
(write-to-string ns :readably nil
:escape t))))
(result (with-standard-io-syntax
(write-to-string p :readably nil :escape t))))
(unless (string= expected-result result)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment