* interp/: More cleanup.

1 files changed, 16 insertions, 16 deletions

diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot
index b99da141..60eb4fe5 100644
--- a/src/interp/i-spec1.boot
+++ b/src/interp/i-spec1.boot
@@ -121,9 +121,9 @@ evalTargetedADEF(t,vars,types,body) ==
 
   sublist := [[var,:GENSYM()] for var in vars]
   body := sublisNQ(sublist,body)
-  vars := [CDR v for v in sublist]
+  vars := [rest v for v in sublist]
 
-  for m in CDR types for var in vars repeat
+  for m in rest types for var in vars repeat
     $env:= put(var,'mode,m,$env)
     mkLocalVar($mapName,var)
   for lvar in getLocalVars($mapName,body) repeat
@@ -145,7 +145,7 @@ mkInterpTargetedADEF(t,vars,types,oldBody) ==
   compileADEFBody(t,vars,types,body,first types)
 
 compileTargetedADEF(t,vars,types,body) ==
-  val := compileBody(body,CAR types)
+  val := compileBody(body,first types)
   computedResultType := objMode val
   body := wrapMapBodyWithCatch flattenCOND objVal val
   compileADEFBody(t,vars,types,body,computedResultType)
@@ -513,8 +513,8 @@ upLoopIterIN(iter,index,s) ==
       NIL
     upLoopIterSTEP(index,lower,step,upperList)
     newIter := ['STEP,index,lower,step,:upperList]
-    RPLACA(iter,CAR newIter)
-    RPLACD(iter,CDR newIter)
+    RPLACA(iter,first newIter)
+    RPLACD(iter,rest newIter)
 
   iterMs isnt [['List,ud]] => throwKeyedMsg("S2IS0006",[index])
   put(index,'mode,ud,$env)
@@ -686,8 +686,8 @@ upStreamIterIN(iter,index,s) ==
       NIL
     upStreamIterSTEP(index,lower,step,upperList)
     newIter := ['STEP,index,lower,step,:upperList]
-    RPLACA(iter,CAR newIter)
-    RPLACD(iter,CDR newIter)
+    RPLACA(iter,first newIter)
+    RPLACD(iter,rest newIter)
 
   (iterMs isnt [['List,ud]]) and (iterMs isnt [['Stream,ud]])
     and (iterMs isnt [['InfinitTuple, ud]]) =>
@@ -741,7 +741,7 @@ collectOneStream(t,op,itrl,body) ==
   -- build stream collect for case of iterating over a single stream
   --  In this case we don't need to build records
   form := mkAndApplyPredicates itrl
-  bodyVec := mkIterFun(CAR $indexVars,body,$localVars)
+  bodyVec := mkIterFun(first $indexVars,body,$localVars)
   form := [mkAtreeNode 'map,bodyVec,form]
   bottomUp form
   val := getValue form
@@ -808,7 +808,7 @@ checkForFreeVariables(v,locals) ==
       ["getSimpleArrayEntry","envArg",positionInVec(0,#($freeVariables))]
     v
   LISTP v =>
-    CDR(LASTTAIL v) => -- Must be a better way to check for a genuine list?
+    rest(LASTTAIL v) => -- Must be a better way to check for a genuine list?
       v
     [op,:args] := v
     LISTP op => 
@@ -885,7 +885,7 @@ mkZipCode indexList ==
                mkAtreeNode 'makeRecord]
     form := [mkAtreeNode 'map,zipFun,s1,s2]
     [form,:zipType]
-  [form,:zipType] := mkZipCode CDR indexList
+  [form,:zipType] := mkZipCode rest indexList
   [[.,:s],:.] := indexList
   t := second objMode getValue s
   zipFun := [mkAtreeNode 'Dollar, ['MakeRecord,mkEvalable t,
@@ -935,7 +935,7 @@ subVecNodes(new,old,form) ==
   ATOM form =>
     (VECP form) and (form.0 = old) => new
     form
-  [subVecNodes(new,old,CAR form), :subVecNodes(new,old,CDR form)]
+  [subVecNodes(new,old,first form), :subVecNodes(new,old,rest form)]
 
 mkIterVarSub(var,numVars) ==
   n := iterVarPos var
@@ -966,12 +966,12 @@ upconstruct t ==
   isTaggedUnion tar => upTaggedUnionConstruct(op,l,tar)
   aggs := '(List)
   if tar and CONSP(tar) and not isPartialMode(tar) then
-    CAR(tar) in aggs =>
+    first(tar) in aggs =>
       ud :=
         (l is [[realOp, :.]]) and (getUnname(realOp) = 'COLLECT) => tar
         second tar
       for x in l repeat if not getTarget(x) then putTarget(x,ud)
-    CAR(tar) in '(Matrix SquareMatrix RectangularMatrix) =>
+    first(tar) in '(Matrix SquareMatrix RectangularMatrix) =>
       vec := ['List,underDomainOf tar]
       for x in l repeat if not getTarget(x) then putTarget(x,vec)
   nargs := #l
@@ -1184,11 +1184,11 @@ replaceSharps(x,d) ==
   -- replaces all sharps in x by the arguments of domain d
   -- all replaces the triangle variables
   SL:= NIL
-  for e in CDR d for var in $FormalMapVariableList repeat
+  for e in rest d for var in $FormalMapVariableList repeat
     SL:= CONS(CONS(var,e),SL)
   x := subCopy(x,SL)
   SL:= NIL
-  for e in CDR d for var in $TriangleVariableList repeat
+  for e in rest d for var in $TriangleVariableList repeat
     SL:= CONS(CONS(var,e),SL)
   subCopy(x,SL)
 
@@ -1268,6 +1268,6 @@ listOfDuplicates l ==
 
 deleteAll(x,l) ==
   null l => nil
-  x = CAR(l) => deleteAll(x,CDR l)
+  x = first(l) => deleteAll(x,rest l)
   [first l,:deleteAll(x,rest l)]