* 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).

1 files changed, 5 insertions, 136 deletions

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]])
-<<*>>=
-<<license>>
-(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