From: Andrea Griffini <agriff@tin.it>
Date: Sat, 4 May 2013 07:59:15 +0000 (+0200)
Subject: merged trunk
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=93b2f887ce00e313dee9eccf3fb852f219361c72;p=jscl.git

merged trunk
---

93b2f887ce00e313dee9eccf3fb852f219361c72
diff --cc src/compiler.lisp
index e870dce,7d92b9e..df148d9
--- a/src/compiler.lisp
+++ b/src/compiler.lisp
@@@ -580,7 -580,7 +580,7 @@@
    #+jscl
    (let ((package (symbol-package symbol)))
      (if (null package)
-         (code "{name: " (dump-string (symbol-name symbol)) "}")
 -        (code "(new Symbol(" (dump-symbol (symbol-name symbol)) "))")
++        (code "(new Symbol(" (dump-string (symbol-name symbol)) "))")
          (ls-compile `(intern ,(symbol-name symbol) ,(package-name package))))))
  
  (defun dump-cons (cons)
diff --cc src/read.lisp
index ca76ed6,4116bb6..05074a4
--- a/src/read.lisp
+++ b/src/read.lisp
@@@ -130,12 -141,9 +141,12 @@@
    (%read-char stream)
    (ecase (%read-char stream)
      (#\'
-      (list 'function (ls-read-1 stream)))
+      (list 'function (ls-read stream)))
      (#\( (list-to-vector (%read-list stream)))
 -    (#\: (make-symbol (string-upcase (read-until stream #'terminalp))))
 +    (#\: (make-symbol
 +          (unescape
 +           (string-upcase-noescaped
 +            (read-escaped-until stream #'terminalp)))))
      (#\\
       (let ((cname
              (concat (string (%read-char stream))