* g-error.boot.pamphlet: Import "diagnostics.

	(errorSupervisor1): Call BUMPERRORCOUNT, not BUMPCOMPERRORCOUNT.
	The latter no longer exists.
	* msgdb.boot.pamphlet (throwKeyedErrorMsg): Likewise.

	* Makefile.pamphlet (${DEPSYS}): Depend also on
	sys-constant.$(FASLEXT), sys-globals.$(FASLEXT), and
	diagnostics.$(FASLEXT). 
	(bootfuns.$(FASLEXT)): Likewise.
	(diagnostics.boot): New rule.
	(sys-globals.boot): Likewise.
	(sys-constants.boot): Likewise.
	* Makefile.in: Regenerate.

	* diagnostics.boot: New.
	(BUMPERRORCOUNT): Move from bootlex.lisp.pamphlet.  Rewrite as
	Boot code.

	* sys-constants.boot: New.
	* sys-globals.boot: Likewise.

	* bootlex.lisp.pamphlet (BUMPERRORCOUNT): Move to diagnostics.boot.
	* varini.boot.pamphlet ($NoValueMode): Don't duplicate define.

	* spad.lisp.pamphlet (S-PROCESS): Don't bind $LocalFrame here.

	* patches.lisp.pamphlet: Tidy.

	* nag-f01.boot.pamphlet (f01mafSolve): Use $EmptyMode to refer to
	the wildcar type.
	(f01brfSolve): Likewise.


	* setq.lisp.pamphlet: Move variables already defined in
	bootfuns.lisp.pamphlet to sys-contants, and merge initial values.

	($SPAD_ERRORS): Move to sys-globals.boot.

	* bootfuns.lisp.pamphlet: Now import both "sys-constants" and
 	"sys-globals".
 	(|$timerTicksPerSecond|): Move to sys-constants.boot.
	(|$quadSymbol|): Likewise.
	($escapeString): Likewise.
	($boxString): Likewise.
	($boldString): Likewise.
	($normalString): Likewise.
	($reverseVideoString): Likewise.
	($underlineString): Likewise.
	($COMPILE): Likewise.
	($BasicPredicates): Likewise.
	($BFTag): Likewise.
	($BigFloat): Likewise.
	($Boolean): Likewise.
	($Category): Likewise.
	($CategoryNames): Likewise.
	($Domain): Likewise.
	($DomainNames): Likewise.
	($DomainsInScope): Likewise.
	($DoubleQuote): Likewise.
 	($DummyFunctorNames): Likewise.
	($EmptyEnvironment): Likewise.
	($EmptyList): Likewise.
	($EmptyMode): Likewise.
	($EmptyString): Likewise.
	($EmptyVector): Likewise.
	($Expression): Likewise.
	($Exit): Likewise.
	($failure): Likewise.
	($Float): Likewise.
	($FormalMapVariableList): Likewise.
	($ConstructorNames): Likewise.
	($InitialDomainsInScope): Likewise.
	($InitialModemapFrame): Likewise.
	($Integer): Likewise.
	($LocalFrame): Likewise.
	($NegativeInteger): Likewise.
 	($NonNegativeInteger): Likewise.
	($NonPositiveInteger): Likewise.
	($NonMentionableDomainNames): Likewise.
	($noParseCommands): Likewise.
	($NoValueMode): Likewise.
	($NoValue): Likewise.
	($Mode): Likewise.
	($ModeVariableList): Likewise.
	($One): Likewise.
	($PatternVariableList): Likewise.
	($PositiveInteger): Likewise.
	($PrimitiveDomainNames): Likewise.
	($RationalNumber): Likewise.
	($SideEffectFreeFunctionList): Likewise.
 	($SmallInteger): Likewise.
	($SpecialDomainNames): Likewise.
	($StringCategory): Likewise.
	($String): Likewise.
	($Symbol): Likewise.
	($systemCommands): Likewise.
	($ThrowAwayMode): Likewise.
	($tokenCommands): Likewise.
	($true): Likeiwse.
	($underDomainAlist): Likewise.
	($Void): Likewise.
	($Zero): Likewise.
	(|$DomainVariableList|): Likewise.
	
	(|$quadSym|): Remove.
	($BigFloatOpt): Likewise.
	($BooleanOpt): Likewise.
	($EM): Likewise.
	($ExpressionOpt): Likewise.
	($FloatOpt): Likewise.
	($FormalMapVariableList2): Likewise.
	($IntegerOpt): Likewise.
	($NegativeIntegerOpt): Likewise.
 	($NonNegativeIntegerOpt): Likewise.
	($NonPositiveIntegerOpt): Likewise.
	($PositiveIntegerOpt): Likewise.
	($RationalNumberOpt): Likewise.
	($SmallIntegerOpt): Likewise.
	($StringOpt): Likewise.
	($SymbolOpt): Likewise.

	* setq.lisp.pamphlet (|$timerTicksPerSecond|): Remove.
	(|$quadSymbol|): Likewise.
	($escapeString): Likewise.
	($boxString): Likewise.
	($boldString): Likewise.
	($normalString): Likewise.
	($reverseVideoString): Likewise.
	($underlineString): Likewise.
	($COMPILE): Likewise.
	($BasicPredicates): Likewise.
	($BFTag): Likewise.
	($BigFloat): Likewise.
	($Boolean): Likewise.
	($Category): Likewise.
	($CategoryNames): Likewise.
	($Domain): Likewise.
	($DomainNames): Likewise.
 	($DomainsInScope): Likewise.
 	($DoubleQuote): Likewise.
 	($DummyFunctorNames): Likewise.
 	($EmptyEnvironment): Likewise.
 	($EmptyList): Likewise.
 	($EmptyMode): Likewise.
	($EmptyString): Likewise.
	($EmptyVector): Likewise.
	($Expression): Likewise.
	($Exit): Likewise.
	($failure): Likewise.
	($Float): Likewise.
 	($FormalMapVariableList): Likewise.
	($ConstructorNames): Likewise.
	($InitialDomainsInScope): Likewise.
	($InitialModemapFrame): Likewise.
	($Integer): Likewise.
	($LocalFrame): Likewise.
	($NegativeInteger): Likewise.
	($NonNegativeInteger): Likewise.
	($NonPositiveInteger): Likewise.
	($NonMentionableDomainNames): Likewise.
	($noParseCommands): Likewise.
	($NoValueMode): Likewise.
	($NoValue): Likewise.
	($Mode): Likewise.
	($ModeVariableList): Likewise.
	($One): Likewise.
	($PatternVariableList): Likewise.
	($PositiveInteger): Likewise.
	($PrimitiveDomainNames): Likewise.
	($RationalNumber): Likewise.
	($SideEffectFreeFunctionList): Likewise.
	($SmallInteger): Likewise.
	($SpecialDomainNames): Likewise.
	($StringCategory): Likewise.
	($String): Likewise.
	($Symbol): Likewise.
	($systemCommands): Likewise.
	($ThrowAwayMode): Likewise.
	($tokenCommands): Likewise.
	($true): Likeiwse.
	($underDomainAlist): Likewise.
	($Void): Likewise.
	($Zero): Likewise.
	(|$DomainVariableList|): Likewise.

