diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-05-10 22:50:44 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-05-10 22:50:44 +0000 |
| commit | c17f22c0fea71fba2e99aad1e7292be1963ae96d (patch) | |
| tree | f51301306df7b6a741e9506d1af5abf7512af49e /src/lisp | |
| parent | 76905b59dbaaac8fab4892067e973312fd86dde9 (diff) | |
| download | open-axiom-c17f22c0fea71fba2e99aad1e7292be1963ae96d.tar.gz | |
Cope with SBCL-1.0.28 improvements.
* boot/translator.boot (translateToplevel): Load imported modules.
* boot/ast.boot ($constantIdentifiers): New.
($activeNamespace): Likewise.
(bfSimpleDefinition): Likewise.
(isDynamicVariable): Likewise.
(shoeCompTran1): Tidy. Use it.
* boot/parser.boot (bpSimpleDefinitionTail): Use bfSimpleDefinition.
* boot/Makefile.in (stage1/%.clisp): Specify load directory.
(stage2/%.clisp): Likewise.
* lisp/core.lisp.in (startCompileDuration): Export.
(endCompileDuration): Likewise.
Diffstat (limited to 'src/lisp')
| -rw-r--r-- | src/lisp/core.lisp.in | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in index 50fc80b9..489b1db6 100644 --- a/src/lisp/core.lisp.in +++ b/src/lisp/core.lisp.in @@ -61,6 +61,8 @@ "countError" "resetErrorCount" "warn" + "startCompileDuration" + "endCompileDuration" "%ByteArray" "makeByteArray" @@ -105,7 +107,7 @@ "pathBasename" "IMPORT-MODULE" - "BOOT-IMPORT" + "bootImport" "CONCAT" "$EditorProgram" )) @@ -819,7 +821,7 @@ :directory (list (|currentDirectoryName|))))) (unwind-protect (progn - (begin-compile-time) + (|startCompileDuration|) (multiple-value-bind (result warning-p failure-p) #-:ecl (compile-file file :output-file out-file) #+:ecl (compile-file file :output-file out-file :system-p t) @@ -840,7 +842,7 @@ (warning-p (|warn| "Lisp code contained warnings"))) result)) - (end-compile-time))) + (|endCompileDuration|))) (defun |compileLispHandler| (prog-name options in-file) (declare (ignore prog-name)) @@ -979,9 +981,8 @@ (if (compile-time-p) (|importModule| ,module))))) -(defmacro boot-import (module) - `(eval-when (:compile-toplevel) - (|importModule| ,module))) +(defmacro |bootImport| (module) + `(|importModule| ,module)) ;; ;; -*- Feature Tests in Boot -*- @@ -990,11 +991,11 @@ (defun |%hasFeature| (f) (member f *features* :test #'eq)) -(defun begin-compile-time nil +(defun |startCompileDuration| nil (push :open-axiom-compile-time *features*)) -(defun end-compile-time nil - (pop *features*)) +(defun |endCompileDuration| nil + (delete :open-axiom-compile-time *features*)) (defun compile-time-p nil (member :open-axiom-compile-time *features*)) |