* bootfuns.lisp.pamphlet ($TOP_LEVEL): Move to sys-globals.boot.

	($TOKSTACK): Likewise.
	($function): Likewise.
	($FUNNAME): Likewise.
	($FunName_Tail): Likewise.
	($lastprefix): Likewise.
	($linestack): Likewise.
	($maxlinenumber): Likewise.
 	($OLDLINE): Likewise.
	($SPAD): Likewise.
	($delay): Move to debug.lisp.pamphlet.
	($LINENUMBER): Likewise.
	($Directory): Remove.
	($top_stack): Remove.
	($DISPLAY): Likewise.
	(|$gauss01|): Likewise.
	($NBOOT): Likewise.
	($NEWLINSTACK): Likewise.
	($num_of_meta_errors): Move to metalex.lisp.pamphlet.
	* setq.lisp.pamphlet ($TOP_LEVEL): Don't set here.
	($DISPLAY): Likewise.
	($FUNNAME): Likewise.
	($FUNNAME_TAIL): Likewise.
	(|$gauss01|): Likewise.
	($LASTPREFIX): Likewise.
	($NBOOT): Likewise.
	($OLDLINE): Likewise.
	* spad.lisp.pamphlet ($linestack): Likewise.
	($maxlinenumber): Likewise.
	(|New,ENTRY,1|): Don't bind here.

7 files changed, 70 insertions, 30 deletions

diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index a9f2d6ba..03a34286 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,5 +1,38 @@
 2007-09-02  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* bootfuns.lisp.pamphlet ($TOP_LEVEL): Move to sys-globals.boot.
+	($TOKSTACK): Likewise.
+	($function): Likewise.
+	($FUNNAME): Likewise.
+	($FunName_Tail): Likewise.
+	($lastprefix): Likewise.
+	($linestack): Likewise.
+	($maxlinenumber): Likewise.
+	($OLDLINE): Likewise.
+	($SPAD): Likewise.
+	($delay): Move to debug.lisp.pamphlet.
+	($LINENUMBER): Likewise.
+	($Directory): Remove.
+	($top_stack): Remove.
+	($DISPLAY): Likewise.
+	(|$gauss01|): Likewise.
+	($NBOOT): Likewise.
+	($NEWLINSTACK): Likewise.
+	($num_of_meta_errors): Move to metalex.lisp.pamphlet.
+	* setq.lisp.pamphlet ($TOP_LEVEL): Don't set here.
+	($DISPLAY): Likewise.
+	($FUNNAME): Likewise.
+	($FUNNAME_TAIL): Likewise.
+	(|$gauss01|): Likewise.
+	($LASTPREFIX): Likewise.
+	($NBOOT): Likewise.
+	($OLDLINE): Likewise.
+	* spad.lisp.pamphlet ($linestack): Likewise.
+	($maxlinenumber): Likewise.
+	(|New,ENTRY,1|): Don't bind here.
+
+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.
diff --git a/src/interp/bootfuns.lisp.pamphlet b/src/interp/bootfuns.lisp.pamphlet
index cb71394f..d06110cd 100644
--- a/src/interp/bootfuns.lisp.pamphlet
+++ b/src/interp/bootfuns.lisp.pamphlet
@@ -120,22 +120,7 @@ offer it as extensions.
       (((|Category|) (|Category|) (|List| |Category|)) (|Category|)) (T *))
 	)))))
 	"Compiler>CUtil.boot")
-(def-boot-val $delay 0				    "???")
-(def-boot-var $Directory			    "???")
-(def-boot-var $DISPLAY				    "???")
-(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-val $lastprefix "S-"                      "???")
-(def-boot-var $LINENUMBER			    "???")
-(def-boot-var $linestack			    "???")
 (def-boot-val $LISPLIB nil		    "whether to produce a lisplib or not")
