merged davazp trunk

diff --cc tests/read.lisp
index 516790e,ddcc647..c7ac66b
--- 1/tests/read.lisp
--- 2/tests/read.lisp
+++ b/tests/read.lisp
@@@ -2,10 -2,5 +2,10 @@@
  ;; or when test macro supports error handling, whichever comes first
  ;; (test (equal (read-from-string " 1 3 5" t nil :start 2) (values 3 5)))
  (expected-failure
-  (equal (read-from-string "(a b c)") (values '(A B C) 7)))
+  (equal (multiple-value-list (read-from-string "(a b c)"))
+         '((A B C) 7)))
 +
- (test (equal (read-from-string "|.|") '\.))
++(test (equal (symbol-name (read-from-string "|.|")) "."))
 +(test (equal (read-from-string "(1 .25)") '(1 0.25)))
 +(test (equal (read-from-string ".25") 0.25))
- (test (equal (read-from-string "(1 |.| 25)") '(1 |.| 25)))
 +(test (equal (read-from-string "(1 . 25)") '(1 . 25)))