diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-10-02 03:35:59 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-10-02 03:35:59 +0000 |
| commit | 8640c7b9aa33084d77770f435814d1d8558c8e2e (patch) | |
| tree | 968ff56d45b80dcc8ad3002703025cf27995e155 /src/interp/define.boot | |
| parent | 496ca25659180bb29cc5fea2f3c0337695d742d3 (diff) | |
| download | open-axiom-8640c7b9aa33084d77770f435814d1d8558c8e2e.tar.gz | |
* boot/utility.boot (objectAssoc): New. Export.
* boot/ast.boot: Use it. instead of ASSOC.
* boot/translator.boot (packageBody): Tidy.
* interp/astr.boot: Use objectAssoc instead of ASSQ.
* interp/br-con.boot: Likewise.
* interp/br-op1.boot: Likewise.
* interp/br-saturn.boot: Likewise.
* interp/buildom.boot: Likewise.
* interp/c-util.boot: Likewise.
* interp/category.boot: Likewise.
* interp/clam.boot: Likewise.
* interp/compiler.boot: Likewise.
* interp/define.boot: Likewise.
* interp/functor.boot: Likewise.
* interp/g-util.boot: Likewise.
* interp/i-coerce.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-special.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/i-util.boot: Likewise.
* interp/int-top.boot: Likewise.
* interp/lisplib.boot: Likewise.
* interp/msg.boot: Likewise.
* interp/posit.boot: Likewise.
* interp/termrw.boot: Likewise.
* interp/trace.boot: Likewise.
* interp/sys-utility.boot (upwardCut): New.
* interp/spad.lisp: Use it.
* interp/util.lisp: Likewise.
* interp/spaderror.lisp: Likewise.
* interp/vmlisp.lisp (ASSEMBLE): Remove.
(ASSQ): Likewise.
(MEMQ): Likewise.
(NAMEDERRSET): Likewise.
(ORADDTEMPDEFS): Likewise.
* interp/macros.lisp (QLASSQ): Move to vmlisp.lisp.
(LASSQ): Remove.
Diffstat (limited to 'src/interp/define.boot')
| -rw-r--r-- | src/interp/define.boot | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interp/define.boot b/src/interp/define.boot index 2b3c9ab1..a3911f27 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -1553,7 +1553,7 @@ makeFunctorArgumentParameters(argl,sigl,target) == for u in ss repeat $ConditionalOperators:=[rest u,:$ConditionalOperators] s is ['Join,:sl] => - u:=ASSQ('CATEGORY,ss) => + u := objectAssoc('CATEGORY,ss) => MSUBST([:u,:ss],u,s) ['Join,:sl,['CATEGORY,'package,:ss]] ['Join,s,['CATEGORY,'package,:ss]] @@ -1602,7 +1602,7 @@ mkOpVec(dom,siglist) == --new form is (<op> <signature> <slotNumber> <condition> <kind>) ops := newVector #siglist for (opSig:= [op,sig]) in siglist for i in 0.. repeat - u:= ASSQ(op,oplist) + u := objectAssoc(op,oplist) assoc(sig,u) is [.,n,.,'ELT] => vectorRef(ops,i) := vectorRef(dom,n) noplist := applySubst(substargs,u) |