From: David Vázquez Date: Sat, 4 May 2013 11:31:13 +0000 (+0100) Subject: Fix failing test X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=4287e80f214812778b3923364918ce3c01c94957;p=jscl.git Fix failing test --- diff --git a/src/print.lisp b/src/print.lisp index 310754e..39ea95e 100644 --- a/src/print.lisp +++ b/src/print.lisp @@ -94,20 +94,21 @@ (cond ((null form) "NIL") ((symbolp form) - (multiple-value-bind (found-symbol status) - (find-symbol (symbol-name form)) - (if (eq found-symbol form) - (escape-token (symbol-name form) (not (eq *package* *js-package*))) - (let ((package (symbol-package form)) - (name (symbol-name form))) - (concat (cond - ((null package) "#") - ((eq package (find-package "KEYWORD")) "") - (t (escape-token (package-name package)))) - ":" - (if (or (null package) (eq :external (second (multiple-value-list (find-symbol name package))))) - "" ":") - (escape-token name package)))))) + (let ((name (symbol-name form)) + (package (symbol-package form))) + (if (eq package *package*) + (escape-token (symbol-name form) (not (eq package *js-package*))) + (concat (cond + ((null package) "#") + ((eq package (find-package "KEYWORD")) "") + (t (escape-token (package-name package) t))) + ":" + (if (or (null package) + (multiple-value-bind (_ status) + (find-symbol name package) + (eq status :external))) + "" ":") + (escape-token name (not (eq (symbol-package form) *js-package*))))))) ((integerp form) (integer-to-string form)) ((floatp form) (float-to-string form)) ((characterp form)