* sys-globals.boot ($prefix): Move from bootfuns.lisp.pamphlet.

	($PrettyPrint): Likewise.
	($previousTime): Likewise.

	* bootfuns.lisp.pamphlet (|$prefix|): Move to sys-globals.boot.
	(|$PrettyPrint|): Likewise.
	(|$previousTime|): Likewise.
	(|$postStack|): Move to postpar.boot.pamphlet.
	(|$OneCoef|): Remove.
	(|$operationNameList|): Likewise.
	(|$opFilter|): Likewise.
	(|$optionAlist|): Likewise.
	(|$OutsideStringIfTrue|): Likewise.
	(|$PolyMode|): Likewise.
	(|$Polvar|): Likewise.
	(|$optimizableDomainNames|): Likewise.
	(|$PrintBox|): Likewise.
	(|$PrintCompilerMessagesIfTrue|): Likewise.
	(|$printConStats|): Likewise.
	
	* setq.lisp.pamphlet (|$opFilter|): Remove.
	(|$OneCoef|): Likewise.
	(|$Polvar|): Likewise.
	(|$PrintCompilerMessagesIfTrue|): Likewise.

	* spad.lisp.pamphlet (S-PROCESS): Don't bind |$postStack|.  Set it
	to nil.
	
	* debug.lisp.pamphlet (|$oldTime|): Move from bootfuns.lisp.pamphlet.

	* bootfuns.lisp.pamphlet (|$oldTime|): Move to debug.lisp.pamphlet.
	* setvars.boot.pamphlet (resetWorkspaceVariables): Don't set
	$operationNameList anymore.
	* spad.lisp.pamphlet (S-PROCESS): Don't bind $PolyMode anymore.

8 files changed, 51 insertions, 27 deletions

diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 2e325a4d..aa7c8510 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,3 +1,40 @@
+2007-08-30  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* sys-globals.boot ($prefix): Move from bootfuns.lisp.pamphlet.
+	($PrettyPrint): Likewise.
+	($previousTime): Likewise.
+
+	* bootfuns.lisp.pamphlet (|$prefix|): Move to sys-globals.boot.
+	(|$PrettyPrint|): Likewise.
+	(|$previousTime|): Likewise.
+	(|$postStack|): Move to postpar.boot.pamphlet.
+	(|$OneCoef|): Remove.
+	(|$operationNameList|): Likewise.
+	(|$opFilter|): Likewise.
+	(|$optionAlist|): Likewise.
+	(|$OutsideStringIfTrue|): Likewise.
+	(|$PolyMode|): Likewise.
+	(|$Polvar|): Likewise.
+	(|$optimizableDomainNames|): Likewise.
+	(|$PrintBox|): Likewise.
+	(|$PrintCompilerMessagesIfTrue|): Likewise.
+	(|$printConStats|): Likewise.
+	
+	* setq.lisp.pamphlet (|$opFilter|): Remove.
+	(|$OneCoef|): Likewise.
+	(|$Polvar|): Likewise.
+	(|$PrintCompilerMessagesIfTrue|): Likewise.
+
+	* spad.lisp.pamphlet (S-PROCESS): Don't bind |$postStack|.  Set it
+	to nil.
+	
+	* debug.lisp.pamphlet (|$oldTime|): Move from bootfuns.lisp.pamphlet.
+
+	* bootfuns.lisp.pamphlet (|$oldTime|): Move to debug.lisp.pamphlet.
+	* setvars.boot.pamphlet (resetWorkspaceVariables): Don't set
+	$operationNameList anymore.
+	* spad.lisp.pamphlet (S-PROCESS): Don't bind $PolyMode anymore.
+
 2007-08-29  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* sys-globals.boot ($leaveLevelStack): Move from
diff --git a/src/interp/bootfuns.lisp.pamphlet b/src/interp/bootfuns.lisp.pamphlet
index 8c4d1afc..8da30d21 100644
--- a/src/interp/bootfuns.lisp.pamphlet
+++ b/src/interp/bootfuns.lisp.pamphlet
@@ -136,27 +136,7 @@ offer it as extensions.
 (def-boot-var $NEWLINSTACK			    "???")
 (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 |$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-var |$PolyMode|			    "???")
