9 files changed, 35 insertions, 24 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index cc4669dd..a9f2d6ba 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,5 +1,28 @@
 2007-09-02  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* compiler.boot.pamphlet (tc): Don't set $tripleCache.
+	* define.boot.pamphlet (compDefine): Likewise.
+	* wi1.boot.pamphlet (compDefine): Likewise.
+	* c-util.boot.pamphlet (displayComp): Likewise.
+	* spad.lisp.pamphlet (/TRANSPAD): Likewise.
+	* bootfuns.lisp.pamphlet (|$useDCQnotLET|): Move to
+	sys-globals.boot. 
+	(|$updateCatTableIfTrue|): Likewise.
+	(|$updateIfTrue|): Remove.
+	(|$streamCount|): Likewise.
+	(|$tripleCache|): Remove.
+	(|$TranslateOnly|): Likewise.
+	(|$topOp|): Likewise.
+	(|$streamIndexing|): Remove.
+	(|$streamAlist|): Likewise.
+	* setq.lisp.pamphlet (|$useDCQnotLET|): Don't set here.
+	($streamAlist): Likewise.
+	(|$updateCatTableIfTrue|): Likewise.
+	(|$streamIndexing|): Likewise.
+	(|$streamCount|): Likewise.
+
+2007-09-02  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* sys-globals.boot ($VariableCount): Move from
 	bootfuns.lisp.pamphlet.
 	($suffix): Likewise.