1 files changed, 3 insertions, 153 deletions

diff --git a/src/interp/bootfuns.lisp.pamphlet b/src/interp/bootfuns.lisp.pamphlet
index 33b953e7..2a7d5b90 100644
--- a/src/interp/bootfuns.lisp.pamphlet
+++ b/src/interp/bootfuns.lisp.pamphlet
@@ -62,7 +62,8 @@ interpreter or algebra uses has to (cough, cough) appear here.
 <<*>>=
 <<license>>
 
-(IMPORT-MODULE "boot-pkg")
+(IMPORT-MODULE "sys-constants")
+(IMPORT-MODULE "sys-globals")
 
 @
 
@@ -71,21 +72,6 @@ interpreter use is called [[BOOT]].  It should have been
 [[Spad]], or better yet [[Axiom]].
 
 
-\section{Constants}
-
-\subsection{\$EmptyMode}
-
-[[$EmptyMode]] is a contant whose value is [[$EmptyMode]].
-It is used by [[isPartialMode]] (in [[i-funsel.boot]]) to
-decide if a modemap is partially constructed. If the [[$EmptyMode]]
-constant occurs anywhere in the modemap structure at any depth
-then the modemap is still incomplete. To find this constant the
-[[isPartialMode]] function calls [[CONTAINED |$EmptyMode| Y]]
-which will walk the structure $Y$ looking for this constant.
-<<EmptyMode>>=
-(def-boot-val |$EmptyMode| '|$EmptyMode|    "compiler constant")
-@
-
 
 \section{Portability issues}
 
@@ -123,28 +109,7 @@ offer it as extensions.
      (defparameter ,p ,val ,where)
      (export '(,p) "BOOT")))
 
-#-:CCL
-(def-boot-val |$timerTicksPerSecond| INTERNAL-TIME-UNITS-PER-SECOND
-    "for TEMPUS-FUGIT and $TOTAL-ELAPSED-TIME")
-#+:CCL
-(def-boot-val |$timerTicksPerSecond| 1000
-    "for TEMPUS-FUGIT and $TOTAL-ELAPSED-TIME")
-(def-boot-val $boxString
-  (concatenate 'string (list (code-char #x1d) (code-char #xe2)))
-  "this string of 2 chars displays as a box")
-(def-boot-val |$quadSymbol| $boxString "displays an APL quad")
-(def-boot-val |$quadSym| '|$quadSym| "unbound symbol referenced in format.boot")
-(def-boot-val $escapeString  (string (code-char 27))
-   "string for single escape character")
-(def-boot-val $boldString (concatenate 'string $escapeString "[12m")
-  "switch into bold font")
-(def-boot-val $normalString (concatenate 'string $escapeString "[0;10m")
-  "switch back into normal font")
-(def-boot-val $reverseVideoString (concatenate 'string $escapeString "[7m")
-  "switch into reverse video")
-(def-boot-val $underlineString (concatenate 'string $escapeString "[4m")
-  "switch into underline mode")
-(def-boot-val $COMPILE t  "checked in COMP-2 to skip compilation")
+
 (def-boot-var |$abbreviationTable|		    "???")
 (def-boot-val |$algebraList|
 	'(|QuotientField| |Polynomial|
@@ -157,20 +122,12 @@ offer it as extensions.
 (def-boot-val |$BasicDomains|
 	  '(|Integer| |Float| |Symbol|
 	    |Boolean| |String|)			"???")
-(def-boot-val |$BasicPredicates|
-	  '(FIXP STRINGP FLOATP)		"???")
-(def-boot-val |$BFtag| '-BF-	   "big float marker")
-(def-boot-val |$BigFloat| '(|Float|)		    "???")
-(def-boot-val |$BigFloatOpt| '(|BigFloat| . OPT)    "???")
-(def-boot-val |$Boolean| '(|Boolean|)		    "???")
-(def-boot-val |$BooleanOpt| '(|Boolean| . OPT)	    "???")
 (def-boot-val |$bootStrapMode| ()  "if T compCapsule skips body")
 (def-boot-var |$brightenCommentsFlag|		    "???")
 (def-boot-var |$brightenCommentsIfTrue|		    "???")
 (def-boot-val |$BreakMode| '|query|		    "error.boot")
 (def-boot-var |$cacheAlist|			    "Interpreter>System.boot")
 (def-boot-val |$cacheCount| 0			    "???")
-(def-boot-val |$Category| '(|Category|)		    "???")
 ;  modemap:==  ( <map> (p e) (p e) ... (p e) )
 ;  modemaplist:= ( modemap ... )
 
@@ -181,10 +138,6 @@ offer it as extensions.
       (((|Category|) (|Category|) (|List| |Category|)) (|Category|)) (T *))
 	)))))
 	"Compiler>CUtil.boot")
-(def-boot-val |$CategoryNames|
-	'(|Category| |CATEGORY| |RecordCategory| |Join|
-	  |StringCategory| |SubsetCategory| |UnionCategory|)
-	"???")
 (def-boot-val |$clamList|
 	  '((|getModemapsFromDatabase| |hash| UEQUAL |count|)
 	    (|getOperationAlistFromLisplib| |hash| UEQUAL |count|)
@@ -215,55 +168,20 @@ offer it as extensions.
 (def-boot-val $delay 0				    "???")
 (def-boot-var $Directory			    "???")
 (def-boot-var $DISPLAY				    "???")
-(def-boot-val |$Domain| '(|Domain|)		    "???")
 (def-boot-var |$DomainFrame|			    "???")
-(def-boot-val |$DomainNames|
-	'(|Integer| |Float| |Symbol| |Boolean|
-	  |String| |Expression|
-	  |Mapping| |SubDomain| |List| |Union|
-	  |Record| |Vector|)			"???")
-(def-boot-val |$DomainsInScope| '(NIL)		    "???")
 (def-boot-val |$domainTraceNameAssoc| ()    "association list of trace domains")
-(def-boot-val |$DomainVariableList|
-  '($1 $2 $3 $4 $5 $6 $7 $8 $9 $10 $11
-       $12 $13 $14 $15)				"???")
-(def-boot-val |$DoubleQuote| "\""                   "???")
-(def-boot-val |$DummyFunctorNames|
-	  '(|Boolean| |Mapping|)		"???")
 (def-boot-var |$eltIfNil|			    "SpecialFunctions>PSpad.boot")
-(def-boot-val |$EmptyEnvironment| '((NIL))	    "???")
-(def-boot-val |$EmptyList| ()			    "???")
-<<EmptyMode>>
-(def-boot-val |$EM| |$EmptyMode|		    "???")
-(def-boot-val |$EmptyString| ""                     "???")
-(def-boot-val |$EmptyVector| '#()		     "???")
-(def-boot-val |$Expression| '(|Expression|)	    "???")
-(def-boot-val |$ExpressionOpt|
-	  '(|Expression| . OPT)			"???")
 (def-boot-var |$evalDomain|			    "???")
-(def-boot-val |$Exit| '(Exit)	      "compiler constant")
 (def-boot-var |$exitMode|			    "???")
 (def-boot-var |$exitModeStack|			    "???")
-(def-boot-val |$failure| (GENSYM)	    "Symbol denoting a failed operation.")
 (def-boot-val |$false| NIL			    "???")
-(def-boot-val |$Float| '(|Float|)		    "???")
-(def-boot-val |$FloatOpt| '(|Float| . OPT)	    "???")
 (def-boot-val |$FontTable| '(|FontTable|)	    "???")
 (def-boot-var |$forceDatabaseUpdate|		    "See load function.")
 (def-boot-var |$form|				    "???")
-(def-boot-val |$FormalMapVariableList|
-  '(\#1 \#2 \#3 \#4 \#5 \#6 \#7 \#8 \#9
-    \#10 \#11 \#12 \#13 \#14 \#15)		"???")
-(def-boot-val |$FormalMapVariableList2|
-  '(\#\#1 \#\#2 \#\#3 \#\#4 \#\#5 \#\#6 \#\#7 \#\#8 \#\#9
-    \#\#10 \#\#11 \#\#12 \#\#13 \#\#14 \#\#15)		    "???")
 (def-boot-var |$fromSpadTrace|			    "Interpreter>Trace.boot")
 (def-boot-var $function				    "Interpreter>System.boot")
 (def-boot-var $FunName				    "???")
 (def-boot-var $FunName_Tail			    "???")
-(def-boot-val |$ConstructorNames|
-	'(|SubDomain| |List| |Union| |Record| |Vector|)
-	"Used in isFunctor test, and compDefine.")
 (def-boot-val |$gauss01| '(|gauss| 0 1)		    "???")
 (def-boot-var |$genFVar|			    "???")
 (def-boot-val |$genSDVar| 0	    "counter for genSomeVariable" )
@@ -271,10 +189,6 @@ offer it as extensions.
 (def-boot-var |$hasYield|			    "???")
 (def-boot-var |$ignoreCommentsIfTrue|		    "???")
 (def-boot-var |$Index|				    "???")
-(def-boot-val |$InitialDomainsInScope|
-	  '((|Boolean|) |$EmptyMode| |$NoValueMode|)
-	  "???")
-(def-boot-val |$InitialModemapFrame| '((NIL))	    "???")
 (def-boot-var |$inLispVM|			    "Interpreter>Eval.boot")
 (def-boot-var |$insideCapsuleFunctionIfTrue|	    "???")
 (def-boot-var |$insideCategoryIfTrue|		    "???")
@@ -285,8 +199,6 @@ offer it as extensions.
 (def-boot-var |$insideFunctorIfTrue|		    "???")
 (def-boot-var |$insideWhereIfTrue|		    "???")
 (def-boot-val |$instantRecord| (MAKE-HASHTABLE 'ID) "???")
-(def-boot-val |$Integer| '(|Integer|)		    "???")
-(def-boot-val |$IntegerOpt| '(|Integer| . OPT)	    "???")
 (def-boot-val |$InteractiveFrame| '((NIL))	    "top level environment")
 (def-boot-var |$InteractiveMode|		    "Interactive>System.boot")
 (def-boot-val |$InteractiveModemapFrame| '((NIL))   "???")
@@ -313,44 +225,25 @@ offer it as extensions.
 (def-boot-var |$lisplibSignatureAlist|		    "Compiler>LispLib.boot")
 (def-boot-var |$lisplibVariableAlist|		    "Compiler>LispLib.boot")
 (def-boot-var |$lisp2lispRenameAssoc|		    "???")
-(def-boot-val |$LocalFrame| '((NIL))		    "???")
 (def-boot-var |$mapSubNameAlist|		    "Interpreter>Trace.boot")
 (def-boot-var |$mathTrace|			    "Interpreter>Trace.boot")
 (def-boot-var |$mathTraceList|		    "Controls mathprint output for )trace.")
 (def-boot-var $maxlinenumber			    "???")
-(def-boot-val |$Mode| '(Mode)	   "compiler constant")
 (def-boot-var |$ModemapFrame|			    "???")
-(def-boot-val |$ModeVariableList|
-  '(&1 &2 &3 &4 &5 &6 &7 &8 &9 &10 &11
-       &12 &13 &14 &15)				"???")
 (def-boot-var |$mostRecentOpAlist|		    "???")
 (def-boot-var $NBOOT				    "???")
-(def-boot-val |$NegativeIntegerOpt| '(|NegativeInteger| . OPT) "???")
-(def-boot-val |$NegativeInteger| '(|NegativeInteger|) "???")
 (def-boot-val |$NETail| (CONS |$EmptyEnvironment| NIL) "???")
 (def-boot-var $NEWLINSTACK			    "???")
 (def-boot-var |$noEnv|				    "???")
-(def-boot-val |$NonMentionableDomainNames| '($ |Rep| |Mapping|) "???")
-(def-boot-val |$NonNegativeIntegerOpt| '(|NonNegativeInteger| . OPT) "???")
-(def-boot-val |$NonNegativeInteger| '(|NonNegativeInteger|) "???")
-(def-boot-val |$NonPositiveIntegerOpt| '(|NonPositiveInteger| . OPT) "???")
-(def-boot-val |$NonPositiveInteger| '(|NonPositiveInteger|) "???")
-(def-boot-var |$noParseCommands|		    "???")
-(def-boot-val |$NoValueMode| '|$NoValueMode|   "compiler literal")
-(def-boot-val |$NoValue| '|$NoValue|   "compiler literal")
 (def-boot-val $num_of_meta_errors 0		    "Number of errors seen so far")
 (def-boot-var $OLDLINE				    "Used to output command lines.")
 (def-boot-val |$oldTime| 0			    "???")
-(def-boot-val |$One| '(|One|)			    "???")
 (def-boot-val |$OneCoef| '(1 1 . 1)		    "???")
 (def-boot-val |$operationNameList| NIL		 "op names for apropos")
 (def-boot-var |$opFilter|			    "Used to /s a function")
 (def-boot-var |OptionList|			    "???")
 (def-boot-val |$optionAlist| nil       "info for trace boot")
 (def-boot-var |$OutsideStringIfTrue|		    "???")
-(def-boot-val |$PatternVariableList|
-  '(*1 *2 *3 *4 *5 *6 *7 *8 *9 *10 *11
-       *12 *13 *14 *15)				"???")
 (def-boot-var |$PolyMode|			    "???")
 (def-boot-val |$Polvar| '(WRAPPED . ((1 . 1)))	    "???")
 (def-boot-var |$polyDefaultAssoc|		    "???")
@@ -360,15 +253,10 @@ offer it as extensions.
 	  |DistributedMultivariatePolynomial|
 	  |HomogeneousDistributedMultivariatePolynomial|)
 	"???")
-(def-boot-val |$PositiveIntegerOpt| '(|PositiveInteger| . OPT) "???")
-(def-boot-val |$PositiveInteger| '(|PositiveInteger|) "???")
 (def-boot-var |$postStack|			    "???")
 (def-boot-var |$prefix|				    "???")
 (def-boot-val |$PrettyPrint| nil "if t generated code is prettyprinted")
 (def-boot-var |$previousTime|			    "???")
-(def-boot-val |$PrimitiveDomainNames| nil
-"Used in mkCategory to avoid generating vector slot
-for primitive domains.	Also used by putInLocalDomainReferences and optCal.")
 (def-boot-val |$optimizableDomainNames|
       '(|FactoredForm| |List| |Vector|
 	|Integer| |NonNegativeInteger| |PositiveInteger|
@@ -384,8 +272,6 @@ for primitive domains.	Also used by putInLocalDomainReferences and optCal.")
 (def-boot-val |$QuickCode| NIL	    "Controls generation of QREFELT, etc.")
 (def-boot-val |$QuickLet| NIL	    "Set to T for no LET tracing.")
 (def-boot-var |$QuietIfNil|			    "???")
-(def-boot-val |$RationalNumberOpt| '(|RationalNumber| . OPT) "???")
-(def-boot-val |$RationalNumber| '(|RationalNumber|) "???")
 (def-boot-var |$readingFile|			    "???")
 (def-boot-val |$report3| nil	 "addMap report info")
 (def-boot-var |$reportBottomUpFlag|		    "Interpreter>SetVarT.boot")
@@ -401,13 +287,7 @@ for primitive domains.	Also used by putInLocalDomainReferences and optCal.")
 (def-boot-var |$scanModeFlag|			    "???")
 (def-boot-var |$semanticErrorStack|		    "???")
 (def-boot-val |$SetFunctions| nil  "checked in SetFunctionSlots")
-(def-boot-val |$SideEffectFreeFunctionList|
-  '(|null| |case| |Zero| |One| \: \:\: |has| |Mapping|
-    |elt| = \> \>= \< \<= MEMBER |is| |isnt| ATOM
-    $= $\> $\>= $\< $\<= $^= $MEMBER)		"???")
 (def-boot-var |$slamFlag|			    "Interpreter>SetVars.boot")
-(def-boot-val |$SmallInteger| '(|SmallInteger|)	    "???")
-(def-boot-val |$SmallIntegerOpt| '(|SmallInteger| . OPT) "???")
 (def-boot-val |$sourceFileTypes|
 	  '(SPAD BOOT LISP LISP370 META)
 	  "Interpreter>System.boot")
@@ -416,28 +296,17 @@ for primitive domains.	Also used by putInLocalDomainReferences and optCal.")
 (def-boot-val |$spadLibFT| 'LISPLIB		    "???")
 (def-boot-var |$spadOpList|			    "???")
 (def-boot-var |$spadSystemDisks|		    "Interpreter>Database.boot")
-(def-boot-val |$SpecialDomainNames|
-  '(|add| |CAPSULE| |SubDomain| |List| |Union| |Record| |Vector|)
-  "Used in isDomainForm, addEmptyCapsuleIfnecessary.")
 (def-boot-var |$streamAlist|			    "???")
 (def-boot-val |$streamCount| 0			    "???")
 (def-boot-var |$streamIndexing|			    "???")
 (def-boot-val |$StreamIndex| 0			    "???")
-(def-boot-val |$StringCategory| '(|StringCategory|) "???")
-(def-boot-val |$StringOpt| '(|String| . OPT)	    "???")
-(def-boot-val |$String| '(|String|)		    "???")
 (def-boot-var |$suffix|				    "???")
-(def-boot-val |$Symbol| '(|Symbol|)		    "???")
-(def-boot-val |$SymbolOpt| '(|Symbol| . OPT)	    "???")
-(def-boot-var |$systemCommands|			    "Interpreter>System.boot")
 (def-boot-val |$systemCreation| (currenttime)	    "???")
 (def-boot-val |$systemLastChanged|
 	  |$systemCreation|			"???")
 (def-boot-val |$tempCategoryTable| (MAKE-HASHTABLE 'UEQUAL) "???")
-(def-boot-val |$ThrowAwayMode| '|$ThrowAwayMode|    "interp constant")
 (def-boot-val |$timerOn| t			    "???")
 (def-boot-var |$topOp|				   "See displayPreCompilationErrors")
-(def-boot-var |$tokenCommands|			    "???")
 (def-boot-var $TOKSTACK				    "???")
 (def-boot-val $TOP_LEVEL t			    "???")
 (def-boot-var $top_stack			    "???")
@@ -449,24 +318,7 @@ for primitive domains.	Also used by putInLocalDomainReferences and optCal.")
 (def-boot-var |$traceNoisely|			    "Interpreter>Trace.boot")
 (def-boot-var |$TranslateOnly|			    "???")
 (def-boot-var |$tripleCache|			    "Compiler>Compiler.boot")
-(def-boot-val |$true| ''T			    "???")
 (def-boot-var $Type				    "???")
-(def-boot-val |$underDomainAlist|
-	'((|DistributedMultivariatePolynomial| . 2)
-	  (|FactoredForm| . 1)
-	  (|FactoredRing| . 1)
-	  (|Gaussian| . 1)
-	  (|List| . 1)
-	  (|Matrix| . 1)
-	  (|MultivariatePolynomial| . 2)
-	  (|HomogeneousDistributedMultivariatePolynomial| . 2)
-	  (|Polynomial| . 1)
-	  (|QuotientField| . 1)
-	  (|RectangularMatrix| . 3)
-	  (|SquareMatrix| . 2)
-	  (|UnivariatePoly| . 2)
-	  (|Vector| . 1)
-	  (|VVectorSpace| . 2))			"???")
 
 (def-boot-val |$updateCatTableIfTrue| T	   "update category table on load")
 (def-boot-var |$updateIfTrue|
@@ -475,7 +327,6 @@ for primitive domains.	Also used by putInLocalDomainReferences and optCal.")
 	  "Determines whether to use BF as default floating point type.")
 (def-boot-val |$useDCQnotLET| () "checked in DEF-LET for use of DCQ")
 (def-boot-var |$VariableCount|			    "???")
-(def-boot-val |$Void| '(|Void|) "compiler constant")
 (def-boot-var |$warningStack|			    "???")
 (def-boot-val |$whereList| () "referenced in format boot formDecl2String")
 (def-boot-var |$xCount|				    "???")
@@ -485,7 +336,6 @@ for primitive domains.	Also used by putInLocalDomainReferences and optCal.")
 (def-boot-var |$xyMax|				    "???")
 (def-boot-var |$xyMin|				    "???")
 (def-boot-var |$xyStack|			    "???")
-(def-boot-val |$Zero| '(|Zero|)			    "???")
 
 (def-boot-val |$domainsWithUnderDomains|
 	  (mapcar #'car |$underDomainAlist|)	"???")