aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/ChangeLog10
-rw-r--r--src/interp/c-doc.boot2
-rw-r--r--src/interp/category.boot2
-rw-r--r--src/interp/define.boot10
-rw-r--r--src/interp/lisplib.boot31
-rw-r--r--src/interp/macros.lisp10
-rw-r--r--src/interp/postpar.boot14
-rw-r--r--src/interp/spad.lisp2
-rw-r--r--src/interp/sys-globals.boot3
-rw-r--r--src/interp/vmlisp.lisp34
-rw-r--r--src/interp/wi1.boot2
-rw-r--r--src/interp/wi2.boot1
12 files changed, 25 insertions, 96 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2572d0a2..2a942da0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-03 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * interp/postpar.boot (postcheckTarget): Likewise.
+ (isPackageType): Likewise.
+ * interp/lisplib.boot (getSlotFromDomain): Remove.
+ * interp/macros.lisp (|saySpadMsg|): Remove.
+ * interp/vmlisp.lisp (qsetq): Remove.
+ (STATEP, FUNARGP, PAPPP): Likewise.
+ (LISTOFQUOTES, LISTOFFREES): Likewise.
+
2008-11-02 Gabriel Dos Reis <gdr@cs.tamu.edu>
* algebra/syntax.spad.pamphlet (Syntax): Print syntax objects as
diff --git a/src/interp/c-doc.boot b/src/interp/c-doc.boot
index 811a6db3..3d1c448b 100644
--- a/src/interp/c-doc.boot
+++ b/src/interp/c-doc.boot
@@ -208,7 +208,7 @@ transDocList($constructorName,doclist) == --returns ((key line)...)
transDoc(conname,doclist) ==
--$exposeFlag and not isExposedConstructor conname => nil
--skip over unexposed constructors when checking system files
- $x: local
+ $x: local := nil
rlist := REVERSE doclist
for [$x,:lines] in rlist repeat
$attribute? : local := $x is [.,[key]] and key = 'attribute
diff --git a/src/interp/category.boot b/src/interp/category.boot
index d9250a22..63e42c75 100644
--- a/src/interp/category.boot
+++ b/src/interp/category.boot
@@ -408,7 +408,7 @@ DescendantP(a,b) ==
--% The implementation of Join
JoinInner(l,$e) ==
- $NewCatVec: local
+ $NewCatVec: local := nil
CondList:= nil
for u in l repeat
for at in u.2 repeat
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 4166b0f9..5a88447a 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -113,7 +113,6 @@ makePredicate l ==
compDefine: (%Form,%Mode,%Env) -> %Maybe %Triple
compDefine(form,m,e) ==
- $tripleHits: local:= 0
$macroIfTrue: local := false
$packagesUsed: local := false
compDefine1(form,m,e)
@@ -351,9 +350,7 @@ compDefineCategory2(form,signature,specialCases,body,m,e,
$prefix,$formalArgList) ==
--1. bind global variables
$insideCategoryIfTrue: local:= true
- $TOP__LEVEL: local := nil
- $definition: local := form
- --used by DomainSubstitutionFunction
+ $definition: local := form --used by DomainSubstitutionFunction
$form: local := nil
$op: local := nil
$extraParms: local := nil
@@ -442,7 +439,7 @@ mkConstructor form ==
['LIST,MKQ first form,:[mkConstructor x for x in rest form]]
compDefineCategory(df,m,e,prefix,fal) ==
- $domainShell: local -- holds the category of the object being compiled
+ $domainShell: local := nil -- holds the category of the object being compiled
$lisplibCategory: local := nil
-- since we have so many ways to say state the kind of a constructor,
-- make sure we do have some minimal internal coherence.
@@ -502,7 +499,6 @@ compDefineFunctor1(df is ['DEF,form,signature,$functorSpecialCases,body],
$insideFunctorIfTrue: local:= true
$functorsUsed: local := nil --not currently used, finds dependent functors
$setelt: local := "setShellEntry"
- $TOP__LEVEL: local := nil
$genSDVar: local:= 0
originale:= $e
[$op,:argl]:= form
@@ -1405,7 +1401,6 @@ processFunctor(form,signature,data,localParList,e) ==
buildFunctor(form,signature,data,localParList,e)
compCapsuleItems(itemlist,$predl,$e) ==
- $TOP__LEVEL: local := nil
$myFunctorBody :local := nil ---needed for translator
$signatureOfForm: local := nil
$suffix: local:= 0
@@ -1588,7 +1583,6 @@ makeCategoryForm(c,e) ==
compCategory: (%Form,%Mode,%Env) -> %Maybe %Triple
compCategory(x,m,e) ==
- $TOP__LEVEL: local:= true
clearExportsTable()
(m:= resolve(m,$Category))=$Category and x is ['CATEGORY,
domainOrPackage,:l] =>
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index 9bacec93..4d614d81 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -347,6 +347,8 @@ compDefineLisplib(df:=["DEF",[op,:.],:.],m,e,prefix,fal,fn) ==
$lisplibModemapAlist: local := NIL
$lisplibSlot1 : local := NIL -- used by NRT mechanisms
$lisplibOperationAlist: local := NIL
+ $lisplibOpAlist: local := nil --operations alist for new runtime system
+ $lisplibSignatureAlist: local := nil
$lisplibSuperDomain: local := NIL
$libFile: local := NIL
$lisplibVariableAlist: local := NIL
@@ -404,20 +406,8 @@ getLisplibVersion libName ==
initializeLisplib libName ==
_$ERASE(libName,'ERRORLIB,$libraryDirectory)
resetErrorCount()
- $libFile:= writeLib1(libName,'ERRORLIB,$libraryDirectory)
+ $libFile := writeLib1(libName,'ERRORLIB,$libraryDirectory)
ADDOPTIONS('FILE,$libFile)
- $lisplibForm := nil --defining form for lisplib
- $lisplibModemap := nil --modemap for constructor form
- $lisplibKind := nil --category, domain, or package
- $lisplibModemapAlist := nil --changed in "augmentLisplibModemapsFromCategory"
- $lisplibAbbreviation := nil
- $lisplibAncestors := nil
- $lisplibOpAlist := nil --operations alist for new runtime system
- $lisplibOperationAlist := nil --old list of operations for functor/package
- $lisplibSuperDomain:= nil
- -- next var changed in "augmentLisplibDependents"
- $lisplibVariableAlist := nil --this and the next are used by "luke"
- $lisplibSignatureAlist := nil
if pathnameTypeId(_/EDITFILE) = 'SPAD
then LAM_,FILEACTQ('VERSION,['_/VERSIONCHECK,_/MAJOR_-VERSION])
@@ -572,21 +562,6 @@ sayNonUnique x ==
-- --new form is (<op> <signature> <slotNumber> <condition> <kind>)
-- [:[[op,:x] for x in y] for [op,:y] in operationAlist]
-getSlotFromDomain(dom,op,oldSig) ==
- -- returns the slot number in the domain where the function whose
- -- signature is oldSig may be found in the domain dom
- oldSig:= removeOPT oldSig
- dom:= removeOPT dom
- sig:= SUBST("$",dom,oldSig)
- loadIfNecessary first dom
- isPackageForm dom => getSlotFromPackage(dom,op,oldSig)
- domain:= evalDomain dom
- n:= findConstructorSlotNumber(dom,domain,op,sig) =>
- (slot:= domain.n).0 = function Undef =>
- throwKeyedMsg("S2IL0023A",[op,formatSignature sig,dom])
- slot
- throwKeyedMsg("S2IL0024A",[op,formatSignature sig,dom])
-
findConstructorSlotNumber(domainForm,domain,op,sig) ==
null domain.1 => getSlotNumberFromOperationAlist(domainForm,op,sig)
sayMSG ['" using slot 1 of ",domainForm]
diff --git a/src/interp/macros.lisp b/src/interp/macros.lisp
index f8e69b67..3426d93a 100644
--- a/src/interp/macros.lisp
+++ b/src/interp/macros.lisp
@@ -431,9 +431,6 @@
(TERPRI out)
(force-output out))))
-(defun |saySpadMsg| (X)
- (if (NULL X) NIL (sayBrightly1 X |$algebraOutputStream|)))
-
(defun |sayALGEBRA| (X) "Prints on Algebra output stream."
(if (NULL X) NIL (sayBrightly1 X |$algebraOutputStream|)))
@@ -467,8 +464,11 @@
(DEFUN BLANKS (N &optional (stream |$OutputStream|))
"Print N blanks."
- (do ((i 1 (the fixnum(1+ i))))
- ((> i N))(declare (fixnum i n)) (princ " " stream)))
+ (declare (fixnum N))
+ (do ((i 1 (the fixnum(1+ i))))
+ ((> i N))
+ (declare (fixnum i))
+ (princ " " stream)))
; 23 FILE SYSTEM INTERFACE
diff --git a/src/interp/postpar.boot b/src/interp/postpar.boot
index 23411ef5..7706a257 100644
--- a/src/interp/postpar.boot
+++ b/src/interp/postpar.boot
@@ -553,7 +553,8 @@ postcheck: %ParseTree -> %ParseForm
postcheck x ==
atom x => nil
x is ["DEF",form,[target,:.],:.] =>
- (setDefOp form; postcheckTarget target; postcheck rest rest x)
+ setDefOp form
+ postcheck rest rest x
x is ["QUOTE",:.] => nil
postcheck first x
postcheck rest x
@@ -564,17 +565,6 @@ setDefOp f ==
f := (atom f => f; first f)
if $topOp then $defOp:= f else $topOp:= f
-postcheckTarget: %ParseForm -> %Thing
-postcheckTarget x ==
- -- doesn't seem that useful!
- isPackageType x => nil
- x is ["Join",:.] => nil
- NIL
-
-isPackageType: %ParseForm -> %Boolean
-isPackageType x ==
- not CONTAINED("$",x)
-
unComma: %ParseForm -> %ParseForm
unComma x ==
x is ["%Comma",:y] => y
diff --git a/src/interp/spad.lisp b/src/interp/spad.lisp
index e50af9c6..31785bc2 100644
--- a/src/interp/spad.lisp
+++ b/src/interp/spad.lisp
@@ -291,7 +291,7 @@
(|$warningStack| ())
(|$returnMode| |$EmptyMode|)
(|$leaveLevelStack| ())
- $TOP_LEVEL |$insideFunctorIfTrue| |$insideExpressionIfTrue|
+ |$insideFunctorIfTrue| |$insideExpressionIfTrue|
|$insideCoerceInteractiveHardIfTrue| |$insideWhereIfTrue|
|$insideCategoryIfTrue| |$insideCapsuleFunctionIfTrue| |$form|
(|$e| |$EmptyEnvironment|)
diff --git a/src/interp/sys-globals.boot b/src/interp/sys-globals.boot
index 780a0455..07195934 100644
--- a/src/interp/sys-globals.boot
+++ b/src/interp/sys-globals.boot
@@ -252,9 +252,6 @@ $topOp := nil
$streamCount := 0
++
-$TOP__LEVEL := true
-
-++
$TOKSTACK := nil
++
diff --git a/src/interp/vmlisp.lisp b/src/interp/vmlisp.lisp
index 52c4ed4c..d08e6001 100644
--- a/src/interp/vmlisp.lisp
+++ b/src/interp/vmlisp.lisp
@@ -381,10 +381,6 @@
(defmacro qsdifference (x y)
`(the fixnum (- (the fixnum ,x) (the fixnum ,y))))
-(defmacro qsetq (&whole form pattern exp)
- (declare (ignore form))
- `(,(dcqexp pattern '=) ,exp))
-
(defmacro qsetrefv (vec ind val)
`(setf (svref ,vec (the fixnum ,ind)) ,val))
@@ -484,7 +480,6 @@
`(setf (elt ,vec ,ind) ,val))
(defmacro setqp (&whole form pattern exp)
- (declare (ignore form))
`(,(dcqexp pattern '=) ,exp))
(defmacro seq (&rest form)
@@ -1795,16 +1790,6 @@
(defun |read-line| (st &optional (eofval *read-place-holder*))
(read-line st nil eofval))
-(defun STATEP (item)
- (declare (ignore item))
- nil) ;no state objects
-(defun FUNARGP (item)
- (declare (ignore item))
- nil) ;can't tell closures from other functions
-(defun PAPPP (item)
- (declare (ignore item))
- nil) ;no partial application objects
-
#+Lucid
(defun gcmsg (x)
(prog1 (not system::*gc-silence*) (setq system::*gc-silence* (not x))))
@@ -1873,25 +1858,6 @@
(declare (ignore l c))
n)))
-(defun LISTOFQUOTES (bpi)
- (declare (ignore bpi))
- ())
-
-#+Lucid
-(defun LISTOFFREES (bpi)
- (if (compiled-function-p bpi)
- (let ((end (- (lucid::procedure-length bpi) 2)))
- (do ((i 3 (1+ i))
- (ans nil))
- ((> i end) ans)
- (let ((locexp (svref bpi i)))
- (if (symbolp locexp) (push locexp ans)))))))
-
-#-Lucid
-(defun LISTOFFREES (bpi)
- (declare (ignore bpi))
- ())
-
(defun RE-ENABLE-INT (number-of-handler) number-of-handler)
diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot
index 29ea264e..f711677d 100644
--- a/src/interp/wi1.boot
+++ b/src/interp/wi1.boot
@@ -1065,7 +1065,6 @@ compNot([op,arg], pWas, m, e) ==
coerce(markAny('compNot, pWas, [["NOT",x],$Boolean,ei]),m)
compDefine(form,m,e) ==
- $tripleHits: local:= 0
$macroIfTrue: local
$packagesUsed: local
['DEF,.,originalSignature,.,body] := form
@@ -1165,7 +1164,6 @@ compDefineCategory2(form,signature,specialCases,body,m,e,
$prefix,$formalArgList) ==
--1. bind global variables
$insideCategoryIfTrue: local:= true
- $TOP__LEVEL: local := nil
$definition: local := nil
--used by DomainSubstitutionFunction
$form: local := nil
diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot
index 38ab1339..421223fc 100644
--- a/src/interp/wi2.boot
+++ b/src/interp/wi2.boot
@@ -80,7 +80,6 @@ compDefineFunctor1(df, m,$e,$prefix,$formalArgList) ==
$insideFunctorIfTrue: local:= true
$functorsUsed: local := nil --not currently used, finds dependent functors
$setelt: local := "setShellEntry"
- $TOP__LEVEL: local := nil
$genSDVar: local:= 0
originale:= $e
[$op,:argl]:= form
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-10 11:43:47 +0000