aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/ax.boot2
-rw-r--r--src/interp/br-op2.boot2
-rw-r--r--src/interp/c-util.boot6
-rw-r--r--src/interp/category.boot31
-rw-r--r--src/interp/compiler.boot4
-rw-r--r--src/interp/database.boot4
-rw-r--r--src/interp/define.boot2
-rw-r--r--src/interp/format.boot4
-rw-r--r--src/interp/fortcall.boot2
-rw-r--r--src/interp/functor.boot13
-rw-r--r--src/interp/i-coerfn.boot2
-rw-r--r--src/interp/i-map.boot4
-rw-r--r--src/interp/i-output.boot6
-rw-r--r--src/interp/i-special.boot2
-rw-r--r--src/interp/i-syscmd.boot2
-rw-r--r--src/interp/interop.boot2
-rw-r--r--src/interp/lisplib.boot2
-rw-r--r--src/interp/modemap.boot4
-rw-r--r--src/interp/newfort.boot2
-rw-r--r--src/interp/patches.lisp6
-rw-r--r--src/interp/setvars.boot6
-rw-r--r--src/interp/simpbool.boot2
-rw-r--r--src/interp/trace.boot8
23 files changed, 58 insertions, 60 deletions
diff --git a/src/interp/ax.boot b/src/interp/ax.boot
index efd54a99..beca359f 100644
--- a/src/interp/ax.boot
+++ b/src/interp/ax.boot
@@ -157,7 +157,7 @@ axFormatDecl(sym, type) ==
['Declare, sym, axFormatType type]
makeTypeSequence l ==
- ['Sequence,: delete('Type, l)]
+ ['Sequence,: removeSymbol(l,'Type)]
axFormatAttrib(typeform) ==
atom typeform => typeform
diff --git a/src/interp/br-op2.boot b/src/interp/br-op2.boot
index a7f186e9..452a4abc 100644
--- a/src/interp/br-op2.boot
+++ b/src/interp/br-op2.boot
@@ -187,7 +187,7 @@ dbChooseOperandName(typ) ==
member(y,$ElementList) => y
first $ElementList
first $ElementList
- $ElementList := delete(x,$ElementList)
+ $ElementList := remove($ElementList,x)
x
x := first $DomainList
$DomainList := rest $DomainList
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index df690293..c1a7b4f3 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -481,11 +481,11 @@ getInverseEnvironment(a,e) ==
--the next two lines are necessary to get 3-branched Unions to work
-- old-style unions, that is
(get(x,"condition",e) is [["OR",:oldpred]]) and listMember?(a,oldpred) =>
- put(x,"condition",[MKPF(delete(a,oldpred),"OR")],e)
+ put(x,"condition",[MKPF(remove(oldpred,a),"OR")],e)
unionProperty(x,e) is ['UnionCategory,:l] =>
- l':= delete(m,l)
+ l' := remove(l,m)
for u in l' repeat
- if u is ['_:,=m,:.] then l':= delete(u,l')
+ if u is ['_:,=m,:.] then l' := remove(l',u)
newpred:= MKPF([["case",x,m'] for m' in l'],"OR")
put(x,"condition",[newpred,:get(x,"condition",e)],e)
e
diff --git a/src/interp/category.boot b/src/interp/category.boot
index 07447181..3802a809 100644
--- a/src/interp/category.boot
+++ b/src/interp/category.boot
@@ -128,7 +128,7 @@ mkCategory(domainOrPackage,sigList,attList,domList,PrincipalAncestor) ==
-- Remove possible duplicate local domain caches.
if PrincipalAncestor then
for u in (OldLocals:= third PrincipalAncestor.4) repeat
- NewLocals := delete(first u,NewLocals)
+ NewLocals := remove(NewLocals,first u)
-- New local domains caches are hosted in slots at the end onward
for u in NewLocals repeat
OldLocals := [[u,:count],:OldLocals]
@@ -168,13 +168,13 @@ SigListUnion(extra,original) ==
[[xfn,xsig,:.],xpred,:.] := x
symbolEq?(xfn,ofn) and xsig = osig =>
--checking name and signature, but not a 'constant' marker
- xpred = opred => extra:= delete(x,extra)
+ xpred = opred => extra := remove(extra,x)
--same signature and same predicate
- opred = true => extra:= delete(x,extra)
+ opred = true => extra := remove(extra,x)
-- PRETTYPRINT ("we ought to subsume",x,o)
not MachineLevelSubsume(first o,first x) =>
'"Source level subsumption not implemented"
- extra:= delete(x,extra)
+ extra := remove(extra,x)
for e in extra repeat
[esig,epred,:.]:= e
eimplem:=[]
@@ -184,7 +184,7 @@ SigListUnion(extra,original) ==
--systemError '"Source level subsumption not implemented"
original:= [e,:original]
return nil -- this exits from the innermost for loop
- original:= delete(x,original)
+ original := remove(original,x)
[xsig,xpred,:ximplem]:= x
-- if xsig ~= esig then -- not quite strong enough
if first xsig ~= first esig or second xsig ~= second esig then
@@ -240,7 +240,7 @@ mkOr2(a,b) ==
for c in b | c is ["has",=avar,ccat] repeat
DescendantP(acat,ccat) =>
return (aRedundant:=true)
- if DescendantP(ccat,acat) then b := delete(c,b)
+ if DescendantP(ccat,acat) then b := remove(b,c)
aRedundant => b
[a,:b]
[a,:b]
@@ -272,7 +272,7 @@ mkAnd2(a,b) ==
for c in b | c is ["has",=avar,ccat] repeat
DescendantP(ccat,acat) =>
return (aRedundant:=true)
- if DescendantP(acat,ccat) then b := delete(c,b)
+ if DescendantP(acat,ccat) then b := remove(b,c)
aRedundant => b
[a,:b]
[a,:b]
@@ -334,16 +334,17 @@ FindFundAncs l ==
for u in FindFundAncs [[CatEval first x,mkAnd(CADAR l,second x)]
for x in second f1.4] repeat
x:= ASSQ(first u,ans) =>
- ans:= [[first u,mkOr(second x,second u)],:delete(x,ans)]
+ ans:= [[first u,mkOr(second x,second u)],:remove(ans,x)]
ans:= [u,:ans]
--testing to see if first l is already there
- x:= ASSQ(CAAR l,ans) => [[CAAR l,mkOr(CADAR l,second x)],:delete(x,ans)]
+ x:= ASSQ(CAAR l,ans) => [[CAAR l,mkOr(CADAR l,second x)],:remove(ans,x)]
CADAR l=true =>
- for x in first f1.4 repeat if y:= ASSQ(CatEval x,ans) then ans:= delete(y,ans)
+ for x in first f1.4 repeat
+ if y:= ASSQ(CatEval x,ans) then ans := remove(ans,y)
[first l,:ans]
for x in first f1.4 repeat
if y:= ASSQ(CatEval x,ans) then ans:=
- [[first y,mkOr(CADAR l,second y)],:delete(y,ans)]
+ [[first y,mkOr(CADAR l,second y)],:remove(ans,y)]
[first l,:ans]
-- Our new thing may have, as an alternate view, a principal
-- descendant of something previously added which is therefore
@@ -462,7 +463,7 @@ JoinInner(l,$e) ==
then FundamentalAncestors:=
-- the new 'b' is more often true than the old one 'anc'
- [[bname,condition,ancindex],:delete(anc,FundamentalAncestors)]
+ [[bname,condition,ancindex],:remove(FundamentalAncestors,anc)]
else
if ancindex and (PredImplies(anccond,condition); true)
-- I have no idea who effectively commented out the predImplies
@@ -487,14 +488,14 @@ JoinInner(l,$e) ==
reallynew:= nil
objectMember?(b,l) =>
--objectMember? since category vectors are guaranteed unique
- (sigl:= $NewCatVec.1; attl:= $NewCatVec.2; l:= delete(b,l))
+ (sigl:= $NewCatVec.1; attl:= $NewCatVec.2; l:= remove(l,b))
-- SAY("domain ",bname," subsumes")
-- SAY("adding a conditional domain ",
-- bname,
-- " replacing",
-- first anc)
bCond:= ASSQ(b,CondList)
- CondList:= delete(bCond,CondList)
+ CondList := remove(CondList,bCond)
-- value of bCond not used and could be NIL
-- bCond:= second bCond
globalDomains:= $NewCatVec.5
@@ -542,7 +543,7 @@ JoinInner(l,$e) ==
second u=true => [[first u,newpred],:attl]
[[first u,["and",newpred,second u]],:attl]
second v=true => nil
- attl:= delete(v,attl)
+ attl:= remove(attl,v)
attl:=
second u=true => [[first u,mkOr(second v,newpred)],:attl]
[[first u,mkOr(second v,mkAnd(newpred,second u))],:attl]
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index 508248a9..afe8a03d 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -1846,8 +1846,8 @@ modeEqual(x,y) ==
for x1 in xl repeat
for y1 in yl repeat
modeEqual(x1,y1) =>
- xl := delete(x1,xl)
- yl := delete(y1,yl)
+ xl := remove(xl,x1)
+ yl := remove(yl,y1)
return nil
xl or yl => nil
true
diff --git a/src/interp/database.boot b/src/interp/database.boot
index 6d6409d2..144a27e6 100644
--- a/src/interp/database.boot
+++ b/src/interp/database.boot
@@ -299,7 +299,7 @@ orderPredTran(oldList,sig,skip) ==
((pred is [op,pvar,.] and op in '(isDomain ofCategory)
and pvar=first sig and not (pvar in rest sig)) or
(not skip and pred is ['isDomain,pvar,.] and pvar="*1")) =>
- oldList:=delete(pred,oldList)
+ oldList := remove(oldList,pred)
lastPreds:=[pred,:lastPreds]
--sayBrightlyNT "lastPreds="
--pp lastPreds
@@ -328,7 +328,7 @@ orderPredTran(oldList,sig,skip) ==
and INTERSECTIONQ(indepvl,lastDependList) =>
somethingDone := true
lastPreds := [:lastPreds,x]
- oldList := delete(x,oldList)
+ oldList := remove(oldList,x)
--if somethingDone then
-- sayBrightlyNT "Again lastPreds="
-- pp lastPreds
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 0d5ea4c9..9d2e41bf 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -1222,7 +1222,7 @@ compDefWhereClause(['DEF,form,signature,specialCases,body],m,e) ==
[[x,:dependencies] for [x,:y] in argSigAlist] where
dependencies() ==
union(listOfIdentifiersIn y,
- delete(x,listOfIdentifiersIn LASSOC(x,$predAlist)))
+ remove(listOfIdentifiersIn LASSOC(x,$predAlist),x))
argSigAlist := [:$sigAlist,:pairList(argList,sigList)]
-- 4. construct a WhereList which declares and/or defines the xi's in
diff --git a/src/interp/format.boot b/src/interp/format.boot
index 57b35ad0..b5cefe7d 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -107,7 +107,7 @@ findSubstitutionOrder? alist == fn(alist,nil) where
fn(alist,res) ==
null alist => reverse! res
choice := or/[x for (x:=[a,:b]) in alist | null containedRight(a,alist)] =>
- fn(delete(choice,alist),[choice,:res])
+ fn(remove(alist,choice),[choice,:res])
nil
containedRight(x,alist)== or/[CONTAINED(x,y) for [.,:y] in alist]
@@ -120,7 +120,7 @@ removeIsDomainD pred ==
for p in preds while not D repeat
p is ['isDomain,'D,D1] =>
D := D1
- npreds := delete(['isDomain,'D,D1],preds)
+ npreds := remove(preds,['isDomain,'D,D1])
D =>
1 = #npreds => [D,first npreds]
[D,['AND,:npreds]]
diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot
index 5f7096d6..85d2eaa7 100644
--- a/src/interp/fortcall.boot
+++ b/src/interp/fortcall.boot
@@ -311,7 +311,7 @@ makeSpadFun(name,userArgs,args,dummies,decls,results,returnType,asps,aspInfo,
fargNames := [makeSymbol strconc(STRINGIMAGE(u),'"__arg") for u in args |
not (symbolMember?(u,dummies) or symbolMember?(u,asps)) ]
for u in asps repeat
- fargNames := delete(makeSymbol strconc(STRINGIMAGE(u),'"__arg"),fargNames)
+ fargNames := removeSymbol(fargNames,makeSymbol strconc(STRINGIMAGE(u),'"__arg"))
resPar := ["construct",["@",["construct",:fargNames],_
["List",["Any"]]]]
call := [["$elt","Lisp","invokeFortran"],strconc(file,'".spadexe"),_
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index ab8d74fd..e4455ff2 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -454,7 +454,7 @@ DescendCodeAdd1(base,flag,target,formalArgs,formalArgModes) ==
--combinations (SETELT ...(ELT ..)) by MVCs where this is practicable
copyvec := newShell (1+n)
(for u in code repeat
- if update(u,copyvec,[]) then code:=delete(u,code))
+ if update(u,copyvec,[]) then code := remove(code,u))
where update(code,copyvec,sofar) ==
atom code => nil
code.op in '(%tref ELT) =>
@@ -470,7 +470,8 @@ DescendCodeAdd1(base,flag,target,formalArgs,formalArgModes) ==
--Maximum length of an MVC is 64 words
j:=j-1
j > i+2 =>
- for k in i..j repeat copyvec.k:=delete([name,:count+k-i],copyvec.k)
+ for k in i..j repeat
+ copyvec.k := remove(copyvec.k,[name,:count+k-i])
code:=[["REPLACE", name, instantiatedBase,
KEYWORD::START1, count,
KEYWORD::START2, i,
@@ -764,14 +765,16 @@ ICformat u ==
cond] repeat
--check that v causes descendants to go
for v in l | not (v=u) and v is ['HasCategory, =name,['QUOTE,
- cond2]] repeat if DescendantP(cond,cond2) then l:= delete(u,l)
+ cond2]] repeat
+ if DescendantP(cond,cond2) then l:= remove(l,u)
--v subsumes u
for u in l | u is ['AND,:l'] or u is ['and,:l'] repeat
for u' in l' | u' is ['HasCategory,name,cond] and cond is ['QUOTE,
cond] repeat
--check that v causes descendants to go
for v in l | v is ['HasCategory, =name,['QUOTE,
- cond2]] repeat if DescendantP(cond,cond2) then l:= delete(u,l)
+ cond2]] repeat
+ if DescendantP(cond,cond2) then l:= remove(l,u)
--v subsumes u
l
# l=1 => first l
@@ -783,7 +786,7 @@ ICformat u ==
--check that B causes (and A B) to go
for v in l | not (v=u) repeat
if listMember?(v,u) or (and/[member(w,u) for w in v]) then l:=
- delete(u,l)
+ remove(l,u)
--v subsumes u
--Note that we are ignoring AND as a component.
--Convince yourself that this code still works
diff --git a/src/interp/i-coerfn.boot b/src/interp/i-coerfn.boot
index d3244a37..d65e8897 100644
--- a/src/interp/i-coerfn.boot
+++ b/src/interp/i-coerfn.boot
@@ -925,7 +925,7 @@ Mp2Up(u,source is [mp,vl,S],target is [up,x,T]) ==
u = '_$fromCoerceable_$ =>
member(x,vl) =>
vl = [x] => canCoerce(S,T)
- canCoerce([mp,delete(x,vl),S],T)
+ canCoerce([mp,remove(vl,x),S],T)
canCoerce(source,T)
u is [ =0,:c] => -- constant polynomial?
diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot
index 127e5d7c..9ef6a509 100644
--- a/src/interp/i-map.boot
+++ b/src/interp/i-map.boot
@@ -385,8 +385,8 @@ clearDep1(x,toDoList,doneList,depList) ==
until null a repeat
a:= ASSQ(x,depList)
a =>
- depList:= delete(a,depList)
- toDoList:= union(toDoList,
+ depList := remove(depList,a)
+ toDoList := union(toDoList,
setDifference(rest a,doneList))
toDoList is [a,:res] => clearDep1(a,res,newDone,depList)
'done
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index 4406e5a1..4bd60e63 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -1155,12 +1155,12 @@ maprin0 x ==
maprinChk x ==
null $MatrixList => maPrin x
atom x and (u:= assoc(x,$MatrixList)) =>
- $MatrixList := delete(u,$MatrixList)
+ $MatrixList := remove($MatrixList,u)
maPrin deMatrix rest u
x is ["=",arg,y] => --case for tracing with )math and printing matrices
u:=assoc(y,$MatrixList) =>
-- we don't want to print matrix1 = matrix2 ...
- $MatrixList := delete(u,$MatrixList)
+ $MatrixList := remove($MatrixList,u)
maPrin ["=",arg, deMatrix rest u]
maPrin x
x is ['EQUATNUM,n,y] =>
@@ -1175,7 +1175,7 @@ maprinChk x ==
u := assoc(y,$MatrixList)
--$MatrixList := deleteAssoc(first u,$MatrixList)
-- deleteAssoc no longer exists
- $MatrixList := delete(u,$MatrixList)
+ $MatrixList := remove($MatrixList,u)
maPrin ['EQUATNUM,n,rest u]
newlineIfDisplaying()
maPrin x
diff --git a/src/interp/i-special.boot b/src/interp/i-special.boot
index b1a5ae71..137de0a9 100644
--- a/src/interp/i-special.boot
+++ b/src/interp/i-special.boot
@@ -830,7 +830,7 @@ checkForFreeVariables(v,locals) ==
first(args) is ["STEP",var,:.] =>
$boundVariables := [var,:$boundVariables]
r := [op,:[checkForFreeVariables(a,locals) for a in args]]
- $boundVariables := delete(var,$boundVariables)
+ $boundVariables := removeSymbol($boundVariables,var)
r
[op,:[checkForFreeVariables(a,locals) for a in args]]
op = "%LET" =>
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 255daac2..1c8b3ddd 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -2965,7 +2965,7 @@ workfilesSpad2Cmd args ==
type1 = 'delete => nil
for file in flist repeat
fl := pathname [file,type1,'"*"]
- deleteFlag => SETQ($sourceFiles,delete(fl,$sourceFiles))
+ deleteFlag => SETQ($sourceFiles,remove($sourceFiles,fl))
null (MAKE_-INPUT_-FILENAME fl) => sayKeyedMsg("S2IZ0035",[namestring fl])
updateSourceFiles fl
SAY " "
diff --git a/src/interp/interop.boot b/src/interp/interop.boot
index 8ce949d9..b6eb54f7 100644
--- a/src/interp/interop.boot
+++ b/src/interp/interop.boot
@@ -268,7 +268,7 @@ orderCatAnc x ==
reverse! ASSOCLEFT SORTBY(function rest,rest depthAssoc x)
depthAssocList u ==
- u := delete('DomainSubstitutionMacro,u) --hack by RDJ 8/90
+ u := removeSymbol(u,'DomainSubstitutionMacro) --hack by RDJ 8/90
removeDuplicates ("append"/[depthAssoc(y) for y in u])
depthAssoc x ==
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot
index a9bb318e..9c5a8bcd 100644
--- a/src/interp/lisplib.boot
+++ b/src/interp/lisplib.boot
@@ -175,7 +175,7 @@ orderByContainment pl ==
else if CONTAINED(x,max)
then if null assoc(x,$predGensymAlist) then $predGensymAlist := [[x,:gensym()],:$predGensymAlist]
if y then max := x
- [max,:orderByContainment delete(max,pl)]
+ [max,:orderByContainment remove(pl,max)]
buildBitTable(:l) == fn(reverse l,0) where fn(l,n) ==
null l => n
diff --git a/src/interp/modemap.boot b/src/interp/modemap.boot
index 16fc9084..85fa6886 100644
--- a/src/interp/modemap.boot
+++ b/src/interp/modemap.boot
@@ -369,7 +369,7 @@ putDomainsInScope(x,e) ==
l:= getDomainsInScope e
if $verbose and listMember?(x,l) then
sayBrightly ['" Note: Domain ",x," already in scope"]
- newValue:= [x,:delete(x,l)]
+ newValue := [x,:remove(l,x)]
$insideCapsuleFunctionIfTrue => ($CapsuleDomainsInScope:= newValue; e)
put("$DomainsInScope","special",newValue,e)
@@ -473,7 +473,7 @@ chaseInferences(pred,$e) ==
for [ante,:conseq] in l repeat
ante=pred => [foo w for w in conseq]
ante is ["and",:ante'] and listMember?(pred,ante') =>
- ante':= delete(pred,ante')
+ ante':= remove(ante',pred)
v':=
# ante'=1 => first ante'
["and",:ante']
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index b799cfff..c0d7277e 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -852,7 +852,7 @@ isFloat e ==
checkPrecision e ==
-- Do we have a string?
- string?(e) and codePoint CHAR(e,0) = 34 => e
+ string? e and codePoint stringChar(e,0) = 34 => e
e := delete(char " ",STRINGIMAGE e)
$fortranPrecision = "double" =>
iPart := subSequence(e,0,(period:=POSITION(char ".",e))+1)
diff --git a/src/interp/patches.lisp b/src/interp/patches.lisp
index fc117573..e49d0e7b 100644
--- a/src/interp/patches.lisp
+++ b/src/interp/patches.lisp
@@ -114,12 +114,6 @@
(READSPADEXPR))
(t (|parseTransform| (|postTransform| (|string2SpadTree| line)))))))
-#+(and :lucid (not :ibm/370))
- (define-function 'RUN-AIX-PROGRAM #'SYS:RUN-AIX-PROGRAM)
-;; following should be no longer necessary
-;; (eval-when (eval load compile) (shadow 'delete))
-;; (define-function 'boot::delete #'|delete|)
-
;; following are defined in spadtest.boot and stantest.boot
(defun |installStandardTestPackages| () ())
(defun |spadtestValueHook| (val type) ())
diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot
index 19f8a1ba..659c784f 100644
--- a/src/interp/setvars.boot
+++ b/src/interp/setvars.boot
@@ -559,7 +559,7 @@ setExposeAddConstr arg ==
sayKeyedMsg("S2IZ0049K",[x,$interpreterFrameName])
-- if the constructor is explicitly hidden, then remove that
if member(x,$localExposureData.2) then
- $localExposureData.2 := delete(x,$localExposureData.2)
+ $localExposureData.2 := remove($localExposureData.2,x)
$localExposureData.1 := MSORT [x,:$localExposureData.1]
clearClams()
sayKeyedMsg("S2IZ0049P",[x,$interpreterFrameName])
@@ -599,7 +599,7 @@ setExposeDropGroup arg ==
displayHiddenConstructors()
clearClams()
member(x,$localExposureData.0) =>
- $localExposureData.0 := delete(x,$localExposureData.0)
+ $localExposureData.0 := remove($localExposureData.0,x)
clearClams()
sayKeyedMsg("S2IZ0049S",[x,$interpreterFrameName])
GETALIST($globalExposureGroupAlist,x) =>
@@ -625,7 +625,7 @@ setExposeDropConstr arg ==
member(x,$localExposureData.2) =>
sayKeyedMsg("S2IZ0049O",[x,$interpreterFrameName])
if member(x,$localExposureData.1) then
- $localExposureData.1 := delete(x,$localExposureData.1)
+ $localExposureData.1 := remove($localExposureData.1,x)
$localExposureData.2 := MSORT [x,:$localExposureData.2]
clearClams()
sayKeyedMsg("S2IZ0049Q",[x,$interpreterFrameName])
diff --git a/src/interp/simpbool.boot b/src/interp/simpbool.boot
index 4c2d2345..6c3295c1 100644
--- a/src/interp/simpbool.boot
+++ b/src/interp/simpbool.boot
@@ -193,7 +193,7 @@ ordIntersection(a,b) ==
ordIntersection(t,b)
ordSetDiff(a,b) ==
b isnt [h,:t] => a
- member(h,a) => ordSetDiff(delete(h,a),t)
+ member(h,a) => ordSetDiff(remove(a,h),t)
ordSetDiff(a,t)
-------------
testPredList u ==
diff --git a/src/interp/trace.boot b/src/interp/trace.boot
index 7cc14533..8ab48789 100644
--- a/src/interp/trace.boot
+++ b/src/interp/trace.boot
@@ -124,7 +124,7 @@ trace1 l ==
throwKeyedMsg("S2IT0002",NIL)
a:= hasOption($options,'restore) =>
null(oldL:= $lastUntraced) => nil
- newOptions:= delete(a,$options)
+ newOptions:= remove($options,a)
null l => trace1 oldL
for x in l repeat
x is [domain,:opList] and vector? domain =>
@@ -568,7 +568,7 @@ untraceDomainConstructor domainConstructor ==
innerDomainConstructor := makeSymbol strconc(domainConstructor,'";")
if FBOUNDP innerDomainConstructor then UNEMBED innerDomainConstructor
else UNEMBED domainConstructor
- SETQ(_/TRACENAMES,delete(domainConstructor,_/TRACENAMES))
+ SETQ(_/TRACENAMES,removeSymbol(_/TRACENAMES,domainConstructor))
flattenOperationAlist(opAlist) ==
res:= nil
@@ -796,7 +796,7 @@ tracelet(fn,vars) ==
not symbolMember?(fn,$traceletFunctions) and not IS__GENVAR fn and COMPILED_-FUNCTION_-P symbolFunction fn
and not stupidIsSpadFunction fn and not GENSYMP fn =>
($traceletFunctions:= [fn,:$traceletFunctions]; compileBoot fn ;
- $traceletFunctions:= delete(fn,$traceletFunctions) )
+ $traceletFunctions:= remove($traceletFunctions,fn) )
breaklet(fn,vars) ==
--vars is "all" or a list of variables
@@ -818,7 +818,7 @@ breaklet(fn,vars) ==
and not GENSYMP fn =>
$traceletFunctions:= [fn,:$traceletFunctions]
compileBoot fn
- $traceletFunctions:= delete(fn,$traceletFunctions)
+ $traceletFunctions:= removeSymbol($traceletFunctions,fn)
stupidIsSpadFunction fn ==
-- returns true if the function pname has a semi-colon in it
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 22:23:40 +0000