diff --git a/src/interp/bootfuns.lisp.pamphlet b/src/interp/bootfuns.lisp.pamphlet
index 9c21ac15..cb71394f 100644
--- a/src/interp/bootfuns.lisp.pamphlet
+++ b/src/interp/bootfuns.lisp.pamphlet
@@ -160,20 +160,9 @@ offer it as extensions.
 	  "Interpreter>System.boot")
 (def-boot-val $SPAD nil				    "Is this Spad code?")
 (def-boot-val |$spadLibFT| 'LISPLIB		    "???")
-(def-boot-var |$streamAlist|			    "???")
-(def-boot-val |$streamCount| 0			    "???")
-(def-boot-var |$streamIndexing|			    "???")
-(def-boot-var |$topOp|				   "See displayPreCompilationErrors")
 (def-boot-var $TOKSTACK				    "???")
 (def-boot-val $TOP_LEVEL t			    "???")
 (def-boot-var $top_stack			    "???")
-(def-boot-var |$TranslateOnly|			    "???")
-(def-boot-var |$tripleCache|			    "Compiler>Compiler.boot")
-
-(def-boot-val |$updateCatTableIfTrue| T	   "update category table on load")
-(def-boot-var |$updateIfTrue|
-	  "Should SPAD databases be updated&squeezed?")
-(def-boot-val |$useDCQnotLET| () "checked in DEF-LET for use of DCQ")
 @
 \eject
 \begin{thebibliography}{99}
diff --git a/src/interp/c-util.boot.pamphlet b/src/interp/c-util.boot.pamphlet
index 550d5e7a..ceae86d1 100644
--- a/src/interp/c-util.boot.pamphlet
+++ b/src/interp/c-util.boot.pamphlet
@@ -108,7 +108,6 @@ displayWarning(l,stream) ==
     sayBrightly(['"      [",i,'"] ",:x],stream)
  
 displayComp level ==
-  $tripleCache:= nil
   $bright:= " << "
   $dim:= " >> "
   if $insideCapsuleFunctionIfTrue=true then
@@ -911,7 +910,6 @@ traverse(fn, arg, ob) ==
 (DEFUN |displayWarning| (|l| |stream|) (SEQ (DO ((#0=#:G2550 |l| (CDR #0#)) (|x| NIL) (|i| 1 (QSADD1 |i|))) ((OR (ATOM #0#) (PROGN (SETQ |x| (CAR #0#)) NIL)) NIL) (SEQ (EXIT (|sayBrightly| (CONS (MAKESTRING "      [") (CONS |i| (CONS (MAKESTRING "] ") |x|))) |stream|)))))) 
 ;
 ;displayComp level ==
-;  $tripleCache:= nil
 ;  $bright:= " << "
 ;  $dim:= " >> "
 ;  if $insideCapsuleFunctionIfTrue=true then
@@ -929,7 +927,7 @@ traverse(fn, arg, ob) ==
 
 ;;;     ***       |displayComp| REDEFINED
 
-(DEFUN |displayComp| (|level|) (PROG (|LETTMP#1|) (RETURN (PROGN (SPADLET |$tripleCache| NIL) (SPADLET |$bright| (QUOTE | << |)) 
+(DEFUN |displayComp| (|level|) (PROG (|LETTMP#1|) (RETURN (PROGN (SPADLET |$bright| (QUOTE | << |)) 
 (SPADLET |$dim| (QUOTE | >> |)) (COND ((BOOT-EQUAL |$insideCapsuleFunctionIfTrue| (QUOTE T)) (|sayBrightly| (CONS (MAKESTRING "error in function") (CONS (QUOTE |%b|) (CONS |$op| (CONS (QUOTE |%d|) (CONS (QUOTE |%l|) NIL)))))))) (|pp| (|removeZeroOne| (|mkErrorExpr| |level|))) (|sayBrightly| (CONS (MAKESTRING "****** level") (CONS (QUOTE |%b|) (CONS |level| (CONS (QUOTE |%d|) (CONS (MAKESTRING " ******") NIL)))))) (SPADLET |LETTMP#1| (ELEM |$s| |level|)) (SPADLET |$x| (CAR |LETTMP#1|)) (SPADLET |$m| (CADR |LETTMP#1|)) (SPADLET |$f| (CADDR |LETTMP#1|)) (SPADLET |$exitModeStack| (CADDDR |LETTMP#1|)) (SPADLET $X |$x|) (SPADLET $M |$m|) (SPADLET $F |$f|) (SAY (MAKESTRING "$x:= ") |$x|) (SAY (MAKESTRING "$m:= ") |$m|) (SAY (MAKESTRING "$f:=")) (|F,PRINT-ONE| |$f|) NIL)))) 
 ;
 ;mkErrorExpr level ==
diff --git a/src/interp/compiler.boot.pamphlet b/src/interp/compiler.boot.pamphlet
index a443a2af..0e7d60db 100644
--- a/src/interp/compiler.boot.pamphlet
+++ b/src/interp/compiler.boot.pamphlet
@@ -146,7 +146,6 @@ compOrCroak1(x,m,e,compFn) ==
       userError errorMessage
 
 tc() ==
-  $tripleCache:= nil
   comp($x,$m,$f)
 
 
diff --git a/src/interp/define.boot.pamphlet b/src/interp/define.boot.pamphlet
index 59cf4859..db8adaf8 100644
--- a/src/interp/define.boot.pamphlet
+++ b/src/interp/define.boot.pamphlet
@@ -75,7 +75,6 @@ compCapsuleItems(itemlist,$predl,$e) ==
 --% FUNCTIONS WHICH MUNCH ON == STATEMENTS
  
 compDefine(form,m,e) ==
-  $tripleCache: local:= nil
   $tripleHits: local:= 0
   $macroIfTrue: local
   $packagesUsed: local
diff --git a/src/interp/setq.lisp.pamphlet b/src/interp/setq.lisp.pamphlet
index e36c5b8e..745d5db6 100644
--- a/src/interp/setq.lisp.pamphlet
+++ b/src/interp/setq.lisp.pamphlet
@@ -199,8 +199,6 @@
 (SETQ OPASSOC NIL)
 (SETQ SPADSYSKEY '(EOI EOL))
 
-(SETQ $streamAlist NIL)
-
 ;; following 2 variables are referenced by PREPARSE1
 
 (defvar |$byConstructors| () "list of constructors to be compiled")
@@ -292,7 +290,6 @@
 (SETQ |$spadLibFT| 'LISPLIB)
 
 (SETQ |$existingFiles| (MAKE-HASHTABLE 'UEQUAL))
-(SETQ |$updateCatTableIfTrue| 'T)
 
 (SETQ |$instantRecord| (MAKE-HASHTABLE 'ID))
 (SETQ |$immediateDataSymbol| '|--immediateData--|)
@@ -327,7 +324,6 @@
 (SETQ |$DomainsWithoutLisplibs| '(
   CAPSULE |Union| |Record| |SubDomain| |Mapping| |Enumeration| |Domain| |Mode|))
 
-(SETQ |$useDCQnotLET| NIL)	;; use DCQs for destructuring := patterns
 (SETQ |$QuickCode| T)
 	 ;" controls generation of QREFELT etc."
 (SETQ |$QuickLet| T)
@@ -358,8 +354,6 @@
 (SETQ |$coerceIntByMapCounter| 0)
 (SETQ |$reportCoerce| NIL)
 (SETQ |$reportCompilation| NIL)
-(SETQ |$streamCount| 0)
-(SETQ |$streamIndexing| NIL)
 (SETQ |$prefix| NIL)
 (SETQ |$formalArgList| ())
 (SETQ |$TriangleVariableList|
diff --git a/src/interp/spad.lisp.pamphlet b/src/interp/spad.lisp.pamphlet
index f4b1021f..5fd8bfa8 100644
--- a/src/interp/spad.lisp.pamphlet
+++ b/src/interp/spad.lisp.pamphlet
@@ -141,7 +141,6 @@
 	(setq proplist (LIST '(FLUID . |true|)
 			     (CONS '|special|
 				   (COPY-TREE |$InitialDomainsInScope|))))
-	(SETQ |$tripleCache| NIL)
 	(SETQ |$InteractiveFrame|
 	      (|addBinding| '|$DomainsInScope| proplist
 			  (|addBinding| '|$Information| NIL
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index 69f31f40..17c104c8 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -244,6 +244,17 @@ $tracedSpadModemap := nil
 ++
 $traceletFunctions := []
 
+++
+$useDCQnotLET := false
+
+++
+$updateCatTableIfTrue := true
 
+++
+$TranslateOnly := false
 
+++
+$topOp := nil
 
+++
+$streamCount := 0
diff --git a/src/interp/wi1.boot.pamphlet b/src/interp/wi1.boot.pamphlet
index 88c1d032..a86a7da2 100644
--- a/src/interp/wi1.boot.pamphlet
+++ b/src/interp/wi1.boot.pamphlet
@@ -1092,7 +1092,6 @@ compNot([op,arg], pWas, m, e) ==
   coerce(markAny('compNot, pWas, [["NOT",x],$Boolean,ei]),m)
 
 compDefine(form,m,e) ==
-  $tripleCache: local:= nil
   $tripleHits: local:= 0
   $macroIfTrue: local
   $packagesUsed: local