Include backquote without simplifications

[jscl.git] / reader.lisp

diff --git a/reader.lisp b/reader.lisp
index b516fbd..d361e94 100644 (file)
--- a/reader.lisp
+++ b/reader.lisp
@@ -53,8 +53,8 @@
        nil)
       ((char= ch #\.)
        (%read-char stream)
+       (skip-whitespaces-and-comments stream)
        (prog1 (ls-read-1 stream)
-         (skip-whitespaces-and-comments stream)
          (unless (char= (%read-char stream) #\))
            (error "')' was expected."))))
       (t
@@ -82,7 +82,14 @@
        (ls-read-1 stream))
       ((char= ch #\,)
        (%read-char stream)
-       (list 'comma (ls-read-1 stream)))
+       (if (eql (%peek-char stream) #\@)
+           (progn (%read-char stream) (list 'splicing (ls-read-1 stream)))
+           (list 'comma (ls-read-1 stream))))
+      ((char= ch #\#)
+       (%read-char stream)
+       (ecase (%read-char stream)
+         (#\'
+          (list 'function (ls-read-1 stream)))))
       (t
        (let ((string (read-until stream #'terminalp)))
          (if (every #'digit-char-p string)