aboutsummaryrefslogtreecommitdiff
path: root/src/interp/cattable.boot
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2010-05-08 16:42:11 +0000
committerdos-reis <gdr@axiomatics.org>2010-05-08 16:42:11 +0000
commit20462739ac81a89fa81ff9576969c7a8d8952ea3 (patch)
tree7a244e33858c5d50dfd225d1405d4487bfe8fc08 /src/interp/cattable.boot
parent9306af57a53ceace77f8f0cfea65f6ceed76d5c1 (diff)
downloadopen-axiom-20462739ac81a89fa81ff9576969c7a8d8952ea3.tar.gz
* interp/as.boot: Replace uses of RPLACA and RPLACD with explicit
assignment to first and rest fields. * interp/astr.boot: Likewise. * interp/br-con.boot: Likewise. * interp/br-data.boot: Likewise. * interp/br-op1.boot: Likewise. * interp/br-saturn.boot: Likewise. * interp/buildom.boot: Likewise. * interp/c-doc.boot: Likewise. * interp/c-util.boot: Likewise. * interp/cattable.boot: Likewise. * interp/clam.boot: Likewise. * interp/compiler.boot: Likewise. * interp/compress.boot: Likewise. * interp/cparse.boot: Likewise. * interp/cstream.boot: Likewise. * interp/database.boot: Likewise. * interp/define.boot: Likewise. * interp/dq.boot: Likewise. * interp/functor.boot: Likewise. * interp/g-opt.boot: Likewise. * interp/g-util.boot: Likewise. * interp/guess.boot: Likewise. * interp/ht-util.boot: Likewise. * interp/i-analy.boot: Likewise. * interp/i-coerfn.boot: Likewise. * interp/i-funsel.boot: Likewise. * interp/i-object.boot: Likewise. * interp/i-output.boot: Likewise. * interp/i-resolv.boot: Likewise. * interp/i-spec1.boot: Likewise. * interp/i-spec2.boot: Likewise. * interp/i-syscmd.boot: Likewise. * interp/i-util.boot: Likewise. * interp/interop.boot: Likewise. * interp/mark.boot: Likewise. * interp/modemap.boot: Likewise. * interp/msgdb.boot: Likewise. * interp/newfort.boot: Likewise. * interp/nruncomp.boot: Likewise. * interp/nrunopt.boot: Likewise. * interp/packtran.boot: Likewise. * interp/showimp.boot: Likewise. * interp/termrw.boot: Likewise. * interp/topics.boot: Likewise. * interp/trace.boot: Likewise. * interp/wi2.boot: Likewise. * interp/word.boot: Likewise.
Diffstat (limited to 'src/interp/cattable.boot')
-rw-r--r--src/interp/cattable.boot22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot
index f487146e..b55d6b62 100644
--- a/src/interp/cattable.boot
+++ b/src/interp/cattable.boot
@@ -77,7 +77,7 @@ genCategoryTable() ==
simpTempCategoryTable() ==
for id in HKEYS _*ANCESTORS_-HASH_* repeat
for (u:=[a,:b]) in getConstructorAncestorsFromDB id repeat
- RPLACD(u,simpHasPred b)
+ u.rest := simpHasPred b
simpCategoryTable() == main where
main() ==
@@ -199,7 +199,7 @@ genTempCategoryTable() ==
for id in HKEYS _*ANCESTORS_-HASH_* repeat
item := HGET(_*ANCESTORS_-HASH_*, id)
for (u:=[.,:b]) in item repeat
- RPLACD(u,simpCatPredicate simpBool b)
+ u.rest := simpCatPredicate simpBool b
HPUT(_*ANCESTORS_-HASH_*,id,listSort(function GLESSEQP,item))
addToCategoryTable con ==
@@ -217,9 +217,9 @@ encodeCategoryAlist(id,alist) ==
argl => [[argl,:b]]
b
u:= assoc(key,newAl) =>
- argl => RPLACD(u,encodeUnion(id,first newEntry,rest u))
+ argl => u.rest := encodeUnion(id,first newEntry,rest u)
if newEntry ~= rest u then
- p:= moreGeneralCategoryPredicate(id,newEntry,rest u) => RPLACD(u,p)
+ p:= moreGeneralCategoryPredicate(id,newEntry,rest u) => u.rest := p
sayMSG '"Duplicate entries:"
PRINT [newEntry,rest u]
newAl:= [[key,:newEntry],:newAl]
@@ -227,7 +227,7 @@ encodeCategoryAlist(id,alist) ==
encodeUnion(id,new:=[a,:b],alist) ==
u := assoc(a,alist) =>
- RPLACD(u,moreGeneralCategoryPredicate(id,b,rest u))
+ u.rest := moreGeneralCategoryPredicate(id,b,rest u)
alist
[new,:alist]
@@ -310,7 +310,7 @@ catPairUnion(oldList,newList,op,cat) ==
for pair in newList repeat
u:= assoc(first pair,oldList) =>
rest u = rest pair => nil
- RPLACD(u,addConflict(rest pair,rest u)) where addConflict(new,old) ==
+ u.rest := addConflict(rest pair,rest u) where addConflict(new,old) ==
quickOr(new,old)
oldList:= [pair,:oldList]
oldList
@@ -424,8 +424,8 @@ compressSexpr(x,left,right) ==
-- recursive version of compressHashTable
atom x => nil
u:= HGET($found,x) =>
- left => RPLACA(left,u)
- right => RPLACD(right,u)
+ left => left.first := u
+ right => right.rest := u
nil
compressSexpr(first x,x,nil)
compressSexpr(rest x,nil,x)
@@ -444,14 +444,14 @@ squeeze1(l) ==
z:= member(x,$found) => first z
$found:= CONS(x,$found)
squeeze1 x
- RPLACA(l,y)
+ l.first := y
x:= rest l
y:=
atom x => x
z:= member(x,$found) => first z
$found:= CONS(x,$found)
squeeze1 x
- RPLACD(l,y)
+ l.rest := y
updateCategoryTable(cname,kind) ==
$updateCatTableIfTrue =>
@@ -469,7 +469,7 @@ updateCategoryTableForCategory(cname) ==
addToCategoryTable(cname)
for id in HKEYS _*ANCESTORS_-HASH_* repeat
for (u:=[.,:b]) in getConstructorAncestorsFromDB id repeat
- RPLACD(u,simpCatPredicate simpBool b)
+ u.rest := simpCatPredicate simpBool b
updateCategoryTableForDomain(cname,category) ==
clearCategoryTable(cname)