projects
/
jscl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add eval-when special form
[jscl.git]
/
src
/
package.lisp
diff --git
a/src/package.lisp
b/src/package.lisp
index
c7251b6
..
b93fe02
100644
(file)
--- a/
src/package.lisp
+++ b/
src/package.lisp
@@
-13,6
+13,8
@@
;; You should have received a copy of the GNU General Public License
;; along with JSCL. If not, see <http://www.gnu.org/licenses/>.
;; 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 ()
(defvar *package-list* nil)
(defun list-all-packages ()
@@
-21,10
+23,10
@@
(defun make-package (name &key use)
(let ((package (new))
(use (mapcar #'find-package-or-fail use)))
(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))
(push package *package-list*)
package))
@@
-86,12
+88,12
@@
*common-lisp-package*))
(symbols (%package-symbols package))
(exports (%package-external-symbols package)))
*common-lisp-package*))
(symbols (%package-symbols package))
(exports (%package-external-symbols package)))
- (oset symbol "package" package)
- (oset symbols (symbol-name symbol) symbol)
+ (setf (oget symbol "package") package)
+ (setf (oget symbols (symbol-name symbol)) symbol)
;; Turn keywords self-evaluated and export them.
(when (eq package *keyword-package*)
;; Turn keywords self-evaluated and export them.
(when (eq package *keyword-package*)
- (oset symbol "value" symbol)
- (oset exports (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))
(defun find-symbol (name &optional (package *package*))
(let* ((package (find-package-or-fail package))
@@
-122,13
+124,13
@@
(let ((symbols (%package-symbols package)))
(oget symbols name)
(let ((symbol (make-symbol name)))
(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*)
(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))
(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)
(values symbol nil)))))))
(defun symbol-package (symbol)
@@
-139,7
+141,7
@@
(defun export (symbols &optional (package *package*))
(let ((exports (%package-external-symbols package)))
(dolist (symb symbols t)
(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-external-symbols (function package)
(map-for-in function (%package-external-symbols package)))
@@
-153,6
+155,10
@@
(dolist (package *package-list*)
(map-for-in function (%package-symbols package))))
(dolist (package *package-list*)
(map-for-in function (%package-symbols package))))
+(defun %map-all-external-symbols (function)
+ (dolist (package *package-list*)
+ (map-for-in function (%package-external-symbols package))))
+
(defmacro do-symbols ((var &optional (package '*package*) result-form)
&body body)
`(block nil
(defmacro do-symbols ((var &optional (package '*package*) result-form)
&body body)
`(block nil
@@
-173,9
+179,12
@@
(defmacro do-all-symbols ((var &optional result-form) &body body)
`(block nil (%map-all-symbols (lambda (,var) ,@body)) ,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)
+(defmacro do-all-external-symbols ((var &optional result-form) &body body)
+ `(block nil (%map-all-external-symbols (lambda (,var) ,@body)) ,result-form))
+
+(defun find-all-symbols (string &optional external-only)
(let (symbols)
(dolist (package *package-list* symbols)
(multiple-value-bind (symbol status) (find-symbol string package)
(let (symbols)
(dolist (package *package-list* symbols)
(multiple-value-bind (symbol status) (find-symbol string package)
- (when status
+ (when (if external-only (eq status :external) status)
(pushnew symbol symbols :test #'eq))))))
(pushnew symbol symbols :test #'eq))))))