* bootfuns.lisp.pamphlet (|$forceDatabaseUpdate|): Move to

	sys-globals.boot.
	(|$form|): Likewise.
	(|$fromSpadTrace|): Likewise
	(|$genSDVar|): Likewise.
	(|$Index|): Likewise.
	(|$inLispVM|): Likewise.
	(|$insideCapsuleFunctionIfTrue|): Likewise.
	(|$insideCategoryIfTrue|): Likewise.
	(|$insideCoerceInteractiveHardIfTrue|): Likewise.
	(|$insideCompTypeOf|): Likewise.
	(|$insideConstructIfTrue|): Likewise.
	(|$insideExpressionIfTrue|): Likewise.
	(|$insideFunctorIfTrue|): Likewise.
	(|$insideWhereIfTrue|): Likewise.
	(|$instantRecord|): Likewise.
	(|$InteractiveFrame|): Likewise.
	(|$InteractiveMode|): Likewise.
	(|$InteractiveTimingStatsIfTrue|): Likewise.

	(|$genFVar|): Remove.
	(|$ignoreCommentsIfTrue|): Likewise.
	(|$InteractiveModemapFrame|): Likewise.

	* setq.lisp.pamphlet (|$inLispVM|): Remove.
	(|$InteractiveMode|): Likewise.
	(|$forceDatabaseUpdate|): Likewise.
	(|$InteractiveFrame|): Likewise.
	(|$form|): Likewise.
	(|$Index|): Likewise.

	* sys-constants.boot ($ExitMode): Define.
	($exitMode): Move from bootfuns.lisp.pamphlet.

	* sys-globals.boot ($form): Likewise.
	($fromSpadTrace): Likewise.
	($genSDVar): Likewise.
	($Index): Likewise.
	($inLispVM): Likewise.
	($insideCapsuleFunctionIfTrue): Likewise.
	($insideCategoryIfTrue): Likewise.
	($insideCoerceInteractiveHardIfTrue): Likewise.
	($insideConstructIfTrue): Likewise.
	($insideExpressionIfTrue): Likewise.
	($insideFunctorIfTrue): Likewise.
	($insideWhereIfTrue): Likewise.
	($instantRecord): Likewise.
	($InteractiveFrame): Likewise.
	($(InteractiveMode): Likewise.
	($InteractiveTimingStatsIftrue): Likewise.
	($forceDatabaseUpdate): Likewise.

	* spad.lisp.pamphlet (S-PROCESS): Don't bind $exitMode here.
 
	* bootfuns.lisp.pamphlet (|$exitMode|): Move to sys-constants.boot

	* wi2.boot.pamphlet (compDefineFunctor1): Likewise.

	* spad.lisp.pamphlet (S-PROCESS): Likewise.

	* define.boot.pamphlet (compDefineFunctor1): Remove unused
	$genFVar. 

	* varini.boot.pamphlet ($ExitMode): Don't double define here.

9 files changed, 127 insertions, 34 deletions

diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index be8b92e5..21be9ac2 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,5 +1,72 @@
 2007-08-26  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* bootfuns.lisp.pamphlet (|$forceDatabaseUpdate|): Move to
+	sys-globals.boot.
+	(|$form|): Likewise.
+	(|$fromSpadTrace|): Likewise
+	(|$genSDVar|): Likewise.
+	(|$Index|): Likewise.
+	(|$inLispVM|): Likewise.
+	(|$insideCapsuleFunctionIfTrue|): Likewise.
+	(|$insideCategoryIfTrue|): Likewise.
+	(|$insideCoerceInteractiveHardIfTrue|): Likewise.
+	(|$insideCompTypeOf|): Likewise.
+	(|$insideConstructIfTrue|): Likewise.
+	(|$insideExpressionIfTrue|): Likewise.
+	(|$insideFunctorIfTrue|): Likewise.
+	(|$insideWhereIfTrue|): Likewise.
+	(|$instantRecord|): Likewise.
+	(|$InteractiveFrame|): Likewise.
+	(|$InteractiveMode|): Likewise.
+	(|$InteractiveTimingStatsIfTrue|): Likewise.
+
+	(|$genFVar|): Remove.
+	(|$ignoreCommentsIfTrue|): Likewise.
+	(|$InteractiveModemapFrame|): Likewise.
+
+	* setq.lisp.pamphlet (|$inLispVM|): Remove.
+	(|$InteractiveMode|): Likewise.
+	(|$forceDatabaseUpdate|): Likewise.
+	(|$InteractiveFrame|): Likewise.
+	(|$form|): Likewise.
+	(|$Index|): Likewise.
+
+	* sys-constants.boot ($ExitMode): Define.
+	($exitMode): Move from bootfuns.lisp.pamphlet.
+
+	* sys-globals.boot ($form): Likewise.
+	($fromSpadTrace): Likewise.
+	($genSDVar): Likewise.
+	($Index): Likewise.
+	($inLispVM): Likewise.
+	($insideCapsuleFunctionIfTrue): Likewise.
+	($insideCategoryIfTrue): Likewise.
+	($insideCoerceInteractiveHardIfTrue): Likewise.
+	($insideConstructIfTrue): Likewise.
+	($insideExpressionIfTrue): Likewise.
+	($insideFunctorIfTrue): Likewise.
+	($insideWhereIfTrue): Likewise.
+	($instantRecord): Likewise.
+	($InteractiveFrame): Likewise.
+	($(InteractiveMode): Likewise.
+	($InteractiveTimingStatsIftrue): Likewise.
+	($forceDatabaseUpdate): Likewise.
+
+	* spad.lisp.pamphlet (S-PROCESS): Don't bind $exitMode here.
+
+	* bootfuns.lisp.pamphlet (|$exitMode|): Move to sys-constants.boot
+
+	* wi2.boot.pamphlet (compDefineFunctor1): Likewise.
+
+	* spad.lisp.pamphlet (S-PROCESS): Likewise.
+
+	* define.boot.pamphlet (compDefineFunctor1): Remove unused
+	$genFVar. 
+
+	* varini.boot.pamphlet ($ExitMode): Don't double define here.
+
+2007-08-26  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* sys-globals.boot ($IOindex): Move from bootfuns.lisp.pamphlet.
 	($inputPromptType): Likewise.
 	($whereList): Likewise.
diff --git a/src/interp/bootfuns.lisp.pamphlet b/src/interp/bootfuns.lisp.pamphlet
index 93b4222b..7d003826 100644
--- a/src/interp/bootfuns.lisp.pamphlet
+++ b/src/interp/bootfuns.lisp.pamphlet
@@ -123,32 +123,10 @@ offer it as extensions.
 (def-boot-val $delay 0				    "???")
 (def-boot-var $Directory			    "???")
 (def-boot-var $DISPLAY				    "???")
-(def-boot-var |$exitMode|			    "???")
-(def-boot-var |$forceDatabaseUpdate|		    "See load function.")
-(def-boot-var |$form|				    "???")
-(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 |$gauss01| '(|gauss| 0 1)		    "???")
-(def-boot-var |$genFVar|			    "???")
-(def-boot-val |$genSDVar| 0	    "counter for genSomeVariable" )
-(def-boot-var |$ignoreCommentsIfTrue|		    "???")
-(def-boot-var |$Index|				    "???")
-(def-boot-var |$inLispVM|			    "Interpreter>Eval.boot")
-(def-boot-var |$insideCapsuleFunctionIfTrue|	    "???")
-(def-boot-var |$insideCategoryIfTrue|		    "???")
-(def-boot-var |$insideCoerceInteractiveHardIfTrue|  "???")
-(def-boot-val |$insideCompTypeOf| NIL  "checked in comp3")
-(def-boot-val |$insideConstructIfTrue| NIL "checked in parse.boot")
-(def-boot-var |$insideExpressionIfTrue|		    "???")
-(def-boot-var |$insideFunctorIfTrue|		    "???")
-(def-boot-var |$insideWhereIfTrue|		    "???")
-(def-boot-val |$instantRecord| (MAKE-HASHTABLE 'ID) "???")
-(def-boot-val |$InteractiveFrame| '((NIL))	    "top level environment")
-(def-boot-var |$InteractiveMode|		    "Interactive>System.boot")
-(def-boot-val |$InteractiveModemapFrame| '((NIL))   "???")
-(def-boot-var |$InteractiveTimingStatsIfTrue|	    "???")
 (def-boot-val $lastprefix "S-"                      "???")
 (def-boot-val |$lastUntraced| NIL      "Used for )restore option of )trace.")
 (def-boot-var |$leaveLevelStack|		    "???")
diff --git a/src/interp/define.boot.pamphlet b/src/interp/define.boot.pamphlet
index 899fbe40..59cf4859 100644
--- a/src/interp/define.boot.pamphlet
+++ b/src/interp/define.boot.pamphlet
@@ -385,7 +385,6 @@ compDefineFunctor1(df is ['DEF,form,signature,$functorSpecialCases,body],
       $QuickCode = true => 'QSETREFV
       'SETELT
     $TOP__LEVEL: local
-    $genFVar: local:= 0
     $genSDVar: local:= 0
     originale:= $e
     [$op,:argl]:= form
diff --git a/src/interp/setq.lisp.pamphlet b/src/interp/setq.lisp.pamphlet
index 55279fa9..59943bff 100644
--- a/src/interp/setq.lisp.pamphlet
+++ b/src/interp/setq.lisp.pamphlet
@@ -124,7 +124,6 @@
 (SETQ $FUNNAME NIL)   ;; this and next used in COMP,TRAN,1
 (SETQ $FUNNAME_TAIL '(()))
 (SETQ $LASTPREFIX "S:")    ;"default setting"
-(SETQ |$inLispVM| 'T)
 (SETQ STAKCOLUMN -1)
 (SETQ ECHOMETA NIL)
 (SETQ |$checkParseIfTrue| 'NIL)
@@ -138,7 +137,6 @@
 (SETQ INITCOLUMN 0)
 (SETQ |$functionTable| NIL)
 (SETQ |$spaddefs| NIL)
-(SETQ |$InteractiveMode| T)
 (SETQ |$xeditIsConsole|	 NIL)
 (SETQ |$echoInputLines|	 NIL)	    ;; This is in SETVART also
 (SETQ |$Slot1DataBase| (MAKE-HASHTABLE 'ID))  ;; See NRUNTIME BOOT
@@ -240,7 +238,6 @@
 (SETQ $LISPLIB NIL)
 (SETQ |$dependeeClosureAlist|	    NIL)
 (SETQ |$userModemaps| NIL)
-(SETQ |$forceDatabaseUpdate| NIL)  ;; see "load" function
 (SETQ |$spadSystemDisks|  '(I J K L))
 (SETQ |$functorForm| NIL)
 
@@ -372,10 +369,7 @@
 
 (SETQ $TOP_LEVEL T)
 (SETQ $NE (LIST (LIST NIL)))
-(SETQ |$InteractiveFrame| (LIST (LIST NIL)))
 (SETQ |$gauss01| '(|gauss| 0 1))
-(SETQ |$form| NIL)
-(SETQ |$Index| 0)
 (SETQ |$suffix| NIL)
 (SETQ |$coerceIntByMapCounter| 0)
 (SETQ |$reportCoerce| NIL)
diff --git a/src/interp/spad.lisp.pamphlet b/src/interp/spad.lisp.pamphlet
index e37bb12e..074906a9 100644
--- a/src/interp/spad.lisp.pamphlet
+++ b/src/interp/spad.lisp.pamphlet
@@ -358,7 +358,6 @@
 	|$topOp|
 	(|$semanticErrorStack| ())
 	(|$warningStack| ())
-	(|$exitMode| |$EmptyMode|)
 	(|$returnMode| |$EmptyMode|)
 	(|$leaveMode| |$EmptyMode|)
 	(|$leaveLevelStack| ())
@@ -366,7 +365,6 @@
 	|$insideCoerceInteractiveHardIfTrue| |$insideWhereIfTrue|
 	|$insideCategoryIfTrue| |$insideCapsuleFunctionIfTrue| |$form|
 	(|$e| |$EmptyEnvironment|)
-	(|$genFVar| 0)
 	(|$genSDVar| 0)
 	(|$VariableCount| 0)
 	(|$previousTime| (TEMPUS-FUGIT)))
diff --git a/src/interp/sys-constants.boot b/src/interp/sys-constants.boot
index ec399877..85856f78 100644
--- a/src/interp/sys-constants.boot
+++ b/src/interp/sys-constants.boot
@@ -354,6 +354,10 @@ $ThrowAwayMode ==
 $NoValueMode ==
   "$NoValueMode"
 
+++
+$ExitMode ==
+  "$ExitMode"
+
 --%
   
 ++ Category constructor form
@@ -520,3 +524,6 @@ $false ==
 $NoValue ==
   "$NoValue"
 
+
+++
+$exitMode == $EmptyMode
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index 7f78371c..88f88f71 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -115,3 +115,56 @@ $whereList := []
 ++
 $warningStack := []
 
+++
+$form := nil
+
+++
+$fromSpadTrace := false
+
+++
+$genSDVar := 0
+
+++
+$Index := 0
+
+++
+$inLispVM := true
+
+++
+$insideCapsuleFunctionIfTrue := false
+
+++
+$insideCategoryIfTrue := false
+
+++
+$insideCoerceInteractiveHardIfTrue := false
+
+++
+$insideCompTypeOf := false
+
+++
+$insideConstructIfTrue := false
+
+++
+$insideExpressionIfTrue := false
+
+++
+$insideFunctorIfTrue := false
+
+++
+$insideWhereIfTrue := false
+
+++
+$instantRecord := MAKE_-HASHTABLE "ID"
+
+++
+$InteractiveFrame := [[nil]]
+
+++
+$InteractiveMode := true
+
+++
+$InteractiveTimingStatsIfTrue := false
+
+++
+$forceDatabaseUpdate := false
diff --git a/src/interp/varini.boot.pamphlet b/src/interp/varini.boot.pamphlet
index 6e8c0314..14233f02 100644
--- a/src/interp/varini.boot.pamphlet
+++ b/src/interp/varini.boot.pamphlet
@@ -171,7 +171,6 @@ $compSayPrefix :=      '"Msg"
 $charNumSymVector := NIL
  
 -- Modes
-$ExitMode :=          'ExitMode
 $FullMode :=          'FullMode
 $ValueMode :=         'ValueMode
  
@@ -193,7 +192,6 @@ $sefoDerivedAttributes := [ 'type, 'tfinfo, 'signature, 'pooled ]
 --from NCMODE BOOT
 $ValueMode   := 'ValueMode
 $FullMode    := 'FullMode
-$ExitMode    := 'ExitMode
  
 -- Miscellaneous nonsense.
 $newcompInteractiveRecovery := 'T
diff --git a/src/interp/wi2.boot.pamphlet b/src/interp/wi2.boot.pamphlet
index 75e650a3..38601fea 100644
--- a/src/interp/wi2.boot.pamphlet
+++ b/src/interp/wi2.boot.pamphlet
@@ -99,7 +99,6 @@ compDefineFunctor1(df, m,$e,$prefix,$formalArgList) ==
       $QuickCode = true => 'QSETREFV
       'SETELT
     $TOP__LEVEL: local
-    $genFVar: local:= 0
     $genSDVar: local:= 0
     originale:= $e
     [$op,:argl]:= form