* interp/: More cleanup.

1 files changed, 13 insertions, 13 deletions

diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot
index 01c42858..96b11193 100644
--- a/src/interp/i-analy.boot
+++ b/src/interp/i-analy.boot
@@ -138,10 +138,10 @@ pushDownTargetInfo(op,target,arglist) ==
   2 = nargs =>
     op = "*" =>            -- only push down on 1st arg if not immed
       if not getTarget second arglist then putTarget(second arglist,target)
-      getTarget(x := CAR arglist) => NIL
+      getTarget(x := first arglist) => NIL
       if getUnname(x) ~= $immediateDataSymbol then putTarget(x,target)
     op = "**" or op = "^" =>           -- push down on base
-      if not getTarget CAR arglist then putTarget(CAR arglist,target)
+      if not getTarget first arglist then putTarget(first arglist,target)
     (op = 'equation) and (target is ['Equation,S]) =>
       for x in arglist repeat
         if not getTarget(x) then putTarget(x,S)
@@ -166,7 +166,7 @@ pushDownTargetInfo(op,target,arglist) ==
 pushDownOnArithmeticVariables(op,target,arglist) ==
   -- tries to push appropriate target information onto variable
   -- occurring in arithmetic expressions
-  CONSP(target) and CAR(target) = 'Variable => NIL
+  CONSP(target) and first(target) = 'Variable => NIL
   not MEMQ(op,'(_+ _- _* _*_* _/)) => NIL
   not containsPolynomial(target)   => NIL
   for x in arglist for i in 1.. repeat
@@ -270,7 +270,7 @@ bottomUp t ==
     -- given no target or package calling, force integer constants to
     -- belong to tightest possible subdomain
 
-    op := CAR t                -- may have changed in bottomUpElt
+    op := first t              -- may have changed in bottomUpElt
     $useIntegerSubdomain and null tar and null dol and
       isEqualOrSubDomain(first ms,$Integer) =>
         val := objVal getValue op
@@ -302,7 +302,7 @@ bottomUpCompile t ==
 bottomUpUseSubdomain t ==
   $useIntegerSubdomain : local := true
   ms := bottomUp t
-  ($immediateDataSymbol ~= getUnname(t)) or ($Integer ~= CAR(ms)) => ms
+  ($immediateDataSymbol ~= getUnname(t)) or ($Integer ~= first(ms)) => ms
   null INTEGERP(num := objValUnwrap getValue t) => ms
   o := getBasicObject(num)
   putValue(t,o)
@@ -596,7 +596,7 @@ bottomUpForm0(t,op,opName,argl,argModeSetList) ==
     -- this is a hack until Records go through the normal
     -- modemap selection process
     rtype := ['Record,:rargs]
-    code := optRECORDCOPY(['RECORDCOPY,getArgValue(CAR argl, rtype),#rargs])
+    code := optRECORDCOPY(['RECORDCOPY,getArgValue(first argl, rtype),#rargs])
 
     if $genValue then code := wrap timedEVALFUN code
     val := objNew(code,rtype)
@@ -754,7 +754,7 @@ bottomUpFormRetract(t,op,opName,argl,amsl) ==
     (i = 1) and (opName = "set!") =>
         a := [x,:a]
         ms := [m,:ms]
-    if CONSP(m) and CAR(m) = $EmptyMode then return NIL
+    if CONSP(m) and first(m) = $EmptyMode then return NIL
     object:= retract getValue x
     a:= [x,:a]
     object="failed" =>
@@ -840,8 +840,8 @@ bottomUpElt (form:=[op,:argl]) ==
 
     ms := bottomUp op
     ms and (ms is [['Union,:.]] or ms is [['Record,:.]]) =>
-        RPLAC(CDR form, [op,:argl])
-        RPLAC(CAR form, mkAtreeNode "elt")
+        RPLAC(rest form, [op,:argl])
+        RPLAC(first form, 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(CDR form, newArgs)
-            RPLAC(CAR form, newOp)
+            RPLAC(rest form, newArgs)
+            RPLAC(first form, 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(CDR form, newArgs)
-                RPLAC(CAR form, newOp)
+                RPLAC(rest form, newArgs)
+                RPLAC(first form, newOp)
                 u := bottomUp form
     u