From: David Vázquez <davazp@gmail.com>
Date: Fri, 3 May 2013 16:00:44 +0000 (+0100)
Subject: Merge branch 'master' into mutable-strings
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=4410f136fe0502076d71b92a12774783ccdf6a4e;p=jscl.git

Merge branch 'master' into mutable-strings

Conflicts:
	src/compiler.lisp
	src/toplevel.lisp
---

4410f136fe0502076d71b92a12774783ccdf6a4e
diff --cc src/compiler.lisp
index 7bf3dc9,e109404..aa2f821
--- a/src/compiler.lisp
+++ b/src/compiler.lisp
@@@ -595,12 -602,15 +605,15 @@@
      ((integerp sexp) (integer-to-string sexp))
      ((floatp sexp) (float-to-string sexp))
      ((characterp sexp) (code "\"" (escape-string (string sexp)) "\""))
 -    ((stringp sexp) (code "\"" (escape-string sexp) "\""))
      (t
 -     (or (cdr (assoc sexp *literal-table*))
 +     (or (cdr (assoc sexp *literal-table* :test #'equal))
           (let ((dumped (typecase sexp
                           (symbol (dump-symbol sexp))
-                          (cons (dump-cons sexp))
 +                         (string (dump-string sexp))
+                          (cons
+                           (if (eq (car sexp) *magic-unquote-marker*)
+                               (ls-compile (cdr sexp))
+                               (dump-cons sexp)))
                           (array (dump-array sexp)))))
             (if (and recursive (not (symbolp sexp)))
                 dumped