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/g-opt.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/g-opt.boot')
-rw-r--r-- | src/interp/g-opt.boot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interp/g-opt.boot b/src/interp/g-opt.boot index ab1006e9..eceeae89 100644 --- a/src/interp/g-opt.boot +++ b/src/interp/g-opt.boot @@ -261,7 +261,7 @@ optCall (x is ['%call,:u]) == u is [['XLAM,vars,body],:args] => atom vars => body #vars > #args => systemErrorHere ['optCall,x] - resetTo(x,optXLAMCond SUBLIS(pairList(vars,args),body)) + resetTo(x,optXLAMCond applySubst(pairList(vars,args),body)) [fn,:a] := u atom fn => opt := fn has OPTIMIZE => resetTo(x,FUNCALL(opt,u)) @@ -595,9 +595,9 @@ optLET u == clause isnt [test,stmt] => continue := false -- Stop inlining at least one test is not simple not isSimpleVMForm test => continue := false - clause.first := SUBLIS(substPairs,test) + clause.first := applySubst(substPairs,test) isSimpleVMForm stmt => - clause.rest.first := SUBLIS(substPairs,stmt) + clause.rest.first := applySubst(substPairs,stmt) continue := false continue => body u @@ -610,7 +610,7 @@ optLET u == def := first defs atom def => systemErrorHere ["optLET",def] -- cannot happen def.rest := second def - SUBLIS(inits,body) + applySubst(inits,body) optBind form == form isnt ['%bind,inits,.] => form -- accept only simple bodies |