aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/interp/br-con.boot6
-rw-r--r--src/interp/clam.boot6
-rw-r--r--src/interp/define.boot2
-rw-r--r--src/interp/functor.boot6
-rw-r--r--src/interp/g-boot.boot2
-rw-r--r--src/interp/g-opt.boot22
-rw-r--r--src/interp/g-util.boot4
-rw-r--r--src/interp/i-analy.boot12
-rw-r--r--src/interp/i-coerfn.boot8
-rw-r--r--src/interp/i-intern.boot2
-rw-r--r--src/interp/i-output.boot10
-rw-r--r--src/interp/i-spec1.boot2
-rw-r--r--src/interp/trace.boot10
-rw-r--r--src/interp/wi2.boot2
14 files changed, 47 insertions, 47 deletions
diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot
index beead1b9..46bd1b22 100644
--- a/src/interp/br-con.boot
+++ b/src/interp/br-con.boot
@@ -307,9 +307,9 @@ kePage(htPage,junk) ==
getConstructorExports((domname or conform),true))
[conlist,attrlist,:oplist] := data
if domname then
- for x in conlist repeat RPLAC(rest x,simpHasPred rest x)
- for x in attrlist repeat RPLAC(CDDR x,simpHasPred CDDR x)
- for x in oplist repeat RPLAC(CDDR x,simpHasPred CDDR x)
+ for x in conlist repeat x.rest := simpHasPred rest x
+ for x in attrlist repeat x.rest.rest := simpHasPred CDDR x
+ for x in oplist repeat x.rest.rest := simpHasPred CDDR x
prefix := pluralSay(#conlist + #attrlist + #oplist,'"Export",'"Exports")
page := htInitPage([:prefix,'" of ",:heading],htCopyProplist htPage)
htSayStandard '"\beginmenu "
diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index ec519a8b..b7449f7c 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -474,7 +474,7 @@ assocCacheShiftCount(x,al,fn) ==
until EQ(forwardPointer,al) repeat
FUNCALL(fn, first (y:=first forwardPointer),x) =>
newFrontPointer := forwardPointer
- RPLAC(second y,QSADD1 second y) --increment use count
+ y.rest.first := QSADD1 second y --increment use count
return (val:= y)
if QSLESSP(c := second y,minCount) then --initial c is 1 so is true 1st time
minCount := c
@@ -559,8 +559,8 @@ recordInstantiation1(op,prop,dropIfTrue) ==
null $reportInstantiations => nil
u:= HGET($instantRecord,op) => --hope that one exists most of the time
v := LASSOC(prop,u) =>
- dropIfTrue => RPLAC(rest v,1+rest v)
- RPLAC(first v,1+first v)
+ dropIfTrue => v.rest := 1+rest v
+ v.first := 1+first v
u.rest := [first u,:rest u]
val :=
dropIfTrue => [0,:1]
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 297d4d57..5e881828 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -1135,7 +1135,7 @@ stripOffSubdomainConditions(margl,argl) ==
f() ==
x is ['SubDomain,marg,condition] =>
pair:= assoc(i,$argumentConditionList) =>
- (RPLAC(second pair,MKPF([condition,second pair],'AND)); marg)
+ (pair.rest.first := MKPF([condition,second pair],'AND); marg)
$argumentConditionList:= [[i,arg,condition],:$argumentConditionList]
marg
x
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index a52b6347..a317a844 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -786,7 +786,7 @@ InvestigateConditions catvecListMaker ==
for [v,:.] in newS repeat
for v' in [v,:first CatEval(v).4] repeat
if (w:=assoc(v',$HackSlot4)) then
- RPLAC(rest w,if rest w then mkOr(u,rest w) else u)
+ w.rest := if rest w then mkOr(u,rest w) else u
(list:= update(list,u,secondaries,newS)) where
update(list,cond,secondaries,newS) ==
(list2:=
@@ -988,10 +988,10 @@ getAbbreviation(name,c) ==
N:= ASSQ(name,rest X) =>
C:= ASSQ(c,rest N) => rest C --already there
newAbbreviation:= mkAbbrev(X,x)
- RPLAC(rest N,[[c,:newAbbreviation],:rest N])
+ N.rest := [[c,:newAbbreviation],:rest N]
newAbbreviation
newAbbreviation:= mkAbbrev(X,x)
- RPLAC(rest X,[[name,[c,:newAbbreviation]],:rest X])
+ X.rest := [[name,[c,:newAbbreviation]],:rest X]
newAbbreviation
$abbreviationTable:= [[x,[name,[c,:x]]],:$abbreviationTable]
x
diff --git a/src/interp/g-boot.boot b/src/interp/g-boot.boot
index 77d99e9e..fc45f8d5 100644
--- a/src/interp/g-boot.boot
+++ b/src/interp/g-boot.boot
@@ -345,7 +345,7 @@ defISReverse(x,a) ==
x is ['CONS,:.] =>
null third x => ['CONS,second x, a]
y := defISReverse(third x, NIL)
- RPLAC(third y,['CONS,second x,a])
+ y.rest.rest.first := ['CONS,second x,a]
y
ERRHUH()
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot
index a65095d2..10a6eb74 100644
--- a/src/interp/g-opt.boot
+++ b/src/interp/g-opt.boot
@@ -105,17 +105,17 @@ optimize x ==
y='CLOSEDFN => nil
y is [["XLAM",argl,body],:a] =>
optimize rest x
- argl = "ignore" => RPLAC(first x,body)
+ argl = "ignore" => x.first := body
if not (LENGTH argl<=LENGTH a) then
SAY '"length mismatch in XLAM expression"
PRETTYPRINT y
- RPLAC(first x,optimize optXLAMCond SUBLIS(pairList(argl,a),body))
+ x.first := optimize optXLAMCond SUBLIS(pairList(argl,a),body)
atom y =>
optimize rest x
- if first y="IF" then (RPLAC(first x,optIF2COND y); y:= first x)
+ if first y="IF" then (x.first := optIF2COND y; y:= first x)
op:= GETL(subrname first y,"OPTIMIZE") =>
- (optimize rest x; RPLAC(first x,FUNCALL(op,optimize first x)))
- RPLAC(first x,optimize first x)
+ (optimize rest x; x.first := FUNCALL(op,optimize first x))
+ x.first := optimize first x
optimize rest x
subrname u ==
@@ -172,9 +172,9 @@ optCall (x is ["%Call",:u]) ==
-- next should happen only as result of macro expansion
atom first x => first x
[fn,:a]:= first x
- atom fn => (RPLAC(rest x,a); RPLAC(first x,fn))
+ atom fn => (x.rest := a; x.first := fn)
fn is ["applyFun",name] =>
- (RPLAC(first x,"SPADCALL"); RPLAC(rest x,[:a,name]); x)
+ (x.first := "SPADCALL"; x.rest := [:a,name]; x)
fn is [q,R,n] and q in '(getShellEntry ELT QREFELT CONST) =>
not $bootStrapMode and (w:= optCallSpecially(q,x,n,R)) => w
q="CONST" => ["spadConstant",R,n]
@@ -262,8 +262,8 @@ optCond (x is ['COND,:l]) ==
for y in tails l repeat
while y is [[a1,c1],[a2,c2],:y'] and EqualBarGensym(c1,c2) repeat
a:=['OR,a1,a2]
- RPLAC(first first y,a)
- RPLAC(rest y,y')
+ first(y).first := a
+ y.rest := y'
x
AssocBarGensym(key,l) ==
@@ -298,8 +298,8 @@ optXLAMCond x ==
x is ["COND",u:= [p,c],:l] =>
(optPredicateIfTrue p => c; ["COND",u,:optCONDtail l])
atom x => x
- RPLAC(first x,optXLAMCond first x)
- RPLAC(rest x,optXLAMCond rest x)
+ x.first := optXLAMCond first x
+ x.rest := optXLAMCond rest x
x
optPredicateIfTrue p ==
diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot
index 35fd21f4..4a719772 100644
--- a/src/interp/g-util.boot
+++ b/src/interp/g-util.boot
@@ -246,7 +246,7 @@ addIntSymTabBinding(var,proplist,e is [[curContour,:.],:.]) ==
u := ASSQ(var,curContour) =>
u.rest := proplist
e
- RPLAC(CAAR e,[[var,:proplist],:curContour])
+ first(e).first := [[var,:proplist],:curContour]
e
--% Syntax manipulation
@@ -735,7 +735,7 @@ addBindingInteractive(var,proplist,e is [[curContour,:.],:.]) ==
u := ASSQ(var,curContour) =>
u.rest := proplist
e
- RPLAC(CAAR e,[[var,:proplist],:curContour])
+ first(e).first := [[var,:proplist],:curContour]
e
augProplistInteractive(proplist,prop,val) ==
diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot
index e1f84b04..b2631fcc 100644
--- a/src/interp/i-analy.boot
+++ b/src/interp/i-analy.boot
@@ -840,8 +840,8 @@ bottomUpElt (form:=[op,:argl]) ==
ms := bottomUp op
ms and (ms is [['Union,:.]] or ms is [['Record,:.]]) =>
- RPLAC(rest form, [op,:argl])
- RPLAC(first form, mkAtreeNode "elt")
+ form.rest := [op,:argl]
+ form.first := mkAtreeNode "elt"
bottomUp form
target := getTarget form
@@ -852,16 +852,16 @@ bottomUpElt (form:=[op,:argl]) ==
while null u for newOp in newOps repeat
newArgs := [op,:argl]
if selectMms(newOp, newArgs, target) then
- RPLAC(rest form, newArgs)
- RPLAC(first form, newOp)
+ form.rest := newArgs
+ form.first := newOp
u := bottomUp form
while null u and ( "and"/[retractAtree(a) for a in newArgs] ) repeat
while null u for newOp in newOps repeat
newArgs := [op,:argl]
if selectMms(newOp, newArgs, target) then
- RPLAC(rest form, newArgs)
- RPLAC(first form, newOp)
+ form.rest := newArgs
+ form.first := newOp
u := bottomUp form
u
diff --git a/src/interp/i-coerfn.boot b/src/interp/i-coerfn.boot
index 7397569d..21473c86 100644
--- a/src/interp/i-coerfn.boot
+++ b/src/interp/i-coerfn.boot
@@ -1514,12 +1514,12 @@ Up2Up(u,source is [.,v1,S], target is [.,v2,T]) ==
insertAlist(a,b,l) ==
null l => [[a,:b]]
- a = l.0.0 => (RPLAC(CDAR l,b);l)
+ a = l.0.0 => (first(l).rest := b;l)
_?ORDER(l.0.0,a) => [[a,:b],:l]
(fn(a,b,l);l) where fn(a,b,l) ==
- null rest l => RPLAC(rest l,[[a,:b]])
- a = l.1.0 => RPLAC(rest l.1,b)
- _?ORDER(l.1.0,a) => RPLAC(rest l,[[a,:b],:rest l])
+ null rest l => l.rest := [[a,:b]]
+ a = l.1.0 => l.1.rest := b
+ _?ORDER(l.1.0,a) => l.rest := [[a,:b],:rest l]
fn(a,b,rest l)
--% Union
diff --git a/src/interp/i-intern.boot b/src/interp/i-intern.boot
index 8278d1af..12d02705 100644
--- a/src/interp/i-intern.boot
+++ b/src/interp/i-intern.boot
@@ -431,7 +431,7 @@ putI(x,prop,val) == ($InteractiveFrame := put(x,prop,val,$InteractiveFrame))
getIProplist x == getProplist(x,$InteractiveFrame)
removeBindingI x ==
- RPLAC(CAAR $InteractiveFrame,deleteAssocWOC(x,CAAR $InteractiveFrame))
+ first($InteractiveFrame).first := deleteAssocWOC(x,CAAR $InteractiveFrame)
rempropI(x,prop) ==
id:=
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index bdb5c654..3df78d82 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -1500,7 +1500,7 @@ splitConcat(list,maxWidth,firstTimeIfTrue) ==
l:= x
totalWidth:= width
x:= rest l
- RPLAC(rest l,nil)
+ l.rest := nil
[list,:splitConcat(x,maxWidth,nil)]
spadPrint(x,m) ==
@@ -1817,10 +1817,10 @@ charySplit(u,v,start,linelength) ==
ddm := rest dm
dm.rest := nil
WIDTH v > linelength - 2 => return nil
- RPLAC(first v, first v.0)
+ v.first := first v.0
dm.rest := ddm
m := rest m
- RPLAC(first v,first v.0)
+ v.first := first v.0
m.rest := nil
charybdis(v,start + 2,linelength - 2)
split2(u,dm,ddm,start,linelength)
@@ -2285,7 +2285,7 @@ matWidth(x) ==
--returns ["max width of entries in column i" for i in 1..numberOfRows]
subspanList := matLSum matSubList y
superspanList := matLSum matSuperList y
- RPLAC(x.1,[widthList, subspanList, superspanList])
+ x.rest.first := [widthList, subspanList, superspanList]
CAAR x.1
matLSum(x) ==
@@ -2564,7 +2564,7 @@ mathPrintTran u ==
atom u => u
true =>
for x in tails u repeat
- RPLAC(first x, mathPrintTran first x)
+ x.first := mathPrintTran first x
u
mathPrint1(x,fg) ==
diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot
index 6312649b..f227089b 100644
--- a/src/interp/i-spec1.boot
+++ b/src/interp/i-spec1.boot
@@ -333,7 +333,7 @@ userDefinedCase(t is [op, lhs, rhs]) ==
putMode(r, m)
putValue(r, objNewWrap(MKQ rhs,m))
putModeSet(r, [m])
- x.rest.rest := [r] -- fix up contained for rhs.
+ t.rest.rest := [r] -- fix up contained for rhs.
nil -- tell bottomUp to continue.
upcase t ==
diff --git a/src/interp/trace.boot b/src/interp/trace.boot
index 2fedf5c2..486151d8 100644
--- a/src/interp/trace.boot
+++ b/src/interp/trace.boot
@@ -472,7 +472,7 @@ spadTrace(domain,options) ==
$tracedModemap:= subTypes(mm,constructSubst(domain.0))
traceName:= BPITRACE(first domain.n,alias, options)
NCONC(pair,[listOfVariables,first domain.n,traceName,alias])
- RPLAC(first domain.n,traceName)
+ domain.n.first := traceName
sigSlotNumberAlist:= [x for x in sigSlotNumberAlist | CDDDR x]
if $reportSpadTrace then
if $traceNoisely then printDashedLine()
@@ -480,7 +480,7 @@ spadTrace(domain,options) ==
reportSpadTrace("TRACING",x)
if $letAssoc then SETLETPRINTFLAG true
currentEntry =>
- RPLAC(rest currentEntry,[:sigSlotNumberAlist,:currentAlist])
+ currentEntry.rest := [:sigSlotNumberAlist,:currentAlist]
SETQ(_/TRACENAMES,[[domain,:sigSlotNumberAlist],:_/TRACENAMES])
spadReply()
@@ -702,13 +702,13 @@ spadUntrace(domain,options) ==
for (pair:= [op,sig,n,lv,bpiPointer,traceName,alias]) in sigSlotNumberAlist |
anyifTrue or MEMQ(op,listOfOperations) repeat
BPIUNTRACE(traceName,alias)
- RPLAC(first domain.n,bpiPointer)
- RPLAC(CDDDR pair,nil)
+ domain.n.first := bpiPointer
+ pair.rest.rest.rest := nil
if assocPair:=ASSOC(BPINAME bpiPointer,$letAssoc) then
$letAssoc := REMOVER($letAssoc,assocPair)
if null $letAssoc then SETLETPRINTFLAG nil
newSigSlotNumberAlist:= [x for x in sigSlotNumberAlist | CDDDR x]
- newSigSlotNumberAlist => RPLAC(rest pair,newSigSlotNumberAlist)
+ newSigSlotNumberAlist => pair.rest := newSigSlotNumberAlist
SETQ(_/TRACENAMES,DELASC(domain,_/TRACENAMES))
spadReply()
diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot
index ecf59422..d0265132 100644
--- a/src/interp/wi2.boot
+++ b/src/interp/wi2.boot
@@ -1113,7 +1113,7 @@ replaceNodeInStructureBy(node, x) ==
replaceNodeBy(node, x) ==
atom x => nil
- for y in tails x | EQCAR(x,node) repeat RPLAC(first x, $nodeCopy)
+ for y in tails x | EQCAR(x,node) repeat x.first := $nodeCopy
nil
chk(x,key) == fn(x,0,key) where fn(x,cnt,key) ==
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 06:11:32 +0000