aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/interp/ChangeLog56
-rw-r--r--src/interp/bootfuns.lisp.pamphlet22
-rw-r--r--src/interp/setq.lisp.pamphlet9
-rw-r--r--src/interp/spad.lisp.pamphlet1
-rw-r--r--src/interp/sys-constants.boot6
-rw-r--r--src/interp/sys-globals.boot41
-rw-r--r--src/interp/trace.boot.pamphlet3
7 files changed, 106 insertions, 32 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 21be9ac2..2e325a4d 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,3 +1,59 @@
+2007-08-29 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * sys-globals.boot ($leaveLevelStack): Move from
+ bootfuns.lisp.pamphlet.
+ ($letAssoc): Likewise.
+ ($libFile): Likewise.
+ ($lisplibForm): Likewise.
+ ($lisplibKind): Likewise.
+ ($lisplibModemapAlist): Likewise.
+ ($lisplibModemap): Likewise.
+ ($lisplibOperationAlist): Likewise.
+ ($lisplibSignatureAlist): Likewise.
+ ($lisplibVariableAlist): Likewise.
+ ($mapSubNameAlist): Likewise.
+ ($mathTrace): Lilkewise.
+ ($mathTraceList): Likewise.
+
+ * sys-constants.boot ($exitMode): Likewise.
+ ($leaveMode): Likewise.
+ ($noEnv): Likewise.
+
+ * trace.boot.pamphlet ($lastUntraced): Likewise.
+
+ * spad.lisp.pamphlet (|$leaveMode|): Don't bind here.
+
+ * setq.lisp.pamphlet (|$Lisp|): Remove.
+ (|$noEnv|): Don't set here.
+ (|$lastUntraced|): Likewise.
+ (|$mostRecentOpAlist|): Likewise.
+ (|$mathTraceList|): Likewise.
+ (|$letAssoc|): Likewise.
+
+ * bootfuns.lisp.pamphlet (|$noEnv|): Move to sys-constants.boot.
+ (|$leaveMode|): Likewise.
+ (|$lastUntraced|): Move to trace.boot.pamphlet.
+ (|$leaveLevelStack|): Move to sys-globals.boot.
+ (|$letAssoc|): Likewise.
+ (|$libFile|): Likewise.
+ (|$lisplibDomainDependents|): Likewise.
+ (|$lisplibForm|): Likewise.
+ (|$lisplibKind|): Likewise.
+ (|$lisplibModemapAlist|): Likewise.
+ (|$lisplibModemap|): Likewise.
+ (|$lisplibOperationAlist|): Likewise.
+ (|$lisplibSignatureAlist|): Likewise.
+ (|$lisplibVariableAlist|): Likewise.
+ (|$mapSubNameAlist|): Likewise.
+ (|$mathTrace|): Likewise.
+ (|$mathTraceList|): Likewise.
+
+ (|$Lisp|): Remove.
+ (|$lisplibDependentCategories|): Likewise.
+ (|$lisp2lispRenameAssoc|): Likewise.
+ (|$ModemapFrame|): Likewise.
+ (|$mostRecentOpAlist|): Likewise.
+
2007-08-26 Gabriel Dos Reis <gdr@cs.tamu.edu>
* bootfuns.lisp.pamphlet (|$forceDatabaseUpdate|): Move to
diff --git a/src/interp/bootfuns.lisp.pamphlet b/src/interp/bootfuns.lisp.pamphlet
index 7d003826..8c4d1afc 100644
--- a/src/interp/bootfuns.lisp.pamphlet
+++ b/src/interp/bootfuns.lisp.pamphlet
@@ -128,34 +128,12 @@ offer it as extensions.
(def-boot-var $FunName_Tail "???")
(def-boot-val |$gauss01| '(|gauss| 0 1) "???")
(def-boot-val $lastprefix "S-" "???")
-(def-boot-val |$lastUntraced| NIL "Used for )restore option of )trace.")
-(def-boot-var |$leaveLevelStack| "???")
-(def-boot-var |$leaveMode| "???")
-(def-boot-val |$letAssoc| NIL "Used for trace of assignments in SPAD code.")
-(def-boot-var |$libFile| "Compiler>LispLib.boot")
(def-boot-var $LINENUMBER "???")
(def-boot-var $linestack "???")
-(def-boot-val |$Lisp| '(|Lisp|) "???")
(def-boot-val $LISPLIB nil "whether to produce a lisplib or not")
-(def-boot-var |$lisplibDependentCategories| "Compiler>LispLib.boot")
-(def-boot-var |$lisplibDomainDependents| "Compiler>LispLib.boot")
-(def-boot-var |$lisplibForm| "Compiler>LispLib.boot")
-(def-boot-var |$lisplibKind| "Compiler>LispLib.boot")
-(def-boot-var |$lisplibModemapAlist| "Compiler>LispLib.boot")
-(def-boot-var |$lisplibModemap| "Compiler>LispLib.boot")
-(def-boot-var |$lisplibOperationAlist| "Compiler>LispLib.boot")
-(def-boot-var |$lisplibSignatureAlist| "Compiler>LispLib.boot")
-(def-boot-var |$lisplibVariableAlist| "Compiler>LispLib.boot")
-(def-boot-var |$lisp2lispRenameAssoc| "???")
-(def-boot-var |$mapSubNameAlist| "Interpreter>Trace.boot")
-(def-boot-var |$mathTrace| "Interpreter>Trace.boot")
-(def-boot-var |$mathTraceList| "Controls mathprint output for )trace.")
(def-boot-var $maxlinenumber "???")
-(def-boot-var |$ModemapFrame| "???")
-(def-boot-var |$mostRecentOpAlist| "???")
(def-boot-var $NBOOT "???")
(def-boot-var $NEWLINSTACK "???")
-(def-boot-var |$noEnv| "???")
(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 "???")
diff --git a/src/interp/setq.lisp.pamphlet b/src/interp/setq.lisp.pamphlet
index 59943bff..32ab00e0 100644
--- a/src/interp/setq.lisp.pamphlet
+++ b/src/interp/setq.lisp.pamphlet
@@ -333,25 +333,17 @@
(SETQ |$DomainsWithoutLisplibs| '(
CAPSULE |Union| |Record| |SubDomain| |Mapping| |Enumeration| |Domain| |Mode|))
-(SETQ |$letAssoc| NIL)
- ;" used for trace of assignments in SPAD code -- see macro LETT"
(SETQ |$useDCQnotLET| NIL) ;; use DCQs for destructuring := patterns
(SETQ |$QuickCode| T)
;" controls generation of QREFELT etc."
(SETQ |$QuickLet| T)
;" controls generation of LET tracing."
-(SETQ |$lastUntraced| NIL)
- ;" used for )restore option of )trace."
-(SETQ |$mathTraceList| NIL)
- ;" controls mathprint output for )trace."
(SETQ |$tracedMapSignatures| ())
(SETQ |$highlightAllowed| 'T)
;" used in BRIGHTPRINT and is a )set variable"
(SETQ |$PrintCompilerMessagesIfTrue| NIL)
(SETQ |$printStorageIfTrue| NIL) ;; storage info disabled in common lisp
-(SETQ |$mostRecentOpAlist| NIL)
-(SETQ |$noEnv| NIL)
(SETQ |$opFilter| NIL) ;" used to |/s a function "
(SETQ |$AnonymousFunction| '(|AnonymousFunction|))
@@ -380,7 +372,6 @@
(SETQ |$prefix| NIL)
(SETQ |$Polvar| '(WRAPPED . ((1 . 1))))
(SETQ |$OneCoef| '(1 1 . 1))
-(SETQ |$Lisp| '(|Lisp|))
(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/spad.lisp.pamphlet b/src/interp/spad.lisp.pamphlet
index 074906a9..dff77a2c 100644
--- a/src/interp/spad.lisp.pamphlet
+++ b/src/interp/spad.lisp.pamphlet
@@ -359,7 +359,6 @@
(|$semanticErrorStack| ())
(|$warningStack| ())
(|$returnMode| |$EmptyMode|)
- (|$leaveMode| |$EmptyMode|)
(|$leaveLevelStack| ())
$TOP_LEVEL |$insideFunctorIfTrue| |$insideExpressionIfTrue|
|$insideCoerceInteractiveHardIfTrue| |$insideWhereIfTrue|
diff --git a/src/interp/sys-constants.boot b/src/interp/sys-constants.boot
index 85856f78..014e83b9 100644
--- a/src/interp/sys-constants.boot
+++ b/src/interp/sys-constants.boot
@@ -527,3 +527,9 @@ $NoValue ==
++
$exitMode == $EmptyMode
+
+++
+$leaveMode == $EmptyMode
+
+++
+$noEnv == nil
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index 88f88f71..86c4db8c 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -168,3 +168,44 @@ $InteractiveTimingStatsIfTrue := false
++
$forceDatabaseUpdate := false
+
+++
+$leaveLevelStack := []
+
+++
+++ FIXME: eventually move to trace.boot.
+$letAssoc := false
+
+++
+$libFile := nil
+
+++
+$lisplibForm := nil
+
+++
+$lisplibKind := nil
+
+++
+$lisplibModemapAlist := []
+
+++
+$lisplibModemap := nil
+
+++
+$lisplibOperationAlist := []
+
+++
+$lisplibSignatureAlist := []
+
+++
+$lisplibVariableAlist := []
+
+++
+$mapSubNameAlist := []
+
+++
+$mathTrace := false
+
+++
+$mathTraceList := []
+
diff --git a/src/interp/trace.boot.pamphlet b/src/interp/trace.boot.pamphlet
index f6890cde..1563ea98 100644
--- a/src/interp/trace.boot.pamphlet
+++ b/src/interp/trace.boot.pamphlet
@@ -84,6 +84,9 @@ SETANDFILEQ($traceOptionList,'(
within _
))
+
+SETANDFILEQ($lastUntraced,NIL)
+
trace l == traceSpad2Cmd l
traceSpad2Cmd l ==