From: David Vazquez <davazp@gmail.com>
Date: Sun, 3 Feb 2013 11:25:19 +0000 (+0000)
Subject: Reverting "Dump keywords"
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=c1ffae5c8872df7e8c7f91dfe3ab26ef32f0eecc;p=jscl.git

Reverting "Dump keywords"

This reverts commit 2890060b5446322f3831a8d6fdcba189ac2877ff.
---

diff --git a/ecmalisp.lisp b/ecmalisp.lisp
index 9a1080d..8ce69d5 100644
--- a/ecmalisp.lisp
+++ b/ecmalisp.lisp
@@ -587,19 +587,15 @@
   ;; This function is used internally to initialize the CL package
   ;; with the symbols built during bootstrap.
   (defun %intern-symbol (symbol)
-    (let* ((package
-           (if (in "package" symbol)
-               (find-package-or-fail (oget symbol "package"))
-               *common-lisp-package*))
-           (symbols (%package-symbols *common-lisp-package*)))
-      (oset symbol "package" package)
+    (let ((symbols (%package-symbols *common-lisp-package*)))
+      (oset symbol "package" *common-lisp-package*)
       (oset symbols (symbol-name symbol) symbol)))
 
   (defun find-symbol (name &optional (package *package*))
     (let* ((package (find-package-or-fail package))
            (symbols (%package-symbols package)))
       (if (in name symbols)
-          (values (oget symbols name) :interned)
+          (values (oget symbols name) t)
           (dolist (used (package-use-list package) (values nil nil))
             (let ((exports (%package-external-symbols used)))
               (when (in name exports)
@@ -1348,17 +1344,12 @@
     ((symbolp sexp)
      (or (cdr (assoc sexp *literal-symbols*))
 	 (let ((v (genlit))
-	       (s #+common-lisp
-                 (let ((package (symbol-package sexp)))
-                   (if (eq package (find-package "KEYWORD"))
-                       (concat "{name: \"" (escape-string (symbol-name sexp))
-                               "\", package: '" (package-name package) "'}")
-                       (concat "{name: \"" (escape-string (symbol-name sexp)) "\"}")))
-                 #+ecmalisp
-                 (let ((package (symbol-package sexp)))
-                   (if (null package)
-                       (concat "{name: \"" (escape-string (symbol-name sexp)) "\"}")
-                       (ls-compile `(intern ,(symbol-name sexp) ,(package-name package)))))))
+	       (s #+common-lisp (concat "{name: \"" (escape-string (symbol-name sexp)) "\"}")
+		  #+ecmalisp
+                  (let ((package (symbol-package sexp)))
+                    (if (null package)
+                        (concat "{name: \"" (escape-string (symbol-name sexp)) "\"}")
+                        (ls-compile `(intern ,(symbol-name sexp) ,(package-name package)))))))
 	   (push (cons sexp v) *literal-symbols*)
 	   (toplevel-compilation (concat "var " v " = " s))
 	   v)))