From 91bd7571dc0baf8d17047d553e4616dd587c0ffb Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sat, 26 Sep 2009 13:49:18 +0000
Subject: 	* interp/: More cleanup.

---
 src/interp/as.boot | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/interp/as.boot')

diff --git a/src/interp/as.boot b/src/interp/as.boot
index b6c7a2d2..a167c97e 100644
--- a/src/interp/as.boot
+++ b/src/interp/as.boot
@@ -149,7 +149,7 @@ asMakeAlist con ==
 --children:= mySort HGET($childrenHash,con)
   alists  := HGET($opHash,con)
   opAlist := SUBLISLIS($FormalMapVariableList,KDR form,CDDR alists)
-  ancestorAlist:= SUBLISLIS($FormalMapVariableList,KDR form,CAR alists)
+  ancestorAlist:= SUBLISLIS($FormalMapVariableList,KDR form,first alists)
   catAttrs := [[x,:true] for x in getAttributesFromCATEGORY $constructorCategory]
   attributeAlist := REMDUP [:second alists,:catAttrs]
   documentation :=
@@ -556,12 +556,12 @@ asytranApply(['Apply,name,:arglist],levels,local?) ==
     [name,:[asytranApplySpecial(x, levels, local?) for x in arglist]]
   null arglist => [name]
   name is [ 'RestrictTo, :.] => 
-    asytranApply(['Apply, CAR CDR name,:arglist], levels, local?)
+    asytranApply(['Apply, first rest name,:arglist], levels, local?)
   name is [ 'Qualify, :.] => 
-    asytranApply(['Apply, CAR CDR name,:arglist], levels, local?)
-  name is 'string => asytranLiteral CAR arglist
-  name is 'integer => asytranLiteral CAR arglist
-  name is 'float => asytranLiteral CAR arglist
+    asytranApply(['Apply, first rest name,:arglist], levels, local?)
+  name is 'string => asytranLiteral first arglist
+  name is 'integer => asytranLiteral first arglist
+  name is 'float => asytranLiteral first arglist
   name = 'Enumeration =>
     ["Enumeration",:[asytranEnumItem arg for arg in arglist]]
   [:argl,lastArg] := arglist
@@ -569,7 +569,7 @@ asytranApply(['Apply,name,:arglist],levels,local?) ==
           asytranFormSpecial(lastArg,levels,false)]
 
 asytranLiteral(lit) ==
-  CAR CDR lit
+  first rest lit
 
 asytranEnumItem arg ==
   arg is ['Declare, name, :.] => name
@@ -872,7 +872,7 @@ asyTypeJoin r ==
   conpart := asyTypeJoinStack REVERSE $conStack
   conpart =>
     catpart     => ['Join,:conpart,catpart]
-    CDR conpart => ['Join,:conpart]
+    rest conpart => ['Join,:conpart]
     conpart
   catpart
 
@@ -974,7 +974,7 @@ asyFindAttrs l ==
   notattrs := []
   for x in l repeat 
     x0 := x
-    while CONSP x repeat x := CAR x
+    while CONSP x repeat x := first x
     if MEMQ(x, $BuiltinAttributes) then attrs := [:attrs, x]
     else notattrs := [:notattrs, x0]
   [attrs, notattrs]
-- 
cgit v1.2.3