diff options
| -rw-r--r-- | src/interp/ChangeLog | 34 | ||||
| -rw-r--r-- | src/interp/bootfuns.lisp.pamphlet | 19 | ||||
| -rw-r--r-- | src/interp/debug.lisp.pamphlet | 7 | ||||
| -rw-r--r-- | src/interp/setq.lisp.pamphlet | 11 | ||||
| -rw-r--r-- | src/interp/spad.lisp.pamphlet | 1 | ||||
| -rw-r--r-- | src/interp/sys-globals.boot | 29 |
6 files changed, 69 insertions, 32 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index aa7c8510..cc4669dd 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,3 +1,37 @@ +2007-09-02 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * sys-globals.boot ($VariableCount): Move from + bootfuns.lisp.pamphlet. + ($suffix): Likewise. + ($useBFasDefault): Likewise. + ($semanticErrorStack): Likewise. + ($tracedModemap): Likewise. + ($tracedSpadModemap): Likewise. + ($traceletFunctions): Likewise. + * bootfuns.lisp.pamphlet (|$VariableCount|): Move to + sys-globals.boot. + (|$suffix|): Likewise. + (|$useBFasDefault|): Likewise. + (|$semanticErrorStack|): Likewise. + (|$tracedModemap|): Likewise. + (|$tracedSpadModemap|): Likewise. + (|$traceletFunctions|): Likewise. + (|$TraceFlag|): Move to debug.lisp.pamphlet. + (|$traceDomains|): Likewise. + (|$systemLastChanged|): Remove. + (|$systemCreation|): Likewise. + (|$StreamIndex|): Remove. + (|$spadSystemDisks|): Likewise. + (|$spadOpList|): Likewise. + (|$traceNoisely|): Remove from here. + (|$timerOn|): Move to debug.lisp.pamphlet. + * setq.lisp.pamphlet (|$systemLastChanged|): Remove. + (|$systemCreation|): Likewise. + * setq.lisp.pamphlet (|$useBFasDefault|): Don't set here. + * setq.lisp.pamphlet (|$reportExitModeStack|): Likewise. + * setq.lisp.pamphlet (|$spadSystemDisks|): Likewise. + * spad.lisp.pamphlet (|$useBFasDefault|): Likewise. + 2007-08-30 Gabriel Dos Reis <gdr@cs.tamu.edu> * sys-globals.boot ($prefix): Move from bootfuns.lisp.pamphlet. diff --git a/src/interp/bootfuns.lisp.pamphlet b/src/interp/bootfuns.lisp.pamphlet index 8da30d21..9c21ac15 100644 --- a/src/interp/bootfuns.lisp.pamphlet +++ b/src/interp/bootfuns.lisp.pamphlet @@ -148,13 +148,11 @@ offer it as extensions. (def-boot-var |$reportCoerce| "???") (def-boot-var |$reportCoerceIfTrue| "???") (def-boot-var |$reportCompilation| "???") -(def-boot-var |$reportExitModeStack| "???") (def-boot-var |$reportFlag| "Interpreter>SetVars.boot") (def-boot-val |$reportSpadTrace| () "report list of traced functions") (def-boot-var |$resolveFlag| "Interpreter>SetVars.boot") (def-boot-var |$returnMode| "???") (def-boot-var |$scanModeFlag| "???") -(def-boot-var |$semanticErrorStack| "???") (def-boot-val |$SetFunctions| nil "checked in SetFunctionSlots") (def-boot-var |$slamFlag| "Interpreter>SetVars.boot") (def-boot-val |$sourceFileTypes| @@ -162,37 +160,20 @@ offer it as extensions. "Interpreter>System.boot") (def-boot-val $SPAD nil "Is this Spad code?") (def-boot-val |$spadLibFT| 'LISPLIB "???") -(def-boot-var |$spadOpList| "???") -(def-boot-var |$spadSystemDisks| "Interpreter>Database.boot") (def-boot-var |$streamAlist| "???") (def-boot-val |$streamCount| 0 "???") (def-boot-var |$streamIndexing| "???") -(def-boot-val |$StreamIndex| 0 "???") -(def-boot-var |$suffix| "???") -(def-boot-val |$systemCreation| (currenttime) "???") -(def-boot-val |$systemLastChanged| - |$systemCreation| "???") -(def-boot-val |$timerOn| t "???") (def-boot-var |$topOp| "See displayPreCompilationErrors") (def-boot-var $TOKSTACK "???") (def-boot-val $TOP_LEVEL t "???") (def-boot-var $top_stack "???") -(def-boot-var |$tracedModemap| "Interpreter>Trace.boot") -(def-boot-val |$traceDomains| t "enables domain tracing") -(def-boot-val |$TraceFlag| t "???") -(def-boot-var |$tracedSpadModemap| "Interpreter>Trace.boot") -(def-boot-var |$traceletFunctions| "???") -(def-boot-var |$traceNoisely| "Interpreter>Trace.boot") (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 |$useBFasDefault| T - "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| "???") @ \eject \begin{thebibliography}{99} diff --git a/src/interp/debug.lisp.pamphlet b/src/interp/debug.lisp.pamphlet index d5303b2c..23929b52 100644 --- a/src/interp/debug.lisp.pamphlet +++ b/src/interp/debug.lisp.pamphlet @@ -527,7 +527,9 @@ EXAMINE (SETQ RECNO (NOTE INPUTSTREAM)) (DEFUN /TRACE-1 (FNLIST OPTIONS) (mapcar #'(lambda (X) (/TRACE-2 X OPTIONS)) FNLIST) (/TRACEREPLY)) - + +(defvar |$traceDomains| t) + (DEFUN /TRACE-2 (FN OPTIONS) (PROG (U FNVAL COUNTNAM TRACECODE BEFORE AFTER CONDITION TRACENAME CALLER VARS BREAK FROM_CONDITION VARBREAK TIMERNAM @@ -1015,6 +1017,8 @@ EXAMINE (SETQ RECNO (NOTE INPUTSTREAM)) COUNTNAM TIMERNAM BEFORE AFTER CONDITION BREAK |$tracedModemap| ''T))))) (RETURN G1))) + +(defvar |$TraceFlag| t) (defun /MONITORX (/ARGS FUNCT OPTS &AUX NAME TYPE TRACECODE COUNTNAM TIMERNAM BEFORE AFTER CONDITION BREAK TRACEDMODEMAP @@ -1113,6 +1117,7 @@ EXAMINE (SETQ RECNO (NOTE INPUTSTREAM)) ; on and off (defvar |$oldTime| 0) +(defvar |$timerOn| t) (defun |startTimer| () (SETQ $delay (PLUS $delay (DIFFERENCE (TEMPUS-FUGIT) |$oldTime|))) diff --git a/src/interp/setq.lisp.pamphlet b/src/interp/setq.lisp.pamphlet index 89e872a4..e36c5b8e 100644 --- a/src/interp/setq.lisp.pamphlet +++ b/src/interp/setq.lisp.pamphlet @@ -230,15 +230,9 @@ ;; These were originally in INIT LISP -(SETQ |$systemCreation| - (STRCONC (SUBSTRING (CURRENTTIME) 0 8) " at " - (SUBSTRING (CURRENTTIME) 8 5))) -(SETQ |$systemLastChanged| |$systemCreation|) - (SETQ $LISPLIB NIL) (SETQ |$dependeeClosureAlist| NIL) (SETQ |$userModemaps| NIL) -(SETQ |$spadSystemDisks| '(I J K L)) (SETQ |$functorForm| NIL) (SETQ |$InitialCommandSynonymAlist| '( @@ -366,7 +360,6 @@ (SETQ |$reportCompilation| NIL) (SETQ |$streamCount| 0) (SETQ |$streamIndexing| NIL) -(SETQ |$reportExitModeStack| NIL) (SETQ |$prefix| NIL) (SETQ |$formalArgList| ()) (SETQ |$TriangleVariableList| @@ -448,10 +441,6 @@ ;; ---- end of initial settings for variables used in test.boot -;; Next flag determines whether to use BF as default floating point -;; type. (actually, now means NewFloat) - -(SETQ |$useBFasDefault| 'T) ;; Next are initial values for fluid variables in G-BOOT BOOT diff --git a/src/interp/spad.lisp.pamphlet b/src/interp/spad.lisp.pamphlet index 40e2f568..f4b1021f 100644 --- a/src/interp/spad.lisp.pamphlet +++ b/src/interp/spad.lisp.pamphlet @@ -130,7 +130,6 @@ (setq XTOKENREADER 'SPADTOK) (defvar xtrans '|boot-new|) (defvar |$IOAlist| '((|%i| . (|gauss| 0 1)))) -(setq |$useBFasDefault| T) (defvar |InteractiveMode|) (defvar |NewFLAG| t) (defvar |uc| 'UC) diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot index 15610287..69f31f40 100644 --- a/src/interp/sys-globals.boot +++ b/src/interp/sys-globals.boot @@ -218,3 +218,32 @@ $PrettyPrint := false ++ $previousTime := 0 +++ +$VariableCount := 0 + +++ +++ FIXME: Eventually move to define.boot.pamphlet. +$suffix := 0 + +++ +$useBFasDefault := true + +++ +$semanticErrorStack := [] + +++ +++ FIXME: Eventually move to compiler.boot.pamphlet. +$reportExitModeStack := false + +++ +$tracedModemap := nil + +++ +$tracedSpadModemap := nil + +++ +$traceletFunctions := [] + + + + |