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/modemap.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/modemap.boot')
| -rw-r--r-- | src/interp/modemap.boot | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/modemap.boot b/src/interp/modemap.boot index 6d0c700b..16fc9084 100644 --- a/src/interp/modemap.boot +++ b/src/interp/modemap.boot @@ -79,7 +79,7 @@ domainMember(dom,domList) == or/[modeEqual(dom,d) for d in domList] getModemap(x is [op,:.],e) == for modemap in get(op,'modemap,e) repeat if u:= compApplyModemap(x,modemap,e) then return - ([.,.,sl]:= u; SUBLIS(sl,modemap)) + ([.,.,sl]:= u; applySubst(sl,modemap)) getUniqueSignature(form,e) == [[.,:sig],:.]:= getUniqueModemap(first form,#rest form,e) or return nil @@ -251,7 +251,7 @@ augModemapsFromDomain1(name,functorForm,e) == substituteCategoryArguments(argl,catform) == argl:= substitute("$$","$",argl) arglAssoc:= [[INTERNL("#",STRINGIMAGE i),:a] for i in 1.. for a in argl] - SUBLIS(arglAssoc,catform) + applySubst(arglAssoc,catform) --Called, by compDefineFunctor, to add modemaps for $ that may --be equivalent to those of Rep. We must check that these @@ -308,7 +308,7 @@ augModemapsFromCategory(domainName,domainView,functorForm,categoryForm,e) == -- --this is particularly dirty and should be cleaned up, say, by wrapping -- -- an appropriate lambda expression around mapping forms -- domainForm is [op,:l] and l => --- get(op,'modemap,e) is [[[mc,:.],:.]] => SUBLIS(PAIR(rest mc,l),catForm) +-- get(op,'modemap,e) is [[[mc,:.],:.]] => applySubst(PAIR(rest mc,l),catForm) -- catForm evalAndSub(domainName,viewName,functorForm,form,$e) == |