;; You should have received a copy of the GNU General Public License
;; along with JSCL. If not, see <http://www.gnu.org/licenses/>.
+(/debug "loading package.lisp!")
+
(defvar *package-list* nil)
(defun list-all-packages ()
- *package-list*)
+ (copy-list *package-list*))
(defun make-package (name &key use)
(let ((package (new))
(use (mapcar #'find-package-or-fail use)))
- (oset package "packageName" name)
- (oset package "symbols" (new))
- (oset package "exports" (new))
- (oset package "use" use)
+ (setf (oget package "packageName") name)
+ (setf (oget package "symbols") (new))
+ (setf (oget package "exports") (new))
+ (setf (oget package "use") use)
(push package *package-list*)
package))
(defvar *package* *common-lisp-package*)
-(defmacro in-package (package-designator)
+(defmacro in-package (string-designator)
`(eval-when-compile
- (setq *package* (find-package-or-fail ,package-designator))))
+ (setq *package* (find-package-or-fail ',string-designator))))
;; This function is used internally to initialize the CL package
;; with the symbols built during bootstrap.
(if (in "package" symbol)
(find-package-or-fail (oget symbol "package"))
*common-lisp-package*))
- (symbols (%package-symbols package)))
- (oset symbol "package" package)
+ (symbols (%package-symbols package))
+ (exports (%package-external-symbols package)))
+ (setf (oget symbol "package") package)
+ (setf (oget symbols (symbol-name symbol)) symbol)
+ ;; Turn keywords self-evaluated and export them.
(when (eq package *keyword-package*)
- (oset symbol "value" symbol))
- (oset symbols (symbol-name symbol) symbol)))
+ (setf (oget symbol "value") symbol)
+ (setf (oget exports (symbol-name symbol)) symbol))))
(defun find-symbol (name &optional (package *package*))
(let* ((package (find-package-or-fail package))
(let ((symbols (%package-symbols package)))
(oget symbols name)
(let ((symbol (make-symbol name)))
- (oset symbol "package" package)
+ (setf (oget symbol "package") package)
(when (eq package *keyword-package*)
- (oset symbol "value" symbol)
+ (setf (oget symbol "value") symbol)
(export (list symbol) package))
(when *intern-hook*
(funcall *intern-hook* symbol))
- (oset symbols name symbol)
+ (setf (oget symbols name) symbol)
(values symbol nil)))))))
(defun symbol-package (symbol)
(defun export (symbols &optional (package *package*))
(let ((exports (%package-external-symbols package)))
(dolist (symb symbols t)
- (oset exports (symbol-name symb) symb))))
+ (setf (oget exports (symbol-name symb)) symb))))
+
+(defun %map-external-symbols (function package)
+ (map-for-in function (%package-external-symbols package)))
+
+(defun %map-symbols (function package)
+ (map-for-in function (%package-symbols package))
+ (dolist (used (package-use-list package))
+ (%map-external-symbols function used)))
+
+(defun %map-all-symbols (function)
+ (dolist (package *package-list*)
+ (map-for-in function (%package-symbols package))))
+
+(defmacro do-symbols ((var &optional (package '*package*) result-form)
+ &body body)
+ `(block nil
+ (%map-symbols
+ (lambda (,var) ,@body)
+ (find-package ,package))
+ ,result-form))
+
+(defmacro do-external-symbols ((var &optional (package '*package*)
+ result-form)
+ &body body)
+ `(block nil
+ (%map-external-symbols
+ (lambda (,var) ,@body)
+ (find-package ,package))
+ ,result-form))
+
+(defmacro do-all-symbols ((var &optional result-form) &body body)
+ `(block nil (%map-all-symbols (lambda (,var) ,@body)) ,result-form))
+
+(defun find-all-symbols (string)
+ (let (symbols)
+ (dolist (package *package-list* symbols)
+ (multiple-value-bind (symbol status) (find-symbol string package)
+ (when status
+ (pushnew symbol symbols :test #'eq))))))