diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-09-26 13:49:18 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-09-26 13:49:18 +0000 |
| commit | 91bd7571dc0baf8d17047d553e4616dd587c0ffb (patch) | |
| tree | 2e2a2eb23ff2cb76b6eb3ae763a480ac1f0078ad /src/interp/g-util.boot | |
| parent | 868f1d56a5bcd7d712855e98085e0e15d32a3264 (diff) | |
| download | open-axiom-91bd7571dc0baf8d17047d553e4616dd587c0ffb.tar.gz | |
* interp/: More cleanup.
Diffstat (limited to 'src/interp/g-util.boot')
| -rw-r--r-- | src/interp/g-util.boot | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot index c6241500..6e81bee5 100644 --- a/src/interp/g-util.boot +++ b/src/interp/g-util.boot @@ -178,8 +178,8 @@ get(x,prop,e) == get0(x,prop,e) == not atom x => get(QCAR x,prop,e) - u:= QLASSQ(x,CAR QCAR e) => QLASSQ(prop,u) - (tail:= CDR QCAR e) and (u:= fastSearchCurrentEnv(x,tail)) => + u:= QLASSQ(x,first QCAR e) => QLASSQ(prop,u) + (tail:= rest QCAR e) and (u:= fastSearchCurrentEnv(x,tail)) => QLASSQ(prop,u) nil @@ -339,12 +339,12 @@ length2? l == CONSP l and CONSP (l := QCDR l) and not CONSP QCDR l pairList(u,v) == [[x,:y] for x in u for y in v] -- GETALIST(alist,prop) == IFCDR assoc(prop,alist) -GETALIST(alist,prop) == CDR assoc(prop,alist) +GETALIST(alist,prop) == rest assoc(prop,alist) PUTALIST(alist,prop,val) == null alist => [[prop,:val]] pair := assoc(prop,alist) => - CDR pair = val => alist + rest pair = val => alist -- else we fall over Lucid's read-only storage feature again QRPLACD(pair,val) alist @@ -355,8 +355,8 @@ REMALIST(alist,prop) == null alist => alist alist is [[ =prop,:.],:r] => null r => NIL - QRPLACA(alist,CAR r) - QRPLACD(alist,CDR r) + QRPLACA(alist,first r) + QRPLACD(alist,rest r) alist null rest alist => alist l := alist @@ -550,7 +550,7 @@ listSort(pred,list,:optional) == NOT functionp pred => error "listSort: first arg must be a function" NOT LISTP list => error "listSort: second argument must be a list" NULL optional => mergeSort(pred,function Identity,list,LENGTH list) - key := CAR optional + key := first optional NOT functionp key => error "listSort: last arg must be a function" mergeSort(pred,key,list,LENGTH list) @@ -804,8 +804,8 @@ intern x == x isDomain a == - CONSP a and VECP(CAR a) and - member(CAR(a).0, $domainTypeTokens) + CONSP a and VECP(first a) and + member(first(a).0, $domainTypeTokens) -- variables used by browser |