diff options
| -rw-r--r-- | src/lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lisp/core.lisp.pamphlet | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/lisp/ChangeLog b/src/lisp/ChangeLog index b67e87bd..15439211 100644 --- a/src/lisp/ChangeLog +++ b/src/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-08-18 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * core.lisp.pamphlet (|quit|)[GCL]: Don't quit, say si::bye. + (import-module): Simplify. + 2007-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu> * Makefile.pamphlet (GCL_LTCC): New variable. diff --git a/src/lisp/core.lisp.pamphlet b/src/lisp/core.lisp.pamphlet index 8c06119d..35df7c29 100644 --- a/src/lisp/core.lisp.pamphlet +++ b/src/lisp/core.lisp.pamphlet @@ -269,7 +269,7 @@ it would return $0$, meaning that everything is OK. (defun |quit| (&optional (status 0)) #+:sbcl (sb-ext:quit :unix-status status) #+:clisp (ext:quit status) - #+:gcl (quit status) + #+:gcl (si::bye status) #+:ecl (ext:quit status) #-(or :sbcl :clisp :gcl :ecl) (error "`quit' not implemented for this Lisp")) @@ -699,14 +699,12 @@ it would return $0$, meaning that everything is OK. (defun |importModule| (module) (do-import-module module |$LoadDirectories|)) -(eval-when (:compile-toplevel :load-toplevel :execute) (defmacro import-module (module) - `(progn (eval-when (:execute :compile-toplevel) - (|importModule| ,module)) - - (eval-when (:execute :load-toplevel) + `(progn (eval-when + #+:common-lisp (:compile-toplevel :load-toplevel :execute) + #-:common-lisp (compile load eval) (|importModule| ,module)))) -) + @ |