From 1189054f7f23b886407a1be8263f4ab41edaa999 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Fri, 14 Sep 2007 19:42:36 +0000 Subject: * vmlisp.lisp.pamphlet: Don't define package VMLISP. Remove export declarations. Import "boot-pkg". * sys-macros.lisp (EQUABLE): Remove definition. * sys-constants.boot ($true): Define as twice quoted T. * hash.lisp.pamphlet: Push into package BOOT, VMLISP. * ggreater.lisp: Likewise. * nlib.lisp.pamphlet: Likewise. * obey.lisp: Likewise. * construc.lisp.pamphlet: Remove reference to VMLISP package. * daase.lisp.pamphlet: Likewise. * debug.lisp.pamphlet: Likewise. * util.lisp.pamphlet: Likewise. * cformat.boot: Remove hack for GCL limitation. * scan.boot: Likewise. * incl.boot: Likewise. * parsing.lisp: Likewise. * bootlex.lisp: Remove reference to VMLISP package. * union.lisp: Likewise. * boot-pkg.lisp: Remove hack for GCL limitation. Don't import "vmlisp" anymore. * bookvol5.pamphlet (vmlisp::$current-directory): Remove. * patches.lisp.pamphlet: Likewise. * astr.boot: Import "vmlisp" instead of "boot-pkg". * Makefile.pamphlet (boot-pkg.$(FASLEXT)): Don't depend on vmlisp.$(FASLEXT). (vmlisp.$(FASLEXT)): Depend on boot=pkg.$(FASLEXT). --- src/interp/ChangeLog | 29 ++++++++ src/interp/Makefile.in | 8 +-- src/interp/Makefile.pamphlet | 8 +-- src/interp/astr.boot | 2 +- src/interp/bookvol5.pamphlet | 8 +-- src/interp/boot-pkg.lisp | 12 +--- src/interp/bootlex.lisp | 2 +- src/interp/cformat.boot | 8 --- src/interp/construc.lisp.pamphlet | 14 ++-- src/interp/daase.lisp.pamphlet | 4 +- src/interp/debug.lisp.pamphlet | 4 +- src/interp/ggreater.lisp | 2 +- src/interp/hash.lisp.pamphlet | 2 +- src/interp/incl.boot | 8 --- src/interp/monitor.lisp.pamphlet | 2 +- src/interp/nlib.lisp.pamphlet | 4 +- src/interp/obey.lisp | 4 +- src/interp/parsing.lisp | 10 +-- src/interp/patches.lisp.pamphlet | 12 ++-- src/interp/scan.boot | 8 --- src/interp/sys-constants.boot | 2 +- src/interp/sys-macros.lisp | 14 ---- src/interp/union.lisp | 2 +- src/interp/util.lisp.pamphlet | 14 ++-- src/interp/vmlisp.lisp.pamphlet | 141 ++------------------------------------ 25 files changed, 84 insertions(+), 240 deletions(-) (limited to 'src') diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index 6bc4a8e6..c6196ee4 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,3 +1,32 @@ +2007-09-14 Gabriel Dos Reis + + * vmlisp.lisp.pamphlet: Don't define package VMLISP. Remove + export declarations. Import "boot-pkg". + * sys-macros.lisp (EQUABLE): Remove definition. + * sys-constants.boot ($true): Define as twice quoted T. + * hash.lisp.pamphlet: Push into package BOOT, VMLISP. + * ggreater.lisp: Likewise. + * nlib.lisp.pamphlet: Likewise. + * obey.lisp: Likewise. + * construc.lisp.pamphlet: Remove reference to VMLISP package. + * daase.lisp.pamphlet: Likewise. + * debug.lisp.pamphlet: Likewise. + * util.lisp.pamphlet: Likewise. + * cformat.boot: Remove hack for GCL limitation. + * scan.boot: Likewise. + * incl.boot: Likewise. + * parsing.lisp: Likewise. + * bootlex.lisp: Remove reference to VMLISP package. + * union.lisp: Likewise. + * boot-pkg.lisp: Remove hack for GCL limitation. Don't import + "vmlisp" anymore. + * bookvol5.pamphlet (vmlisp::$current-directory): Remove. + * patches.lisp.pamphlet: Likewise. + * astr.boot: Import "vmlisp" instead of "boot-pkg". + * Makefile.pamphlet (boot-pkg.$(FASLEXT)): Don't depend on + vmlisp.$(FASLEXT). + (vmlisp.$(FASLEXT)): Depend on boot=pkg.$(FASLEXT). + 2007-09-13 Gabriel Dos Reis * Makefile.pamphlet (OBJS): Don't include ptrop.$(FASLEXT). diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index 18ad5b37..84eb57ba 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -435,9 +435,6 @@ sys-globals.$(FASLEXT): sys-globals.boot sys-constants.$(FASLEXT) \ sys-constants.$(FASLEXT): sys-constants.boot boot-pkg.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< -boot-pkg.$(FASLEXT): boot-pkg.lisp vmlisp.$(FASLEXT) - $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< - hash.$(FASLEXT): hash.lisp vmlisp.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< @@ -447,7 +444,10 @@ union.$(FASLEXT): union.lisp vmlisp.$(FASLEXT) ggreater.$(FASLEXT): ggreater.lisp vmlisp.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< -vmlisp.$(FASLEXT): vmlisp.lisp +vmlisp.$(FASLEXT): vmlisp.lisp boot-pkg.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +boot-pkg.$(FASLEXT): boot-pkg.lisp $(BOOTSYS) -- --compile --output=$@ $< .PHONY: all-axiomsys diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index 6441ae64..ee4eb038 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -1067,9 +1067,6 @@ sys-globals.$(FASLEXT): sys-globals.boot sys-constants.$(FASLEXT) \ sys-constants.$(FASLEXT): sys-constants.boot boot-pkg.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< -boot-pkg.$(FASLEXT): boot-pkg.lisp vmlisp.$(FASLEXT) - $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< - hash.$(FASLEXT): hash.lisp vmlisp.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< @@ -1079,7 +1076,10 @@ union.$(FASLEXT): union.lisp vmlisp.$(FASLEXT) ggreater.$(FASLEXT): ggreater.lisp vmlisp.$(FASLEXT) $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< -vmlisp.$(FASLEXT): vmlisp.lisp +vmlisp.$(FASLEXT): vmlisp.lisp boot-pkg.$(FASLEXT) + $(BOOTSYS) -- --compile --output=$@ --load-directory=. $< + +boot-pkg.$(FASLEXT): boot-pkg.lisp $(BOOTSYS) -- --compile --output=$@ $< @ diff --git a/src/interp/astr.boot b/src/interp/astr.boot index b3143314..a5243849 100644 --- a/src/interp/astr.boot +++ b/src/interp/astr.boot @@ -31,7 +31,7 @@ -- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import '"boot-pkg" +import '"vmlisp" )package "BOOT" diff --git a/src/interp/bookvol5.pamphlet b/src/interp/bookvol5.pamphlet index ed3a91f6..79fca804 100644 --- a/src/interp/bookvol5.pamphlet +++ b/src/interp/bookvol5.pamphlet @@ -178,7 +178,7 @@ NAME & SET & USE \\ coerceFailure & & runspad \\ curinstream & ncIntLoop & \\ curoutstream & ncIntLoop & \\ -vmlisp::\$current-directory & restart & \\ +\$current-directory & restart & \\ & reroot & \\ \$currentLine & restart & removeUndoLines \\ \$dalymode & & intloopReadConsole \\ @@ -276,7 +276,7 @@ The [[curoutstream]] variable is set to the value of the [[*standard-output*]] common lisp variable in [[ncIntLoop]]. While not using the ``dollar'' convention this variable is still ``global''. -\subsection{vmlisp::\$current-directory} +\subsection{\$current-directory} When running in Lucid Common Lisp ([[:lucid]]) on an IBM/370 mainframe ([[:ibm/370]]) this variable is used in place of the [[*default-pathname-defaults*]] common lisp variable. @@ -706,9 +706,9 @@ We do not care that tail recursion occurs. (setq |$IOindex| 1) (setq |$InteractiveFrame| (|makeInitialModemapFrame|)) #+(and :lucid :ibm/370) - (setq vmlisp::$current-directory "") + (setq $current-directory "") #-(and :lucid :ibm/370) - (setq vmlisp::$current-directory + (setq $current-directory (make-directory *default-pathname-defaults*)) (|loadExposureGroupData|) (|statisticsInitialization|) diff --git a/src/interp/boot-pkg.lisp b/src/interp/boot-pkg.lisp index 9c44899d..596b2c15 100644 --- a/src/interp/boot-pkg.lisp +++ b/src/interp/boot-pkg.lisp @@ -32,20 +32,10 @@ ;; Copyright (C) 2007 Gabriel Dos Reis -;; This file contains the primary definition of the BOOT package - -;; This is a horrible hack to work around a horrible bug in GCL -;; as reported here: -;; http://lists.gnu.org/archive/html/gcl-devel/2007-08/msg00004.html -;; -#+(and :gcl (not :common-lisp)) (in-package "VMLISP") -#+(and :gcl (not :common-lisp)) (in-package "AxiomCore") - -(import-module "vmlisp") (defpackage "BOOT" #+:common-lisp (:use "COMMON-LISP") #-:common-lisp (:use "LISP") - (:use "VMLISP" "AxiomCore")) + (:use "AxiomCore")) (in-package "BOOT") diff --git a/src/interp/bootlex.lisp b/src/interp/bootlex.lisp index 11253558..04c934fe 100644 --- a/src/interp/bootlex.lisp +++ b/src/interp/bootlex.lisp @@ -78,7 +78,7 @@ (defun |oldParserAutoloadOnceTrigger| () nil) (defun print-defun (name body) - (let* ((sp (assoc 'vmlisp::compiler-output-stream vmlisp::optionlist)) + (let* ((sp (assoc 'compiler-output-stream optionlist)) (st (if sp (cdr sp) *standard-output*))) (if (and (is-console st) (symbolp name) (fboundp name) (not (compiled-function-p (symbol-function name)))) diff --git a/src/interp/cformat.boot b/src/interp/cformat.boot index 953fc744..c4d48eac 100644 --- a/src/interp/cformat.boot +++ b/src/interp/cformat.boot @@ -31,14 +31,6 @@ -- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- This is a horrible hack to work around a horrible bug in GCL --- as reported here: --- http://lists.gnu.org/archive/html/gcl-devel/2007-08/msg00004.html --- -)if %hasFeature KEYWORD::GCL -)package "VMLISP" -)package "AxiomCore" -)endif import '"unlisp" import '"posit" diff --git a/src/interp/construc.lisp.pamphlet b/src/interp/construc.lisp.pamphlet index 51ebf1c6..947429e7 100644 --- a/src/interp/construc.lisp.pamphlet +++ b/src/interp/construc.lisp.pamphlet @@ -204,10 +204,10 @@ (rdefiostream (list (cons 'file p) '(mode . input)) nil fn)) -(in-package "VMLISP") +(in-package "BOOT") ; from nlib.lisp -(defun vmlisp::get-index-table-from-stream (stream &optional abbrev) +(defun get-index-table-from-stream (stream &optional abbrev) (let (pos) (file-position stream 0) (setq pos (read stream)) @@ -221,18 +221,18 @@ (read stream)) ('else pos)))) -(defun vmlisp::loadvol (&rest filearg) +(defun loadvol (&rest filearg) (cond ((typep (car filearg) 'libstream) (load (concat (libstream-dirname (car filearg)) "/code"))) (t (setq filearg (make-input-filename (boot::mergelib filearg) 'LISPLIB)) - (if (vmlisp::library-file filearg) + (if (library-file filearg) (load (concat filearg "/code")) (load filearg))))) ; from nlib.lisp ;; (RDEFIOSTREAM ((MODE . IO) (FILE fn ft dir))) IO is I,O,INPUT,OUTPUT -(defun vmlisp::rdefiostream +(defun rdefiostream (options &optional (missing-file-error-flag t) abbrev) (let ((mode (cdr (assoc 'mode options))) (file (assoc 'file options)) @@ -241,14 +241,14 @@ (indextable nil)) (cond ((equal (elt (string mode) 0) #\I) (setq fullname (make-input-filename (cdr file) 'LISPLIB)) - (setq stream (vmlisp::get-input-index-stream fullname)) + (setq stream (get-input-index-stream fullname)) (if (null stream) (if missing-file-error-flag (ERROR (format nil "Library ~s doesn't exist" (make-filename (cdr file) 'LISPLIB))) NIL) (make-libstream :mode 'input :dirname fullname - :indextable (vmlisp::get-index-table-from-stream stream abbrev) + :indextable (get-index-table-from-stream stream abbrev) :indexstream stream))) ((equal (elt (string mode) 0) #\O) (setq fullname (make-full-namestring (cdr file) 'LISPLIB)) diff --git a/src/interp/daase.lisp.pamphlet b/src/interp/daase.lisp.pamphlet index 6713021f..80247f48 100644 --- a/src/interp/daase.lisp.pamphlet +++ b/src/interp/daase.lisp.pamphlet @@ -896,7 +896,7 @@ database. (mapcan #'(lambda (f) (when (string-equal (pathname-type f) "NRLIB") (list (concatenate 'string (namestring f) "/" - vmlisp::*index-filename*)))) allfiles) + *index-filename*)))) allfiles) (mapcan #'(lambda (f) (when (string= (pathname-type f) "asy") (push (pathname-name f) skipasos) @@ -931,7 +931,7 @@ database. (cond ((setq file (probe-file (concatenate 'string namedir filename ".NRLIB/" - vmlisp::*index-filename*))) + *index-filename*))) (push (namestring file) nrlibs)) ((setq file (probe-file (concatenate 'string namedir filename ".asy"))) diff --git a/src/interp/debug.lisp.pamphlet b/src/interp/debug.lisp.pamphlet index 48c415fa..b4ceeed3 100644 --- a/src/interp/debug.lisp.pamphlet +++ b/src/interp/debug.lisp.pamphlet @@ -114,7 +114,7 @@ exit (rds ifile) ; PURPOSE: Debugging hooks for Boot code (in-package "BOOT") -(use-package '("LISP" "VMLISP")) +(use-package '("LISP" )) (DEFPARAMETER /COUNTLIST NIL) (DEFPARAMETER /TIMERLIST NIL) @@ -281,7 +281,7 @@ exit (rds ifile) ;; next is done in case the diskmode changed (SHUT INPUTSTREAM) )) ;;(SETQ INFILE (|pathname| (IFCAR ($LISTFILE INFILE)))) - (SETQ INFILE (vmlisp::make-input-filename INFILE)) + (SETQ INFILE (make-input-filename INFILE)) (MAKEPROP /FN 'DEFLOC (CONS RECNO INFILE)) (SETQ oft (|object2Identifier| (UPCASE (|pathnameType| INFILE)))) diff --git a/src/interp/ggreater.lisp b/src/interp/ggreater.lisp index 20b6b5fa..a77438c0 100644 --- a/src/interp/ggreater.lisp +++ b/src/interp/ggreater.lisp @@ -31,7 +31,7 @@ (IMPORT-MODULE "vmlisp") -(in-package "VMLISP") +(in-package "BOOT") (DEFUN LEXGREATERP (COMPERAND-1 COMPERAND-2) ;; "Order of types: pair NIL vec ivec/rvec cvec ident num fbpi mbpi other" diff --git a/src/interp/hash.lisp.pamphlet b/src/interp/hash.lisp.pamphlet index 46c7cf17..be039807 100644 --- a/src/interp/hash.lisp.pamphlet +++ b/src/interp/hash.lisp.pamphlet @@ -51,7 +51,7 @@ <> (IMPORT-MODULE "vmlisp") -(in-package "VMLISP") +(in-package "BOOT") (export '(MAKE-HASHTABLE HGET HKEYS HCOUNT HPUT HPUT* HREM HCLEAR HREMPROP HASHEQ HASHUEQUAL HASHCVEC HASHID HASHTABLEP CVEC UEQUAL ID HPUTPROP diff --git a/src/interp/incl.boot b/src/interp/incl.boot index c4e928aa..734411dc 100644 --- a/src/interp/incl.boot +++ b/src/interp/incl.boot @@ -31,14 +31,6 @@ -- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- This is a horrible hack to work around a horrible bug in GCL --- as reported here: --- http://lists.gnu.org/archive/html/gcl-devel/2007-08/msg00004.html --- -)if %hasFeature KEYWORD::GCL -)package "VMLISP" -)package "AxiomCore" -)endif import '"unlisp" import '"cstream" diff --git a/src/interp/monitor.lisp.pamphlet b/src/interp/monitor.lisp.pamphlet index d303d34d..47fc8fd4 100644 --- a/src/interp/monitor.lisp.pamphlet +++ b/src/interp/monitor.lisp.pamphlet @@ -660,7 +660,7 @@ for example: (defun monitor-autoload () "traces autoload of algebra to monitor corresponding source files" - (trace (vmlisp::loadvol + (trace (loadvol :entrycond nil :exitcond (progn (monitor-dirname system::arglist) nil)))) diff --git a/src/interp/nlib.lisp.pamphlet b/src/interp/nlib.lisp.pamphlet index 2782a6cb..24f86ccd 100644 --- a/src/interp/nlib.lisp.pamphlet +++ b/src/interp/nlib.lisp.pamphlet @@ -79,7 +79,7 @@ but has been changed to read: <<*>>= <> -(in-package "VMLISP") +(in-package "BOOT") #+:AKCL (defvar *lisp-bin-filetype* "o") @@ -511,7 +511,7 @@ but has been changed to read: (system (concat "cp " namestring1 " " namestring2))) -(defvar vmlisp::$filetype-table +(defvar $filetype-table '((BOOT::LISPLIB . |LILIB|) (BOOT::SPADLIB . |slib|) (BOOT::HISTORY . |hist|) diff --git a/src/interp/obey.lisp b/src/interp/obey.lisp index 6e105f2b..8636fef4 100644 --- a/src/interp/obey.lisp +++ b/src/interp/obey.lisp @@ -30,7 +30,7 @@ ;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -(in-package "VMLISP") +(in-package "BOOT") #+ (and :lucid :unix) (defun OBEY (S) @@ -51,7 +51,7 @@ #+ (and :lucid :unix) (defun copy-lib-directory (name1 name2) - (vmlisp::makedir name2) + (makedir name2) (system:run-aix-program "sh" :arguments (list "-c" (concat "cp " name1 "/* " name2)))) diff --git a/src/interp/parsing.lisp b/src/interp/parsing.lisp index d3d8dbc2..d607ce93 100644 --- a/src/interp/parsing.lisp +++ b/src/interp/parsing.lisp @@ -73,14 +73,8 @@ ; BOOTLEX.LISP: Boot file handling, auxiliary parsing actions and tokenizing ; NEWMETA.LISP: Boot parsing -;; This is a horrible hack to work around a horrible bug in GCL -;; as reported here: -;; http://lists.gnu.org/archive/html/gcl-devel/2007-08/msg00004.html -;; -#+(and :gcl (not :common-lisp)) (in-package "VMLISP") -#+(and :gcl (not :common-lisp)) (in-package "AxiomCore") - -(import-module "boot-pkg") + +(import-module "vmlisp") (in-package "BOOT") ; 0. Current I/O Stream definition diff --git a/src/interp/patches.lisp.pamphlet b/src/interp/patches.lisp.pamphlet index a825922c..04fcc390 100644 --- a/src/interp/patches.lisp.pamphlet +++ b/src/interp/patches.lisp.pamphlet @@ -137,7 +137,7 @@ previous definition. (defun /RF-1 (ignore) (declare (ignore ignore)) - (let* ((input-file (vmlisp::make-input-filename /EDITFILE)) + (let* ((input-file (make-input-filename /EDITFILE)) (lfile ()) (type (pathname-type input-file))) (cond @@ -159,7 +159,7 @@ previous definition. (t (spad input-file))))) (defun /EF (&rest foo) - (obey (concat "vi " (namestring (vmlisp::make-input-filename /EDITFILE))))) + (obey (concat "vi " (namestring (make-input-filename /EDITFILE))))) #-:CCL (defun user::start () (in-package "BOOT") (boot::|start|)) #+:CCL @@ -263,9 +263,9 @@ previous definition. #+(or :CCL (and :lucid :ibm/370)) -(setq vmlisp::$current-directory (truename ".")) +(setq $current-directory (truename ".")) #-(or :CCL (and :lucid :ibm/370)) -(setq vmlisp::$current-directory (make-directory *default-pathname-defaults*)) +(setq $current-directory (make-directory *default-pathname-defaults*)) (defvar *msghash* nil "hash table keyed by msg number") @@ -318,9 +318,9 @@ previous definition. (unless (zerop returncode) (bye returncode))))) #+:dos -(setq vmlisp::$current-directory (truename ".")) +(setq $current-directory (truename ".")) #+:dos -(setq vmlisp::$spadroot "/spad/mnt/dos") +(setq $spadroot "/spad/mnt/dos") #+:dos (defun user-homedir-pathname () (truename ".")) diff --git a/src/interp/scan.boot b/src/interp/scan.boot index 5fd0caa6..fcebbc9c 100644 --- a/src/interp/scan.boot +++ b/src/interp/scan.boot @@ -31,14 +31,6 @@ -- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- This is a horrible hack to work around a horrible bug in GCL --- as reported here: --- http://lists.gnu.org/archive/html/gcl-devel/2007-08/msg00004.html --- -)if %hasFeature KEYWORD::GCL -)package "VMLISP" -)package "AxiomCore" -)endif import '"bits" import '"dq" diff --git a/src/interp/sys-constants.boot b/src/interp/sys-constants.boot index af971c11..cd8df2ac 100644 --- a/src/interp/sys-constants.boot +++ b/src/interp/sys-constants.boot @@ -520,7 +520,7 @@ $One == ++ $true == - true + ''T $false == false diff --git a/src/interp/sys-macros.lisp b/src/interp/sys-macros.lisp index 903f04e3..557ac834 100644 --- a/src/interp/sys-macros.lisp +++ b/src/interp/sys-macros.lisp @@ -32,13 +32,6 @@ ;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ;; -;; This is a horrible hack to work around a horrible bug in GCL -;; as reported here: -;; http://lists.gnu.org/archive/html/gcl-devel/2007-08/msg00004.html -;; -#+(and :gcl (not :common-lisp)) (in-package "VMLISP") -#+(and :gcl (not :common-lisp)) (in-package "AxiomCore") - (IMPORT-MODULE "union") (IMPORT-MODULE "sys-globals") @@ -119,13 +112,6 @@ (t `(EQQUAL ,a ,b)))) -(eval-when - #+:common-lisp (:compile-toplevel :load-toplevel :execute) - #-:common-lisp (compile load eval) - (defun EQUABLE (X) - (OR (NULL X) - (AND (EQCAR X 'QUOTE) (symbolp (CADR X)))))) - (defmacro EQQUAL (a b) (cond ((OR (EQUABLE a) (EQUABLE b)) `(eq ,a ,b)) diff --git a/src/interp/union.lisp b/src/interp/union.lisp index 2c82e06f..108d5f07 100644 --- a/src/interp/union.lisp +++ b/src/interp/union.lisp @@ -31,7 +31,7 @@ (IMPORT-MODULE "vmlisp") -(in-package "VMLISP") +(in-package "BOOT") ;;macros from file vmlisp are necessary to compile this file (DEFUN |intersection| (LIST-OF-ITEMS-1 LIST-OF-ITEMS-2) diff --git a/src/interp/util.lisp.pamphlet b/src/interp/util.lisp.pamphlet index f6c4dd32..da707ab2 100644 --- a/src/interp/util.lisp.pamphlet +++ b/src/interp/util.lisp.pamphlet @@ -1018,7 +1018,7 @@ need to be compiled without optimize due to compiler bugs (error "makelib:MID=~a OUT=~a~% these are not set properly~%" mid out)) #+:akcl (compiler::emit-fn nil) #+:akcl (si::chdir mid) -#-:akcl (vmlisp::obey (concatenate 'string "cd " mid)) +#-:akcl (obey (concatenate 'string "cd " mid)) (setq libs (directory "*.NRLIB")) (unless libs (format t "makelib:directory of ~a returned NIL~%" mid) @@ -1042,7 +1042,7 @@ need to be compiled without optimize due to compiler bugs (concatenate 'string out "/" (pathname-name lib) ".NRLIB/index.KAF*")) (unless (probe-file mntlib) (format t "creating directory ~a~%" mntlib) - (vmlisp::obey (concatenate 'string "cp -pr " (namestring lib) " " out)) + (obey (concatenate 'string "cp -pr " (namestring lib) " " out)) (when (probe-file (concatenate 'string mntlib "/code." stype)) (delete-file (concatenate 'string mntlib "/code." stype)))) (setq intkafdate (and (probe-file intkaf) (file-write-date intkaf))) @@ -1050,7 +1050,7 @@ need to be compiled without optimize due to compiler bugs (when intkafdate (unless (and mntkafdate (> mntkafdate intkafdate)) (format t "~©ing ~s to ~s" intkaf mntkaf) - (vmlisp::obey + (obey (concatenate 'string "cp " (namestring intkaf) " " (namestring mntkaf))))) (setq lspdate (and (probe-file dotlsp) (file-write-date dotlsp))) @@ -1105,7 +1105,7 @@ quality we check anyway. (format t "doing directory on ~s...~%" (concatenate 'string src "/*")) (error "makespad:SRC=~a MID=~a not set properly~%" src mid)) #+:akcl (si::chdir mid) -#-:akcl (vmlisp::obey (concatenate 'string "cd " mid)) +#-:akcl (obey (concatenate 'string "cd " mid)) (setq mntlibs (directory "*.NRLIB")) (unless mntlibs (format t "makespad:directory of ~a returned NIL~%" src) @@ -1204,7 +1204,7 @@ of the exposed constructors, is consistent with the actual libraries. "read the NRLIB directory and return a sorted abbreviation list" (let (libs nrlibs) #+:akcl (si::chdir algebra) -#-:akcl (vmlisp::obey (concatenate 'string "cd " algebra)) +#-:akcl (obey (concatenate 'string "cd " algebra)) (setq nrlibs (directory "*.NRLIB")) (unless nrlibs (error "libcheck: (directory ~s) returned NIL~%" @@ -1246,7 +1246,7 @@ of the exposed constructors, is consistent with the actual libraries. (SRCSCAN () (let (longnames names) #+:gcl (system::chdir int) -#-:gcl (vmlisp::obey (concatenate 'string "cd " int)) +#-:gcl (obey (concatenate 'string "cd " int)) (setq spads (directory "*.spad")) (dolist (spad spads) (multiple-value-setq (short long) (srcabbrevs spad)) @@ -1289,7 +1289,7 @@ final TAGS file is constructed in the {\bf tmp} directory. <>= (defun make-tags-file () #+:gcl (system:chdir "/tmp") -#-:gcl (vmlisp::obey (concatenate 'string "cd " "/tmp")) +#-:gcl (obey (concatenate 'string "cd " "/tmp")) (obey (concat "etags " (make-absolute-filename "../../src/interp/*.lisp"))) (spadtags-from-directory "../../src/interp" "boot") (obey "cat /tmp/boot.TAGS >> /tmp/TAGS")) diff --git a/src/interp/vmlisp.lisp.pamphlet b/src/interp/vmlisp.lisp.pamphlet index 0497f8c9..086c82f7 100644 --- a/src/interp/vmlisp.lisp.pamphlet +++ b/src/interp/vmlisp.lisp.pamphlet @@ -58,142 +58,8 @@ This is the package that originally contained the \Tool{VMLisp} macros but in fact contains macros to support several other lisps. It is essentially the place where most of the macros to support idioms from prior ports (like [[rdefiostream]] and [[fileactq]]) -<<*>>= -<> -(defpackage "VMLISP" - #+:common-lisp (:use "COMMON-LISP-USER" "COMMON-LISP") - #-:common-lisp (:use "USER" "SYSTEM" "LISP") - (:use "AxiomCore")) - -@ - -We plan to move the content of [[VMLISP]] to [[BOOT]]. - - -\subsection{Exported symbols} - - -<<*>>= -;;; Definitions for package VMLISP of type EXPORT -(in-package "VMLISP") -(export - '(VMLISP::SINTP VMLISP::$FCOPY VMLISP::WRAP - VMLISP::PUT VMLISP::PNAME - VMLISP::QVELT-1 VMLISP::QSETVELT-1 vmlisp::throw-protect - VMLISP::EQCAR - VMLISP::DEFIOSTREAM VMLISP::RDEFIOSTREAM VMLISP::MLAMBDA - VMLISP::QSLESSP VMLISP::QSDIFFERENCE VMLISP::QSQUOTIENT - VMLISP::ERROROUTSTREAM VMLISP::CREATE-SBC VMLISP::LASTPAIR - VMLISP::EQSUBSTLIST VMLISP::QCAAAR VMLISP::$TOTAL-ELAPSED-TIME - VMLISP::QUOTIENT VMLISP::SORTGREATERP VMLISP::LIBSTREAM-DIRNAME - VMLISP::QSETREFV VMLISP::QSTRINGLENGTH VMLISP::EVALFUN - VMLISP::QCDAR VMLISP::TEMPUS-FUGIT VMLISP::QSPLUS VMLISP::QSABSVAL - VMLISP::QSZEROP VMLISP::QSMIN VMLISP::QSLEFTSHIFT - VMLISP::SETDIFFERENCE VMLISP::RPLQ VMLISP::CATCHALL - VMLISP::RECOMPILE-DIRECTORY VMLISP::MDEF VMLISP::LINTP - VMLISP::NILFN VMLISP::TAB VMLISP::QCDDR VMLISP::IOSTATE - VMLISP::SFP VMLISP::NE VMLISP::STRGREATERP VMLISP::|startsId?| - VMLISP::USE-VMLISP-SYNTAX VMLISP::RCLASS VMLISP::|idChar?| - VMLISP::SEQ VMLISP::FIXP VMLISP::MAKE-CVEC VMLISP::MAKE-BVEC - VMLISP::|F,PRINT-ONE| VMLISP::HASHUEQUAL VMLISP::$OUTFILEP - VMLISP::TIMES VMLISP::DIFFERENCE VMLISP::MSUBST VMLISP::DIVIDE - VMLISP::|remove| VMLISP::GETL VMLISP::QCADAR VMLISP::QCAAAAR - VMLISP::RECLAIM VMLISP::ORADDTEMPDEFS VMLISP::NAMEDERRSET - VMLISP::TRIMSTRING VMLISP::CURRINDEX VMLISP::EVALANDFILEACTQ - VMLISP::LISPLIB VMLISP::FLUID VMLISP::MDEFX VMLISP::COMP370 - VMLISP::NEQ VMLISP::GETREFV VMLISP::|log| VMLISP::QVSIZE - VMLISP::MBPIP VMLISP::RPLNODE VMLISP::QSORT - VMLISP::PLACEP VMLISP::RREAD VMLISP::BINTP VMLISP::QSODDP - VMLISP::O VMLISP::RVECP VMLISP::CHAR2NUM VMLISP::POPP - VMLISP::QCDAADR VMLISP::HKEYS VMLISP::HASHCVEC VMLISP::HASHID - VMLISP::REMOVEQ VMLISP::LISTOFFUNCTIONS - VMLISP::QCADAAR VMLISP::ABSVAL VMLISP::VMPRINT - VMLISP::MAKE-APPENDSTREAM VMLISP::MAKE-INPUT-FILENAME - VMLISP::MAKE-INSTREAM VMLISP::HASHTABLEP VMLISP::UPCASE - VMLISP::LOADCOND VMLISP::STRPOSL VMLISP::STATEP VMLISP::QCDADR - VMLISP::HREMPROP VMLISP::LAM VMLISP::FBPIP VMLISP::NCONC2 - VMLISP::GETFULLSTR VMLISP::I VMLISP::HREM - VMLISP::*LISP-BIN-FILETYPE* VMLISP::INT2RNUM VMLISP::EBCDIC - VMLISP::$INFILEP VMLISP::BFP VMLISP::NUMP VMLISP::UNEMBED - VMLISP::PAIRP VMLISP::BOOLEANP VMLISP::FIX VMLISP::REMAINDER - VMLISP::RE-ENABLE-INT VMLISP::QCAADDR VMLISP::QCDDADR - VMLISP::$LISTFILE VMLISP::IVECP VMLISP::LIST2VEC - VMLISP::|LAM,FILEACTQ| VMLISP::LISTOFQUOTES - VMLISP::$ERASE VMLISP::QSDEC1 VMLISP::QSDIFFERENCE - VMLISP::QSSUB1 VMLISP::QCAR VMLISP::EVA1FUN VMLISP::IS-CONSOLE - VMLISP::MAKESTRING VMLISP::CUROUTSTREAM VMLISP::QCDDDR - VMLISP::QCDADAR VMLISP::MAKE-ABSOLUTE-FILENAME VMLISP::SUFFIX - VMLISP::FUNARGP VMLISP::VM/ VMLISP::QRPLACA VMLISP::GGREATERP - VMLISP::CGREATERP VMLISP::RNUMP VMLISP::RESETQ VMLISP::QRPLACD - VMLISP::SORTBY VMLISP::CVECP VMLISP::SETELT VMLISP::HGET - VMLISP::$DIRECTORY-LIST VMLISP::LN VMLISP::|member| - VMLISP::$LIBRARY-DIRECTORY-LIST VMLISP::VEC-SETELT - VMLISP::QCSIZE VMLISP::QCADDDR VMLISP::RWRITE VMLISP::SUBLOAD - VMLISP::STRINGIMAGE VMLISP::$CLEAR VMLISP::|read-line| - VMLISP::PROPLIST VMLISP::INTP VMLISP::OUTPUT VMLISP::CONSOLE - VMLISP::QCDDDAR VMLISP::ADDOPTIONS VMLISP::$FILETYPE-TABLE - VMLISP::QSMINUSP VMLISP::|assoc| VMLISP::SETSIZE VMLISP::QCDR - VMLISP::EFFACE VMLISP::COPY VMLISP::DOWNCASE VMLISP::LC2UC - VMLISP::EMBED VMLISP::SETANDFILEQ VMLISP::QSMAX - VMLISP::LIST2REFVEC VMLISP::MACRO-INVALIDARGS VMLISP::EMBEDDED - VMLISP::REFVECP VMLISP::CLOSEDFN VMLISP::MAKE-HASHTABLE - VMLISP::MAKE-FILENAME VMLISP::|$defaultMsgDatabaseName| - VMLISP::LEXGREATERP - VMLISP::IDENTP VMLISP::QSINC1 VMLISP::QESET VMLISP::MRP - VMLISP::LESSP VMLISP::RPLPAIR VMLISP::QVELT VMLISP::QRPLQ - VMLISP::MACERR VMLISP::*FILEACTQ-APPLY* VMLISP::HPUT* - VMLISP::$FILEP VMLISP::MAKE-FULL-CVEC VMLISP::HCLEAR - VMLISP::ERRORINSTREAM VMLISP::HPUTPROP - VMLISP::STRING2ID-N VMLISP::CALLBELOW VMLISP::BPINAME - VMLISP::CHANGELENGTH VMLISP::ECQ VMLISP::OBEY VMLISP::QASSQ - VMLISP::DCQ VMLISP::SHUT VMLISP::FILE VMLISP::HPUT - VMLISP::MAKEPROP VMLISP::GREATERP VMLISP::MEMQ - VMLISP::REROOT VMLISP::DIG2FIX VMLISP::L-CASE - VMLISP::TEREAD VMLISP::QSREMAINDER VMLISP::$FINDFILE - VMLISP::EQQ VMLISP::PRETTYPRINT VMLISP::HASHEQ VMLISP::LOG2 - VMLISP::U-CASE VMLISP::NREMOVE VMLISP::QREFELT VMLISP::SIZE - VMLISP::EOFP VMLISP::QCDAAR VMLISP::RSHUT VMLISP::ADD1 - VMLISP::QMEMQ VMLISP::SUBSTRING VMLISP::LOADVOL - VMLISP::QSTIMES VMLISP::STRINGLENGTH VMLISP::NEXT - VMLISP::DEVICE VMLISP::MAPELT VMLISP::LENGTHOFBPI - VMLISP::DIGITP VMLISP::QLENGTH VMLISP::QCAAADR VMLISP::CVEC - VMLISP::VEC2LIST VMLISP::MODE VMLISP::MAKE-VEC VMLISP::GCMSG - VMLISP::CONCAT VMLISP::$SHOWLINE VMLISP::QCAADR VMLISP::QCDDAR - VMLISP::QCDAAAR VMLISP::RDROPITEMS VMLISP::VECP - VMLISP::|union| VMLISP::ONE-OF VMLISP::NULLOUTSTREAM - VMLISP::QSGREATERP VMLISP::MINUS VMLISP::MAXINDEX - VMLISP::GETSTR VMLISP::QCADADR VMLISP::PRIN2CVEC - VMLISP::CURRENTTIME VMLISP::$REPLACE VMLISP::UNIONQ - VMLISP::NREMOVEQ VMLISP::CURINSTREAM VMLISP::MAKE-OUTSTREAM - VMLISP::APPLX VMLISP::LASTNODE VMLISP::SUBSTQ VMLISP::TRUEFN - VMLISP::|last| VMLISP::RPLACSTR VMLISP::SETQP VMLISP::QCADDR - VMLISP::QCAADAR VMLISP::QCDDAAR VMLISP::|intersection| - VMLISP::HASHTABLE-CLASS VMLISP::$CURRENT-DIRECTORY - VMLISP::*COMP370-APPLY* VMLISP::QSETVELT VMLISP::MOVEVEC - VMLISP::ID VMLISP::DEFINE-FUNCTION VMLISP::MSUBSTQ VMLISP::|nsubst| - VMLISP::LISTOFFLUIDS VMLISP::SUB1 VMLISP::NUMBEROFARGS - VMLISP::VMREAD VMLISP::SMINTP VMLISP::$SCREENSIZE - VMLISP::LISTOFFREES VMLISP::QCDADDR VMLISP::COMPRREAD - VMLISP::GENSYMP VMLISP::IFCAR VMLISP::QSETQ - VMLISP::QCADDAR VMLISP::*LISP-SOURCE-FILETYPE* VMLISP::KOMPILE - VMLISP::INPUT VMLISP::PAPPP VMLISP::UEQUAL VMLISP::COMPRWRITE - VMLISP::SUBRP VMLISP::ASSEMBLE VMLISP::|LAM,EVALANDFILEACTQ| - VMLISP::|$msgDatabaseName| VMLISP::IFCDR VMLISP::QVMAXINDEX - VMLISP::$SPADROOT VMLISP::PRIN0 VMLISP::PRETTYPRIN0 - VMLISP::STACKLIFO VMLISP::ASSQ VMLISP::PRINTEXP - VMLISP::QCDDDDR VMLISP::QSADD1 - VMLISP::SETDIFFERENCEQ VMLISP::STRPOS VMLISP::CONSTANT - VMLISP::QCAAR VMLISP::HCOUNT VMLISP::RCOPYITEMS - VMLISP::QSMINUS VMLISP::EVA1 VMLISP::OPTIONLIST - VMLISP::NUM2CHAR VMLISP::QENUM VMLISP::QEQQ - VMLISP::$TOTAL-GC-TIME VMLISP::CHARP VMLISP::QCADR - VMLISP::INTERSECTIONQ VMLISP::DSETQ VMLISP::FETCHCHAR - VMLISP::STRCONC VMLISP::MACRO-MISSINGARGS VMLISP::RPACKFILE - VMLISP::EXIT VMLISP::PLUS VMLISP::RKEYIDS - VMLISP::COMPILE-LIB-FILE VMLISP::RECOMPILE-LIB-FILE-IF-NECESSARY)) - -@ +The content of [[VMLISP]] was moved to [[BOOT]]. \section{The StringImage Fix} @@ -224,6 +90,9 @@ and works properly. <<*>>= + +(IMPORT-MODULE "boot-pkg") + ; VM LISP EMULATION PACKAGE ; Lars Ericson, Barry Trager, Martial Schor, tim daly, LVMCL, et al ; IBM Thomas J. Watson Research Center @@ -237,7 +106,7 @@ and works properly. ; If you are using this, you are probably in Common Lisp, yes? -(in-package "VMLISP") +(in-package "BOOT") ;; DEFVARS -- cgit v1.2.3