aboutsummaryrefslogtreecommitdiff
path: root/src/interp/as.boot
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2009-09-26 13:49:18 +0000
committerdos-reis <gdr@axiomatics.org>2009-09-26 13:49:18 +0000
commit91bd7571dc0baf8d17047d553e4616dd587c0ffb (patch)
tree2e2a2eb23ff2cb76b6eb3ae763a480ac1f0078ad /src/interp/as.boot
parent868f1d56a5bcd7d712855e98085e0e15d32a3264 (diff)
downloadopen-axiom-91bd7571dc0baf8d17047d553e4616dd587c0ffb.tar.gz
* interp/: More cleanup.
Diffstat (limited to 'src/interp/as.boot')
-rw-r--r--src/interp/as.boot18
1 files changed, 9 insertions, 9 deletions
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]