-(def-boot-var $maxlinenumber			    "???")
-(def-boot-var $NBOOT				    "???")
-(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-var |OptionList|			    "???")
 (def-boot-val |$printLoadMsgs|	't	    "Interpreter>SetVarT.boot")
 (def-boot-var |$PrintOnly|			    "Compiler>LispLib.boot")
@@ -158,11 +143,7 @@ offer it as extensions.
 (def-boot-val |$sourceFileTypes|
 	  '(SPAD BOOT LISP LISP370 META)
 	  "Interpreter>System.boot")
-(def-boot-val $SPAD nil				    "Is this Spad code?")
 (def-boot-val |$spadLibFT| 'LISPLIB		    "???")
-(def-boot-var $TOKSTACK				    "???")
-(def-boot-val $TOP_LEVEL t			    "???")
-(def-boot-var $top_stack			    "???")
 @
 \eject
 \begin{thebibliography}{99}
diff --git a/src/interp/debug.lisp.pamphlet b/src/interp/debug.lisp.pamphlet
index 23929b52..48c415fa 100644
--- a/src/interp/debug.lisp.pamphlet
+++ b/src/interp/debug.lisp.pamphlet
@@ -188,6 +188,8 @@ exit (rds ifile)
        (declare (special CUROUTSTREAM))
   "Called from compConLib1 (see LISPLIB BOOT) to bind CUROUTSTREAM."
   (/D-2 FN INFILE CUROUTSTREAM OP EDITFLAG TRACEFLAG))
+
+(defparameter $linenumber 0)
  
 (DEFUN /D-2 (FN INFILE OUTPUTSTREAM OP EDITFLAG TRACEFLAG)
        (declare (special OUTPUTSTREAM))
@@ -1118,6 +1120,7 @@ EXAMINE (SETQ RECNO (NOTE INPUTSTREAM))
 
 (defvar |$oldTime| 0)
 (defvar |$timerOn| t)
+(defvar $delay 0)
  
 (defun |startTimer| ()
     (SETQ $delay (PLUS $delay (DIFFERENCE (TEMPUS-FUGIT) |$oldTime|)))
diff --git a/src/interp/metalex.lisp.pamphlet b/src/interp/metalex.lisp.pamphlet
index d0b6554b..32fa639e 100644
--- a/src/interp/metalex.lisp.pamphlet
+++ b/src/interp/metalex.lisp.pamphlet
@@ -274,6 +274,8 @@ special character be the atom whose print name is the character itself."
 (defun print-rule (x)  (print x out-stream) (format out-stream "~%~%"))
  
 ; *** 5. META Error Handling
+
+(defparameter $num_of_meta_errors 0)
  
 (defun meta-meta-error-handler (&optional (wanted nil) (parsing nil))
   "Print syntax error indication, underline character, scrub line."
diff --git a/src/interp/setq.lisp.pamphlet b/src/interp/setq.lisp.pamphlet
index 745d5db6..c8d61b0c 100644
--- a/src/interp/setq.lisp.pamphlet
+++ b/src/interp/setq.lisp.pamphlet
@@ -84,7 +84,6 @@
 ;; These were originally in SPAD LISP
 
 (SETQ $BOOT NIL)
-(SETQ $NBOOT NIL)
 (setq |$interpOnly| nil)
 (SETQ |$testingSystem| NIL)
 (SETQ |$publicSystem| NIL)
@@ -121,16 +120,11 @@
 (setq |$Newline| #\Newline)
 
 
-(SETQ $FUNNAME NIL)   ;; this and next used in COMP,TRAN,1
-(SETQ $FUNNAME_TAIL '(()))
-(SETQ $LASTPREFIX "S:")    ;"default setting"
 (SETQ STAKCOLUMN -1)
 (SETQ ECHOMETA NIL)
 (SETQ |$checkParseIfTrue| 'NIL)
 (SETQ |$oldParserExpandAbbrs| NIL)
-(SETQ $DISPLAY NIL)
 (SETQ |S:SPADKEY| NIL) ;" this is augmented by MAKESPADOP"
-(SETQ $OLDLINE NIL)  ;"used to output command lines"
 (SETQ |/EDIT,FT| 'SPAD)
 (SETQ |/EDIT,FM| 'A)
 (SETQ /EDITFILE NIL)
@@ -347,9 +341,7 @@
 ;; New Names
 (SETQ |$SingleInteger| '(|SingleInteger|))
 
-(SETQ $TOP_LEVEL T)
 (SETQ $NE (LIST (LIST NIL)))
-(SETQ |$gauss01| '(|gauss| 0 1))
 (SETQ |$suffix| NIL)
 (SETQ |$coerceIntByMapCounter| 0)
 (SETQ |$reportCoerce| NIL)
diff --git a/src/interp/spad.lisp.pamphlet b/src/interp/spad.lisp.pamphlet
index 5fd8bfa8..bfd0a1be 100644
--- a/src/interp/spad.lisp.pamphlet
+++ b/src/interp/spad.lisp.pamphlet
@@ -104,8 +104,6 @@
 (defvar |boot-NewKEY| NIL)
 (setq /WSNAME 'NOBOOT)
 (DEFVAR _ '&)
-(setq $linestack 'begin_unit)
-(setq $maxlinenumber 0)
 (defvar /EDIT-FM 'A1)
 (defvar /EDIT-FT 'SPAD)
 (defvar /RELEASE '"UNKNOWN")
@@ -402,7 +400,7 @@
 (defun |New,ENTRY,1| ()
     (let (ZZ str N RLGENSYMFG RLGENSYMLST |NewFLAG| XCAPE *PROMPT*
 	  SINGLELINEMODE OK ISID NBLNK COUNT CHR ULCASEFG ($LINESTACK 'BEGIN_UNIT)
-	  $NEWLINSTACK $TOKSTACK COMMENTCHR TOK LINE BACK INPUTSTREAM XTRANS
+	  $TOKSTACK COMMENTCHR TOK LINE BACK INPUTSTREAM XTRANS
 	  XTOKENREADER STACK STACKX TRAPFLAG)
       (SETQ XTRANS '|boot-New|
 	    XTOKENREADER 'NewSYSTOK
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index 17c104c8..3c1c77cb 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -258,3 +258,34 @@ $topOp := nil
 
 ++
 $streamCount := 0
+
+++
+$TOP__LEVEL := true
+
+++
+$TOKSTACK := nil
+
+++
+$FUNCTION := nil
+
+++
+$FUNNAME := nil
+
+++
+$FUNNAME__TAIL := '(())
+
+++
+$LASTPREFIX := '"S_:"
+
+++
+$LINESTACK := "BEGIN__UNIT"
+
+++
+$MAXLINENUMBER := 0
+
+++
+$OLDLINE := nil
+
+++
+$SPAD := false
+