aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2013-05-29 04:31:43 +0000
committerdos-reis <gdr@axiomatics.org>2013-05-29 04:31:43 +0000
commitebb11deb4ae269704cb19bc64714a862497a8eb6 (patch)
tree0efff25cdfe8c751e56d7b2cb8f7c6b6fe0af2a4
parent8ee5eef95e60e0e97e5f14a92b8eb5c8c517c9ab (diff)
downloadopen-axiom-ebb11deb4ae269704cb19bc64714a862497a8eb6.tar.gz
Misc cleanups.
Diffstat
-rw-r--r--src/interp/c-util.boot9
-rw-r--r--src/interp/debug.lisp4
-rw-r--r--src/interp/define.boot8
-rw-r--r--src/interp/ht-util.boot1
-rw-r--r--src/interp/i-syscmd.boot1
-rw-r--r--src/interp/int-top.boot1
-rw-r--r--src/interp/lexing.boot3
-rw-r--r--src/interp/lisp-backend.boot2
-rw-r--r--src/interp/server.boot2
-rw-r--r--src/interp/setvars.boot1
-rw-r--r--src/interp/slam.boot2
-rw-r--r--src/interp/spad-parser.boot3
-rw-r--r--src/interp/spad.lisp5
-rw-r--r--src/interp/sys-driver.boot1
-rw-r--r--src/interp/sys-globals.boot13
-rw-r--r--src/interp/sys-macros.lisp4
-rw-r--r--src/interp/vmlisp.lisp2
17 files changed, 17 insertions, 45 deletions
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index 2ad1bd00..0eaf1ad9 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -1595,15 +1595,6 @@ noteSpecialVariable x ==
--%
-compileFileQuietly path ==
- quietlyIfInteractive COMPILE_-FILE path
-
-++ Subroutine of compileConstructor1. Called to compile the body
-++ of a category constructor definition.
-compAndDefine l ==
- _*COMP370_-APPLY_* := function evalAndPrintBackendDecl
- backendCompile l
-
$compileDontDefineFunctions := true
--%
diff --git a/src/interp/debug.lisp b/src/interp/debug.lisp
index 92e88a3d..cae598bf 100644
--- a/src/interp/debug.lisp
+++ b/src/interp/debug.lisp
@@ -157,8 +157,8 @@
METAKEYLST DEFINITION_NAME (|$sourceFileTypes| '(|spad| |boot| |lisp| |lsp| |meta|))
($FUNCTION FN) $NEWSPAD $LINESTACK $LINENUMBER STACK STACKX BACK OK
TRAPFLAG |$InteractiveMode| COLUMN *QUERY LINE
- (*COMP370-APPLY* (if (eq op 'define) #'eval-defun #'compile-defun)))
- (declare (special |$Echo| SINGLINEMODE INPUTSTREAM
+ (|$backend| (if (eq op 'define) #'eval-defun #'compile-defun)))
+ (declare (special |$Echo| SINGLINEMODE INPUTSTREAM |$backend|
SPADERRORSTREAM ISID NBLNK COMMENTCHR /SOURCEFILES
METAKEYLST DEFINITION_NAME |$sourceFileTypes|
$FUNCTION $NEWSPAD $LINESTACK $LINENUMBER STACK STACKX BACK OK
diff --git a/src/interp/define.boot b/src/interp/define.boot
index ff3789aa..62dce91b 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -2151,11 +2151,17 @@ compileConstructor1(db,form:=[fn,[key,vl,:bodyl]]) ==
-- we will cache all of its values on $ConstructorCache with reference
-- counts
dbConstructorKind db = 'category =>
- first compAndDefine [[fn,['%slam,vl,:bodyl]]]
+ first compAndDefine(db,[[fn,['%slam,vl,:bodyl]]])
dbInstanceCache db = nil =>
first backendCompile [[fn,['%lambda,vl,:bodyl]]]
compHash(db,fn,vl,bodyl)
+++ Subroutine of compileConstructor1. Called to compile the body
+++ of a category constructor definition.
+compAndDefine(db,l) ==
+ $backend: local := function evalAndPrintBackendDecl
+ backendCompile l
+
compHash(db,op,argl,body) ==
-- Entries will be stored on the global hashtable in a uniform way:
-- (<argument list>, <reference count>,:<value>)
diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot
index 1d8b75f2..a24c1cb3 100644
--- a/src/interp/ht-util.boot
+++ b/src/interp/ht-util.boot
@@ -516,7 +516,6 @@ condErrorMsg type ==
parseAndEval string ==
$InteractiveMode: local := true
- $SPAD: local := true
$e: local := $InteractiveFrame
$QuietCommand: local := true
parseAndEval1 string
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 190121d2..ccc2976d 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -499,7 +499,6 @@ compileSpadLispCmd args ==
lsp := fnameMake(pathnameDirectory path, pathnameName path, pathnameType path)
if fnameReadable?(lsp) then
if not beQuiet then sayKeyedMsg("S2IZ0089", [namestring lsp])
- --compileFileQuietly(lsp)
RECOMPILE_-LIB_-FILE_-IF_-NECESSARY lsp
else
sayKeyedMsg("S2IL0003", [namestring lsp])
diff --git a/src/interp/int-top.boot b/src/interp/int-top.boot
index df17fb36..4a74a8ff 100644
--- a/src/interp/int-top.boot
+++ b/src/interp/int-top.boot
@@ -87,7 +87,6 @@ ncTopLevel() ==
-- the Bill Burge's parser.
$InteractiveMode: local := true
$NEWSPAD: local := true
- $SPAD: local := true
$e: local := $InteractiveFrame
ncIntLoop()
diff --git a/src/interp/lexing.boot b/src/interp/lexing.boot
index 9e6ffe39..9cee8ad5 100644
--- a/src/interp/lexing.boot
+++ b/src/interp/lexing.boot
@@ -530,5 +530,4 @@ ioClear! rd ==
lineClear! readerSourceLine rd
tokenStackClear!()
reduceStackClear()
- $SPAD => nextLinesClear!()
- nil
+ nextLinesClear!()
diff --git a/src/interp/lisp-backend.boot b/src/interp/lisp-backend.boot
index e7b9abaf..fddaabcd 100644
--- a/src/interp/lisp-backend.boot
+++ b/src/interp/lisp-backend.boot
@@ -772,7 +772,7 @@ eval x ==
compileLispDefinition(name,def) ==
- _*COMP370_-APPLY_* ~= nil => apply(_*COMP370_-APPLY_*,name,def,nil)
+ $backend ~= nil => apply($backend,name,def,nil)
nil
++ Return true if `parms' is the empty list
diff --git a/src/interp/server.boot b/src/interp/server.boot
index 0b206263..e3aba16a 100644
--- a/src/interp/server.boot
+++ b/src/interp/server.boot
@@ -100,7 +100,6 @@ serverReadLine(stream) ==
parseAndInterpret str ==
$InteractiveMode : local := true
- $SPAD: local := true
$e: local := $InteractiveFrame
ncParseAndInterpretString str
@@ -145,7 +144,6 @@ parseAndInterpToString str ==
parseAndEvalStr string ==
$InteractiveMode: local := true
- $SPAD: local := true
$e: local := $InteractiveFrame
parseAndEvalStr1 string
diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot
index b89a8798..cd21c3a1 100644
--- a/src/interp/setvars.boot
+++ b/src/interp/setvars.boot
@@ -148,7 +148,6 @@ resetWorkspaceVariables() ==
SETQ($existingFiles , hashTable 'EQUAL)
SETQ($functionTable , nil)
SETQ($echoLineStack , nil)
- SETQ($slamFlag , nil)
SETQ($CommandSynonymAlist , copyTree($InitialCommandSynonymAlist))
SETQ($UserAbbreviationsAlist , nil)
SETQ($msgDatabase , nil)
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index 16cd8bcb..d854a76d 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -404,7 +404,7 @@ compileInteractive fn ==
++ Subroutine of compileInteractive.
compQuietly fn ==
- _*COMP370_-APPLY_*: local :=
+ $backend: local :=
$compileDontDefineFunctions => "COMPILE-DEFUN"
"EVAL-DEFUN"
quietlyIfInteractive backendCompile fn
diff --git a/src/interp/spad-parser.boot b/src/interp/spad-parser.boot
index 4db1d4bc..5ded2a11 100644
--- a/src/interp/spad-parser.boot
+++ b/src/interp/spad-parser.boot
@@ -1060,6 +1060,8 @@ translateSpad x ==
$e: local := $EmptyEnvironment
$genSDVar: local := 0
$previousTime: local := TEMPUS_-FUGIT()
+ $compilerOptions: local := nil
+ $backend: local := function printBackendDecl
compileParseTree x
--%
@@ -1071,7 +1073,6 @@ translateSpad x ==
++ ??? meaningful. Eventually this code will go away when we
++ ??? finally use the new parser everwhere.
parseSpadFile sourceFile ==
- $SPAD: local := true -- we are parsing Spad,
FILE_-CLOSED : local := false -- current stream closed?
try
-- noise to standard output
diff --git a/src/interp/spad.lisp b/src/interp/spad.lisp
index 4e8eab08..22e01ef0 100644
--- a/src/interp/spad.lisp
+++ b/src/interp/spad.lisp
@@ -66,12 +66,9 @@
(defun spad (ifile
&aux
- (*comp370-apply* (function |printBackendDecl|))
- ($SPAD T)
- (|$compilerOptions| nil)
(|$editFile| ifile)
rd)
- (declare (special |$Echo| |$editFile| *comp370-apply*))
+ (declare (special |$Echo| |$editFile|))
(setq |$InteractiveMode| nil)
;; only rebind |$InteractiveFrame| if compiling
(progv (if (not |$InteractiveMode|) '(|$InteractiveFrame|))
diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot
index d8f3ed37..0ab72349 100644
--- a/src/interp/sys-driver.boot
+++ b/src/interp/sys-driver.boot
@@ -200,7 +200,6 @@ initializeGlobalState() ==
$IOindex := 1
$currentLine := nil
$NEWSPAD := true
- $SPAD := true
$buildingSystemAlgebra := getOptionValue "system-algebra"
$verbose := getOptionValue "verbose"
$bootStrapMode := getOptionValue "bootstrap"
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index a7090579..53551ae3 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -206,9 +206,6 @@ $FUNNAME := nil
$FUNNAME__TAIL := '(())
++
-$LASTPREFIX := '"S_:"
-
-++
$LINESTACK := "BEGIN__UNIT"
++
@@ -218,9 +215,6 @@ $MAXLINENUMBER := 0
$OLDLINE := nil
++
-$SPAD := false
-
-++
$PrintOnly := false
++
@@ -240,10 +234,6 @@ $SetFunctions := nil
++
++ FIXME: Eventually remove.
-$slamFlag := false
-
-++
-++ FIXME: Eventually remove.
$sourceFileTypes := ["SPAD"]
++
@@ -272,9 +262,6 @@ $TRACELETFLAG := false
$NEWSPAD := false
++
-$BOOT := false
-
-++
$insideCoerceInteractive := false
++
diff --git a/src/interp/sys-macros.lisp b/src/interp/sys-macros.lisp
index 07eb99b2..f73cc080 100644
--- a/src/interp/sys-macros.lisp
+++ b/src/interp/sys-macros.lisp
@@ -87,7 +87,7 @@
`(CONS |$BFtag| (CONS ,MT ,EP)))
(defun MAKE-FLOAT (int frac fraclen exp)
- (if (AND $SPAD |$useBFasDefault|)
+ (if |$useBFasDefault|
(if (= frac 0)
(MAKE-BF int exp)
(MAKE-BF (+ (* int (expt 10 fraclen)) frac)
@@ -911,7 +911,7 @@
(defmacro SPADDO (&rest OL)
(PROG (VARS L VL V U INITS U-VARS U-VALS ENDTEST EXITFORMS BODYFORMS)
- (if (OR $BOOT (NOT $NEWSPAD))
+ (if (NOT $NEWSPAD)
(return (CONS 'DO OL)))
(SETQ L (COPY-LIST OL))
(if (OR (ATOM L) (ATOM (CDR L)))
diff --git a/src/interp/vmlisp.lisp b/src/interp/vmlisp.lisp
index 0e7b339a..49c58494 100644
--- a/src/interp/vmlisp.lisp
+++ b/src/interp/vmlisp.lisp
@@ -51,8 +51,6 @@
;; DEFVARS
-(defvar *comp370-apply* nil "function (name def) for comp370 to apply")
-
(defvar *embedded-functions* nil)
(defvar macerrorcount 0 "Put some documentation in here someday")
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-03 00:57:30 +0000