aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2007-08-26 12:41:20 +0000
committerdos-reis <gdr@axiomatics.org>2007-08-26 12:41:20 +0000
commit45f656f12b8a880be7ed618a5fcb86fb639f1285 (patch)
tree22459649d2b164f884e4236deaedace83a6d62b3
parent5aea0ad31f2b0a610d2c5887cf44a5bd47a8582d (diff)
downloadopen-axiom-45f656f12b8a880be7ed618a5fcb86fb639f1285.tar.gz
* bootfuns.lisp.pamphlet (|$constructorsNotInDatabase|): Remove.
(|$DomainFrame|): Remove. (|$eltIfNil|): Remove. (|$compileMapFlag|): Remove. (|$evalDomain|): Don't set here. (|$false|): Move to sys-constants.boot. (|$domainTraceNameAssoc|): Move to sys-globals.boot. (|$evalDomain|): Move to sys-globals.boot. (|$exitModeStack|): Move to sys-globals.boot * pspad1.boot.pamphlet (lisp2Boot): Don't declare $eltIfNil anymore. * setvars.boot.pamphlet (resetWorkspaceVariables): Don't set anymore. * setq.lisp.pamphlet (|$domainTraceNameAssoc|): Don't set here. * spad.lisp.pamphlet (S-PROCESS): Don't bind |$DomainFrame| anymore. (S-PROCESS): Set $exitModeStack to nil. (|$false|): Don't set here.
-rw-r--r--src/interp/ChangeLog19
-rw-r--r--src/interp/bootfuns.lisp.pamphlet8
-rw-r--r--src/interp/pspad1.boot.pamphlet1
-rw-r--r--src/interp/setq.lisp.pamphlet4
-rw-r--r--src/interp/setvars.boot.pamphlet1
-rw-r--r--src/interp/spad.lisp.pamphlet3
-rw-r--r--src/interp/sys-constants.boot3
-rw-r--r--src/interp/sys-globals.boot9
8 files changed, 32 insertions, 16 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 06b2e708..009df8d7 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,5 +1,24 @@
2007-08-26 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * bootfuns.lisp.pamphlet (|$constructorsNotInDatabase|): Remove.
+ (|$DomainFrame|): Remove.
+ (|$eltIfNil|): Remove.
+ (|$compileMapFlag|): Remove.
+ (|$evalDomain|): Don't set here.
+ (|$false|): Move to sys-constants.boot.
+ (|$domainTraceNameAssoc|): Move to sys-globals.boot.
+ (|$evalDomain|): Move to sys-globals.boot.
+ (|$exitModeStack|): Move to sys-globals.boot
+ * pspad1.boot.pamphlet (lisp2Boot): Don't declare $eltIfNil anymore.
+ * setvars.boot.pamphlet (resetWorkspaceVariables): Don't set
+ anymore.
+ * setq.lisp.pamphlet (|$domainTraceNameAssoc|): Don't set here.
+ * spad.lisp.pamphlet (S-PROCESS): Don't bind |$DomainFrame| anymore.
+ (S-PROCESS): Set $exitModeStack to nil.
+ (|$false|): Don't set here.
+
+2007-08-26 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* ccl-depsys.lsp.pamphlet: Remove.
2007-08-24 Gabriel Dos Reis <gdr@cs.tamu.edu>
diff --git a/src/interp/bootfuns.lisp.pamphlet b/src/interp/bootfuns.lisp.pamphlet
index ba3ceb97..af96a757 100644
--- a/src/interp/bootfuns.lisp.pamphlet
+++ b/src/interp/bootfuns.lisp.pamphlet
@@ -120,18 +120,10 @@ offer it as extensions.
(((|Category|) (|Category|) (|List| |Category|)) (|Category|)) (T *))
)))))
"Compiler>CUtil.boot")
-(def-boot-var |$compileMapFlag| "Interpreter>SetVars.boot")
-(def-boot-var |$constructorsNotInDatabase| "Interpreter>Database.boot")
(def-boot-val $delay 0 "???")
(def-boot-var $Directory "???")
(def-boot-var $DISPLAY "???")
-(def-boot-var |$DomainFrame| "???")
-(def-boot-val |$domainTraceNameAssoc| () "association list of trace domains")
-(def-boot-var |$eltIfNil| "SpecialFunctions>PSpad.boot")
-(def-boot-var |$evalDomain| "???")
(def-boot-var |$exitMode| "???")
-(def-boot-var |$exitModeStack| "???")
-(def-boot-val |$false| NIL "???")
(def-boot-var |$forceDatabaseUpdate| "See load function.")
(def-boot-var |$form| "???")
(def-boot-var |$fromSpadTrace| "Interpreter>Trace.boot")
diff --git a/src/interp/pspad1.boot.pamphlet b/src/interp/pspad1.boot.pamphlet
index e130287c..408ff6f5 100644
--- a/src/interp/pspad1.boot.pamphlet
+++ b/src/interp/pspad1.boot.pamphlet
@@ -97,7 +97,6 @@ $renameAlist := '(
lisp2Boot x ==
--entry function
$fieldNames := nil
- $eltIfNil: local --changes NEW META to generate ELTs for infix dot
$pilesAreOkHere: local:= true
$commentsToPrint: local:= nil
$lineBuffer: local
diff --git a/src/interp/setq.lisp.pamphlet b/src/interp/setq.lisp.pamphlet
index aa3ceda3..55279fa9 100644
--- a/src/interp/setq.lisp.pamphlet
+++ b/src/interp/setq.lisp.pamphlet
@@ -347,8 +347,6 @@
;" used for )restore option of )trace."
(SETQ |$mathTraceList| NIL)
;" controls mathprint output for )trace."
-(SETQ |$domainTraceNameAssoc| NIL)
- ;"alist of traced domains"
(SETQ |$tracedMapSignatures| ())
(SETQ |$highlightAllowed| 'T)
;" used in BRIGHTPRINT and is a )set variable"
@@ -358,7 +356,6 @@
(SETQ |$mostRecentOpAlist| NIL)
(SETQ |$noEnv| NIL)
(SETQ |$opFilter| NIL) ;" used to |/s a function "
-(SETQ |$evalDomain| NIL)
(SETQ |$AnonymousFunction| '(|AnonymousFunction|))
(SETQ |$Any| '(|Any|))
@@ -379,7 +376,6 @@
(SETQ |$gauss01| '(|gauss| 0 1))
(SETQ |$form| NIL)
(SETQ |$Index| 0)
-(SETQ |$false| NIL)
(SETQ |$suffix| NIL)
(SETQ |$coerceIntByMapCounter| 0)
(SETQ |$reportCoerce| NIL)
diff --git a/src/interp/setvars.boot.pamphlet b/src/interp/setvars.boot.pamphlet
index 2f89c6d5..6d8394fb 100644
--- a/src/interp/setvars.boot.pamphlet
+++ b/src/interp/setvars.boot.pamphlet
@@ -81,7 +81,6 @@ resetWorkspaceVariables () ==
SETQ($existingFiles , MAKE_-HASHTABLE 'UEQUAL)
SETQ($functionTable , NIL)
SETQ($BOOT , NIL)
- SETQ($compileMapFlag , NIL)
SETQ($echoLineStack , NIL)
SETQ($operationNameList , NIL)
SETQ($slamFlag , NIL)
diff --git a/src/interp/spad.lisp.pamphlet b/src/interp/spad.lisp.pamphlet
index 849e397f..e37bb12e 100644
--- a/src/interp/spad.lisp.pamphlet
+++ b/src/interp/spad.lisp.pamphlet
@@ -359,14 +359,12 @@
(|$semanticErrorStack| ())
(|$warningStack| ())
(|$exitMode| |$EmptyMode|)
- (|$exitModeStack| ())
(|$returnMode| |$EmptyMode|)
(|$leaveMode| |$EmptyMode|)
(|$leaveLevelStack| ())
$TOP_LEVEL |$insideFunctorIfTrue| |$insideExpressionIfTrue|
|$insideCoerceInteractiveHardIfTrue| |$insideWhereIfTrue|
|$insideCategoryIfTrue| |$insideCapsuleFunctionIfTrue| |$form|
- (|$DomainFrame| '((NIL)))
(|$e| |$EmptyEnvironment|)
(|$genFVar| 0)
(|$genSDVar| 0)
@@ -374,6 +372,7 @@
(|$previousTime| (TEMPUS-FUGIT)))
(prog ((CURSTRM CUROUTSTREAM) |$s| |$x| |$m| u)
(declare (special CURSTRM |$s| |$x| |$m| CUROUTSTREAM))
+ (SETQ |$exitModeStack| ())
(SETQ $TRACEFLAG T)
(if (NOT X) (RETURN NIL))
(setq X (if $BOOT (DEF-RENAME (|new2OldLisp| X))
diff --git a/src/interp/sys-constants.boot b/src/interp/sys-constants.boot
index f518d045..ec399877 100644
--- a/src/interp/sys-constants.boot
+++ b/src/interp/sys-constants.boot
@@ -513,6 +513,9 @@ $One ==
$true ==
''T
+$false ==
+ false
+
++ Indicate absence of value
$NoValue ==
"$NoValue"
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index a46571fe..c7fa340a 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -93,3 +93,12 @@ $currentFunction := nil
++
$currentLine := nil
+
+++
+$domainTraceNameAssoc := []
+
+++
+$evalDomain := false
+
+++
+$exitModeStack := []