* interp/: More cleanup.

1 files changed, 17 insertions, 17 deletions

diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot
index 8f513175..cd7d955d 100644
--- a/src/interp/br-data.boot
+++ b/src/interp/br-data.boot
@@ -36,7 +36,7 @@ import bc_-util
 namespace BOOT
 
 lefts u ==
-   [x for x in HKEYS  _*HASCATEGORY_-HASH_* | CDR x = u]
+   [x for x in HKEYS  _*HASCATEGORY_-HASH_* | rest x = u]
 
 
 
@@ -234,11 +234,11 @@ dbAugmentConstructorDataTable() ==
     cname := INTERN dbName line
     entry := getCDTEntry(cname,true) =>  --skip over Mapping, Union, Record
        [name,abb,:.] := entry
-       RPLACD(CDR entry,PUTALIST(CDDR entry,'dbLineNumber,fp))
+       RPLACD(rest entry,PUTALIST(CDDR entry,'dbLineNumber,fp))
 --     if xname := constructorHasExamplePage entry then
---       RPLACD(CDR entry,PUTALIST(CDDR entry,'dbExampleFile,xname))
+--       RPLACD(rest entry,PUTALIST(CDDR entry,'dbExampleFile,xname))
        args := IFCDR getConstructorFormFromDB name
-       if args then RPLACD(CDR entry,PUTALIST(CDDR entry,'constructorArgs,args))
+       if args then RPLACD(rest entry,PUTALIST(CDDR entry,'constructorArgs,args))
   'done
 
 dbHasExamplePage conname ==
@@ -476,7 +476,7 @@ getImports conname == --called by mkUsersHashTable
               and not (op in '(Mapping Union Record Enumeration CONS QUOTE local))
     doImport(x,template) ==
       x is [op,:args] =>
-        op = 'QUOTE or op = 'NRTEVAL => CAR args
+        op = 'QUOTE or op = 'NRTEVAL => first args
         op = 'local => first args
         op = 'Record =>
           ['Record,:[[":",second y,doImport(third y,template)] for y in args]]
@@ -578,8 +578,8 @@ childrenOf conform ==
     childAssoc(conform,parentsOfForm first pair)]
 
 childAssoc(form,alist) ==
-  null (argl := CDR form) => assoc(form,alist)
-  u := assocCar(opOf form, alist) => childArgCheck(argl,rest CAR u) and u
+  null (argl := rest form) => assoc(form,alist)
+  u := assocCar(opOf form, alist) => childArgCheck(argl,rest first u) and u
   nil
 
 assocCar(x, al) == or/[pair for pair in al | x = CAAR pair]
@@ -651,7 +651,7 @@ ancestorsAdd(pred,form) == --called by ancestorsRecur
   op := IFCAR form or form
   alist := HGET($if,op)
   existingNode := assoc(form,alist) =>
-    RPLACD(existingNode,quickOr(CDR existingNode,pred))
+    RPLACD(existingNode,quickOr(rest existingNode,pred))
   HPUT($if,op,[[form,:pred],:alist])
 
 domainsOf(conform,domname,:options) ==
@@ -662,7 +662,7 @@ domainsOf(conform,domname,:options) ==
   --u is list of pairs (a . b) where b() = conname
   --we sort u then replace each b by the predicate for which this is true
   s := listSort(function GLESSEQP,COPY u)
-  s := [[CAR pair,:constructorHasCategoryFromDB pair] for pair in s]
+  s := [[first pair,:constructorHasCategoryFromDB pair] for pair in s]
   transKCatAlist(conform,domname,listSort(function GLESSEQP,s))
 
 catsOf(conform,domname,:options) ==
@@ -685,8 +685,8 @@ transKCatAlist(conform,domname,s) == main where
       acc := nil
       rest conform =>
         for pair in s repeat --pair has form [con,[conargs,:pred],...]]
-          leftForm := getConstructorForm CAR pair
-          for (ap := [args,:pred]) in CDR pair repeat
+          leftForm := getConstructorForm first pair
+          for (ap := [args,:pred]) in rest pair repeat
             match? :=
               domargs = args => true
               HAS__SHARP__VAR args => domargs = sublisFormal(KDR domname,args)
@@ -697,17 +697,17 @@ transKCatAlist(conform,domname,s) == main where
         NREVERSE acc
       --conform has no arguments so each pair has form [con,:pred]
       for pair in s repeat
-        leftForm := getConstructorForm CAR pair or systemError nil
+        leftForm := getConstructorForm first pair or systemError nil
         RPLACA(pair,leftForm)
-        RPLACD(pair,sublisFormal(KDR leftForm,CDR pair))
+        RPLACD(pair,sublisFormal(KDR leftForm,rest pair))
       s
     --no domname, so look for special argument combinations
     acc := nil
     KDR conform =>
       farglist := TAKE(#rest conform,$FormalMapVariableList)
       for pair in s repeat --pair has form [con,[conargs,:pred],...]]
-        leftForm := getConstructorForm CAR pair
-        for (ap := [args,:pred]) in CDR pair repeat
+        leftForm := getConstructorForm first pair
+        for (ap := [args,:pred]) in rest pair repeat
           hasArgsForm? := args ~= farglist
           npred := sublisFormal(KDR leftForm,pred)
           if hasArgsForm? then
@@ -719,9 +719,9 @@ transKCatAlist(conform,domname,s) == main where
           acc := [[leftForm,:npred],:acc]
       NREVERSE acc
     for pair in s repeat --pair has form [con,:pred]
-      leftForm := getConstructorForm CAR pair
+      leftForm := getConstructorForm first pair
       RPLACA(pair,leftForm)
-      RPLACD(pair,sublisFormal(KDR leftForm,CDR pair))
+      RPLACD(pair,sublisFormal(KDR leftForm,rest pair))
     s
 
 mkHasArgsPred subargs ==