diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-04-14 01:59:56 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-04-14 01:59:56 +0000 |
| commit | 663089e7f95f4901a46939ef34c60982dd5aadda (patch) | |
| tree | 591d333d98a1eaf5b3c22d57e75ece8c56f9619b /src/interp/showimp.boot | |
| parent | c5659a8580de5b531891c6703465c84add9fbb1b (diff) | |
| download | open-axiom-663089e7f95f4901a46939ef34c60982dd5aadda.tar.gz | |
Various cleanups.
Diffstat (limited to 'src/interp/showimp.boot')
| -rw-r--r-- | src/interp/showimp.boot | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/interp/showimp.boot b/src/interp/showimp.boot index a3ff694e..f6cea219 100644 --- a/src/interp/showimp.boot +++ b/src/interp/showimp.boot @@ -51,7 +51,7 @@ showImp(dom,:options) == missingOnlyFlag := KAR options domainForm := devaluate dom [nam,:$domainArgs] := domainForm - $predicateList: local := GETDATABASE(nam,'PREDICATES) + $predicateList: local := getConstructorPredicatesFromDB nam predVector := dom.3 u := getDomainOpTable(dom,true) --sort into 4 groups: domain exports, unexports, default exports, others @@ -99,7 +99,7 @@ showFrom(D,:option) == alist := nil domainForm := devaluate D [nam,:.] := domainForm - $predicateList: local := GETDATABASE(nam,'PREDICATES) + $predicateList: local := getConstructorPredicatesFromDB nam for (opSig := [op,sig]) in getDomainSigs1(D,ops) repeat u := from?(D,op,sig) x := ASSOC(u,alist) => RPLACD(x,[opSig,:rest x]) @@ -114,13 +114,13 @@ showFrom(D,:option) == getDomainOps D == domname := D.0 conname := CAR domname - $predicateList: local := GETDATABASE(conname,'PREDICATES) + $predicateList: local := getConstructorPredicatesFromDB conname REMDUP listSort(function GLESSEQP,ASSOCLEFT getDomainOpTable(D,nil)) getDomainSigs(D,:option) == domname := D.0 conname := CAR domname - $predicateList: local := GETDATABASE(conname,'PREDICATES) + $predicateList: local := getConstructorPredicatesFromDB conname getDomainSigs1(D,first option) getDomainSigs1(D,ops) == listSort(function GLESSEQP,u) where @@ -129,7 +129,7 @@ getDomainSigs1(D,ops) == listSort(function GLESSEQP,u) where getDomainDocs(D,:option) == domname := D.0 conname := CAR domname - $predicateList: local := GETDATABASE(conname,'PREDICATES) + $predicateList: local := getConstructorPredicatesFromDB conname ops := KAR option [[op,sig,:getInheritanceByDoc(D,op,sig)] for [op,sig] in getDomainSigs1(D,ops)] @@ -180,7 +180,7 @@ getInheritanceByDoc(D,op,sig,:options) == where fn() == getDocDomainForOpSig(op,sig,substDomainArgs(D,x),D) getDocDomainForOpSig(op,sig,dollar,D) == - (u := LASSOC(op,GETDATABASE(CAR dollar,'DOCUMENTATION))) + (u := LASSOC(op,getConstructorDocumentationFromDB CAR dollar)) and (doc := or/[[d,dollar] for [s,:d] in u | compareSig(sig,s,D,dollar)]) --======================================================================= @@ -209,7 +209,7 @@ showPredicates dom == sayBrightly '"--------------------Predicate summary-------------------" conname := CAR dom.0 predvector := dom.3 - predicateList := GETDATABASE(conname,'PREDICATES) + predicateList := getConstructorPredicateFromDB conname for i in 1.. for p in predicateList repeat prefix := testBitVector(predvector,i) => '"true : " |