diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-04-29 09:51:00 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-04-29 09:51:00 +0000 |
| commit | 52889faf70db19459d18fd18123635479e7266d1 (patch) | |
| tree | dd020d1d4dc6c245bdec5f7b6c2594d4e6f77a18 /src/interp/br-op2.boot | |
| parent | 75b600291e154f55fe8d6d10658980315204ced2 (diff) | |
| download | open-axiom-52889faf70db19459d18fd18123635479e7266d1.tar.gz | |
* boot/utility.boot (assocSymbol): New.
(applySubst): Likewise. Export.
* boot/ast.boot: Use it. Remove SUBLIS and SUBLISLIS.
* interp/ax.boot: Likewise.
* interp/br-con.boot: Likewise.
* interp/br-op1.boot: Likewise.
* interp/br-op2.boot: Likewise.
* interp/br-prof.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/compiler.boot: Likewise.
Diffstat (limited to 'src/interp/br-op2.boot')
| -rw-r--r-- | src/interp/br-op2.boot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/br-op2.boot b/src/interp/br-op2.boot index f8fc5cc9..a7f186e9 100644 --- a/src/interp/br-op2.boot +++ b/src/interp/br-op2.boot @@ -258,7 +258,7 @@ whoUsesOperation(htPage,which,key) == --see dbPresentOps opl := nil for [op,:alist] in opAlist repeat for [sig,:.] in alist repeat - opl := [[op,:SUBLISLIS($FormalMapVariableList,rest conform,sig)],:opl] + opl := [[op,:applySubst(pairList(conform.args,$FormalMapVariableList),sig)],:opl] opl := reverse! opl u := whoUses(opl,conform) prefix := pluralSay(#u,'"constructor uses",'"constructors use") @@ -370,7 +370,7 @@ koOps(conform,domname,:options) == main where -- if relatives? then -- relatives := relativesOf(conform,domname) -- if domname then relatives := --- SUBLISLIS([domname,:rest domname],['_$,:rest conform],relatives) +-- applySubst(pairList(['_$,:conform.args],[domname,:domname.args]),relatives) -- --kill all relatives that have a sharp variable remaining in them -- for x in relatives repeat -- or/[y for y in CDAR x | isSharpVar y] => 'skip @@ -559,7 +559,7 @@ modemap2Sig(op,mm) == false condlist := modemap2SigConds conds [origin, vlist, flist] := getDcForm(dc, condlist) or return nil - subcondlist := SUBLISLIS(flist, vlist, condlist) + subcondlist := applySubst(pairList(vlist,flist),condlist) [predList,vlist, flist] := getSigSubst(subcondlist, nil, vlist, flist) if partial? then target := dcSig . 1 |