-(def-boot-val |$Polvar| '(WRAPPED . ((1 . 1)))	    "???")
-(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 |$optimizableDomainNames|
-      '(|FactoredForm| |List| |Vector|
-	|Integer| |NonNegativeInteger| |PositiveInteger|
-	|SmallInteger| |String| |Boolean| |Symbol| |BooleanFunctions|)
-   "used in optCall to decide which domains can be optimized")
-(def-boot-val |$PrintBox| '(|PrintBox|)		    "???")
-(def-boot-var |$PrintCompilerMessagesIfTrue|	    "???")
-(def-boot-val |$printConStats| nil  "display constructor cache totals")
 (def-boot-val |$printLoadMsgs|	't	    "Interpreter>SetVarT.boot")
 (def-boot-var |$PrintOnly|			    "Compiler>LispLib.boot")
 (def-boot-val |$SystemSynonyms| () "list of system defined synonyms")
diff --git a/src/interp/debug.lisp.pamphlet b/src/interp/debug.lisp.pamphlet
index f825845f..d5303b2c 100644
--- a/src/interp/debug.lisp.pamphlet
+++ b/src/interp/debug.lisp.pamphlet
@@ -1111,6 +1111,8 @@ EXAMINE (SETQ RECNO (NOTE INPUTSTREAM))
 ; Functions to run a timer for tracing
 ; It avoids timing the tracing function itself by turning the timer
 ; on and off
+
+(defvar |$oldTime| 0)
  
 (defun |startTimer| ()
     (SETQ $delay (PLUS $delay (DIFFERENCE (TEMPUS-FUGIT) |$oldTime|)))
diff --git a/src/interp/postpar.boot.pamphlet b/src/interp/postpar.boot.pamphlet
index 9bf22fff..f5f13b56 100644
--- a/src/interp/postpar.boot.pamphlet
+++ b/src/interp/postpar.boot.pamphlet
@@ -51,6 +51,8 @@
 
 )package "BOOT"
 
+$postStack := []
+
 --% Yet Another Parser Transformation File
 --These functions are used by for BOOT and SPAD code
 --(see new2OldLisp, e.g.)
diff --git a/src/interp/setq.lisp.pamphlet b/src/interp/setq.lisp.pamphlet
index 32ab00e0..89e872a4 100644
--- a/src/interp/setq.lisp.pamphlet
+++ b/src/interp/setq.lisp.pamphlet
@@ -342,9 +342,7 @@
 (SETQ |$highlightAllowed| 'T)
 	 ;" used in BRIGHTPRINT and is a )set variable"
 
-(SETQ |$PrintCompilerMessagesIfTrue| NIL)
 (SETQ |$printStorageIfTrue| NIL) ;; storage info disabled in common lisp
-(SETQ |$opFilter| NIL)	 ;" used to |/s a function "
 
 (SETQ |$AnonymousFunction| '(|AnonymousFunction|))
 (SETQ |$Any|   '(|Any|))
@@ -370,8 +368,6 @@
 (SETQ |$streamIndexing| NIL)
 (SETQ |$reportExitModeStack| NIL)
 (SETQ |$prefix| NIL)
-(SETQ |$Polvar| '(WRAPPED . ((1 . 1))))
-(SETQ |$OneCoef| '(1 1 . 1))
 (SETQ |$formalArgList| ())
 (SETQ |$TriangleVariableList|
    '(|t#1| |t#2| |t#3| |t#4| |t#5| |t#6| |t#7| |t#8| |t#9| |t#10|
diff --git a/src/interp/setvars.boot.pamphlet b/src/interp/setvars.boot.pamphlet
index 6d8394fb..4c6a4261 100644
--- a/src/interp/setvars.boot.pamphlet
+++ b/src/interp/setvars.boot.pamphlet
@@ -82,7 +82,6 @@ resetWorkspaceVariables () ==
   SETQ($functionTable               , NIL)
   SETQ($BOOT                        , NIL)
   SETQ($echoLineStack               , NIL)
-  SETQ($operationNameList           , NIL)
   SETQ($slamFlag                    , NIL)
   SETQ($CommandSynonymAlist         , COPY($InitialCommandSynonymAlist))
   SETQ($UserAbbreviationsAlist      , NIL)
diff --git a/src/interp/spad.lisp.pamphlet b/src/interp/spad.lisp.pamphlet
index dff77a2c..40e2f568 100644
--- a/src/interp/spad.lisp.pamphlet
+++ b/src/interp/spad.lisp.pamphlet
@@ -351,10 +351,8 @@
 	(*print-pretty* t)
 	($MACROASSOC ())
 	($NEWSPAD T)
-	(|$PolyMode| |$EmptyMode|)
 	(|$compUniquelyIfTrue| nil)
 	|$currentFunction|
-	(|$postStack| nil)
 	|$topOp|
 	(|$semanticErrorStack| ())
 	(|$warningStack| ())
@@ -370,6 +368,7 @@
     (prog ((CURSTRM CUROUTSTREAM) |$s| |$x| |$m| u)
 	  (declare (special CURSTRM |$s| |$x| |$m| CUROUTSTREAM))
 	  (SETQ |$exitModeStack| ())
+	  (SETQ |$postStack| nil)
 	  (SETQ $TRACEFLAG T)
 	  (if (NOT X) (RETURN NIL))
 	  (setq X (if $BOOT (DEF-RENAME (|new2OldLisp| X))
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index 86c4db8c..15610287 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -209,3 +209,12 @@ $mathTrace := false
 ++
 $mathTraceList := []
 
+++
+$prefix := nil
+
+++ FIXME: Eventually move to comp.lisp.pamphlet
+$PrettyPrint := false
+
+++
+$previousTime := 0
+