aboutsummaryrefslogtreecommitdiff
path: root/src/interp
diff options
context:
space:
mode:
Diffstat (limited to 'src/interp')
-rw-r--r--src/interp/astr.boot2
-rw-r--r--src/interp/br-con.boot2
-rw-r--r--src/interp/br-op1.boot2
-rw-r--r--src/interp/clam.boot4
-rw-r--r--src/interp/define.boot2
-rw-r--r--src/interp/g-cndata.boot2
-rw-r--r--src/interp/i-funsel.boot2
-rw-r--r--src/interp/i-syscmd.boot2
-rw-r--r--src/interp/newfort.boot2
-rw-r--r--src/interp/nrunfast.boot2
-rw-r--r--src/interp/nrunopt.boot2
-rw-r--r--src/interp/pspad2.boot2
-rw-r--r--src/interp/rulesets.boot2
-rw-r--r--src/interp/scan.boot2
-rw-r--r--src/interp/termrw.boot2
-rw-r--r--src/interp/wi1.boot2
16 files changed, 17 insertions, 17 deletions
diff --git a/src/interp/astr.boot b/src/interp/astr.boot
index 3ccabe7d..16a3764c 100644
--- a/src/interp/astr.boot
+++ b/src/interp/astr.boot
@@ -40,7 +40,7 @@ module astr where
ncPutQ: (%List,%Thing,%Thing) -> %Thing
--% Attributed Structures (astr)
--- For objects which are pairs where the CAR field is either just a tag
+-- For objects which are pairs where the first field is either just a tag
-- (an identifier) or a pair which is the tag and an association list.
-- Pick off the tag
diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot
index 53a0e927..7789d71b 100644
--- a/src/interp/br-con.boot
+++ b/src/interp/br-con.boot
@@ -992,7 +992,7 @@ dbShowCons1(htPage,cAlist,key) ==
bcUnixTable(listSort(function GLESSEQP,REMDUP flist))
key = 'documentation => dbShowConsDoc(page,conlist)
if $exposedOnlyIfTrue then
- cAlist := [x for x in cAlist | isExposedConstructor opOf CAR x]
+ cAlist := [x for x in cAlist | isExposedConstructor opOf first x]
key = 'conditions => dbShowConditions(page,cAlist,kind)
key = 'parameters => bcConTable REMDUP ASSOCLEFT cAlist
key = 'kinds => dbShowConsKinds cAlist
diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index d5fdebaa..13604dd4 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -532,7 +532,7 @@ dbShowOpAllDomains(htPage,opAlist,which) ==
domOriginAlist := insertAlist(conname,pred,domOriginAlist)
--the following is similar to "domainsOf" but do not sort immediately
u := [COPY key for key in HKEYS _*HASCATEGORY_-HASH_*
- | LASSQ(CDR key,catOriginAlist)]
+ | LASSQ(rest key,catOriginAlist)]
for pair in u repeat
[dom,:cat] := pair
LASSQ(cat,catOriginAlist) = 'etc => RPLACD(pair,'etc)
diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index 8789e6aa..14f59535 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -457,7 +457,7 @@ assocCacheShift(x,cacheName,fn) == --like ASSOC except that al is circular
RPLACA(forwardPointer,first al)
RPLACA(al,y)
return (val:= y)
- backPointer := forwardPointer --CAR is slot replaced on failure
+ backPointer := forwardPointer --first is slot replaced on failure
forwardPointer:= rest forwardPointer
val => val
setDynamicBinding(cacheName,backPointer)
@@ -648,7 +648,7 @@ lassocShiftQ(x,l) ==
y:= l
while not atom y repeat
EQ(x,first first y) => return (result := first y)
- y:= CDR y
+ y:= rest y
result =>
if NEQ(y,l) then
RPLACA(y,first l)
diff --git a/src/interp/define.boot b/src/interp/define.boot
index f3da40b5..eb08520f 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -1709,7 +1709,7 @@ compCategoryItem(x,predl,env) ==
noteExport(y,pred)
PUSH(MKQ [y,pred],$atList)
- --3. it may be a list, with PROGN as the first, and some information as the CDR
+ --3. it may be a list, with PROGN as the first, and some information as the rest
x is ["PROGN",:l] =>
for u in l repeat
compCategoryItem(u,predl,env)
diff --git a/src/interp/g-cndata.boot b/src/interp/g-cndata.boot
index 96c2f298..0d1771b6 100644
--- a/src/interp/g-cndata.boot
+++ b/src/interp/g-cndata.boot
@@ -65,7 +65,7 @@ getCDTEntry(info,isName) ==
putConstructorProperty(name,prop,val) ==
null (entry := getCDTEntry(name,true)) => NIL
- RPLACD(CDR entry,PUTALIST(CDDR entry,prop,val))
+ RPLACD(rest entry,PUTALIST(CDDR entry,prop,val))
true
attribute? name ==
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot
index 38f54ee4..9caec0b7 100644
--- a/src/interp/i-funsel.boot
+++ b/src/interp/i-funsel.boot
@@ -928,7 +928,7 @@ matchMmSig(mm,tar,args1,args2) ==
[sig,:.]:= mm
if CONTAINED('_#, sig) then
sig := [replaceSharpCalls COPY t for t in sig]
- first args1 => matchMmSigTar(tar,first sig)
+ null args1 => matchMmSigTar(tar,first sig)
a:= rest sig
arg:= NIL
for i in 1.. while args1 and args2 and a until not b repeat
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 6ba35132..7db77377 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -1830,7 +1830,7 @@ undoFromFile(n) ==
x:= first p1
for p2 in rest p1 repeat
$InteractiveFrame:= putHist(x,first p2,rest p2,$InteractiveFrame)
- val:= ( p:= ASSQ('%,vec) ) and ( p1:= ASSQ('value,rest p) ) and CDR p1
+ val:= ( p:= ASSQ('%,vec) ) and ( p1:= ASSQ('value,rest p) ) and rest p1
$InteractiveFrame:= putHist('%,'value,val,$InteractiveFrame)
updateHist()
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index 2c150532..04f83765 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -705,7 +705,7 @@ fortFormatTypes1(typeName,names) ==
insertEntry(size,el,aList) ==
entry := assoc(size,aList)
null entry => CONS(CONS(size,LIST el),aList)
- RPLACD(entry,CONS(el,CDR entry))
+ RPLACD(entry,CONS(el,rest entry))
aList
fortFormatCharacterTypes(names) ==
diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot
index 13b2e83e..96f7b3bc 100644
--- a/src/interp/nrunfast.boot
+++ b/src/interp/nrunfast.boot
@@ -354,7 +354,7 @@ newLookupInCategories1(op,sig,dom,dollar) ==
form2String devaluate dom,'"-----> searching default packages for ",op)
predvec := dom.3
slot4 := dom.4
- packageVec := CAR slot4
+ packageVec := first slot4
catVec := first QCDR slot4
--the next three lines can go away with new category world
varList := ['$,:$FormalMapVariableList]
diff --git a/src/interp/nrunopt.boot b/src/interp/nrunopt.boot
index deecbd19..a4aea6b5 100644
--- a/src/interp/nrunopt.boot
+++ b/src/interp/nrunopt.boot
@@ -105,7 +105,7 @@ makeCompactDirect1(op,items) ==
--identified by a 0 in slot position
if r is [n,:s] then
slot :=
- n is [p,:.] => p --the CDR is linenumber of function definition
+ n is [p,:.] => p --the rest is linenumber of function definition
n
predCode :=
s is [pred,:.] => predicateBitIndex pred
diff --git a/src/interp/pspad2.boot b/src/interp/pspad2.boot
index 1b3bd58a..d7a5af0d 100644
--- a/src/interp/pspad2.boot
+++ b/src/interp/pspad2.boot
@@ -640,7 +640,7 @@ formatLB() ==
format "{"
restoreC() == --used by macro "embrace"
- originalC := CAR $braceStack
+ originalC := first $braceStack
$braceStack := rest $braceStack
formatRB originalC
diff --git a/src/interp/rulesets.boot b/src/interp/rulesets.boot
index aa851141..a2a05ed5 100644
--- a/src/interp/rulesets.boot
+++ b/src/interp/rulesets.boot
@@ -295,7 +295,7 @@ createTypeEquivRules() ==
((QF (P t1)) . (RF t1))
((QF (I)) . (RN))
((RE (RN)) . (RR)) )))
- $TypeEqui := CONS(CAR $TypeEQ, [[b,:a] for [a,:b] in rest $TypeEQ])
+ $TypeEqui := CONS(first $TypeEQ, [[b,:a] for [a,:b] in rest $TypeEQ])
true
initializeRuleSets() ==
diff --git a/src/interp/scan.boot b/src/interp/scan.boot
index c8b9dfe8..ff113938 100644
--- a/src/interp/scan.boot
+++ b/src/interp/scan.boot
@@ -167,7 +167,7 @@ scanKeyWords == [ _
scanKeyTableCons()==
KeyTable:=MAKE_-HASHTABLE("CVEC",true)
for st in scanKeyWords repeat
- HPUT(KeyTable,CAR st,second st)
+ HPUT(KeyTable,first st,second st)
KeyTable
scanKeyTable:=scanKeyTableCons()
diff --git a/src/interp/termrw.boot b/src/interp/termrw.boot
index 7d018dc5..4fd3b1f9 100644
--- a/src/interp/termrw.boot
+++ b/src/interp/termrw.boot
@@ -56,7 +56,7 @@ term1RW(t,R) ==
-- tries to reduce t at the top node
[vars,:varRules]:= R
for r in varRules until not (SL='failed) repeat
- SL:= termMatch(CAR r,t,NIL,vars)
+ SL:= termMatch(first r,t,NIL,vars)
not (SL='failed) =>
t:= subCopy(copy rest r,SL)
t
diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot
index b644eb2a..1d987854 100644
--- a/src/interp/wi1.boot
+++ b/src/interp/wi1.boot
@@ -1213,7 +1213,7 @@ compDefineCategory2(form,signature,specialCases,body,m,e,
if $extraParms then
formals:=actuals:=nil
for u in $extraParms repeat
- formals:=[CAR u,:formals]
+ formals:=[first u,:formals]
actuals:=[MKQ rest u,:actuals]
body := ['sublisV,['PAIR,['QUOTE,formals],['LIST,:actuals]],body]
if argl then body:= -- always subst for args after extraparms