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/functor.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/functor.boot')
-rw-r--r-- | src/interp/functor.boot | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/interp/functor.boot b/src/interp/functor.boot index 670fbe22..3860c8e8 100644 --- a/src/interp/functor.boot +++ b/src/interp/functor.boot @@ -104,7 +104,7 @@ DomainPrint1(D,brief,$e) == uu.5 := vv for j in 0..maxIndex vv repeat if vector? vv.j then - l := ASSQ(vv.j,Sublis) + l := objectAssoc(vv.j,Sublis) if l then name:= rest l else @@ -141,7 +141,7 @@ PacPrint v == vv := copyVector v for j in 0..maxIndex vv repeat if vector? vv.j then - l := ASSQ(vv.j,Sublis) + l := objectAssoc(vv.j,Sublis) if l then name := rest l else @@ -151,7 +151,7 @@ PacPrint v == $WhereList := [[name,:vv.j],:$WhereList] vv.j := name if cons? vv.j and vector?(u:=rest vv.j) then - l := ASSQ(u,Sublis) + l := objectAssoc(u,Sublis) if l then name := rest l else @@ -168,9 +168,9 @@ DomainPrintSubst(item,Sublis) == c2 := DomainPrintSubst(b,Sublis) sameObject?(c1,a) and sameObject?(c2,b) => item [c1,:c2] - l := ASSQ(item,Sublis) + l := objectAssoc(item,Sublis) l => rest l - l := ASSQ(item,Sublis) + l := objectAssoc(item,Sublis) l => rest l item @@ -309,7 +309,7 @@ worthlessCode x == cons5(p,l) == l and (CAAR l = first p) => [p,: rest l] # l < 5 => [p,:l] - QCDDDDR(l).rest := nil + l.rest.rest.rest.rest.rest := nil [p,:l] SetDomainSlots124(dom,names,vals) == @@ -329,7 +329,7 @@ sublisProp(subst,props) == --keep original CONS cond is ['or,:x] => (or/[inspect(u,subst) for u in x] => [a,true,:l]; nil) - cond is ["has",nam,b] and (val:= ASSQ(nam,subst)) => + cond is ["has",nam,b] and (val := objectAssoc(nam,subst)) => ev := b is ['ATTRIBUTE,c] => HasAttribute(rest val,c) b is ['SIGNATURE,c] => HasSignature(rest val,c) @@ -852,9 +852,9 @@ getCaps x == getAbbreviation(name,c) == --returns abbreviation of name with c arguments x := getConstructorAbbreviationFromDB name - X := ASSQ(x,$abbreviationTable) => - N:= ASSQ(name,rest X) => - C:= ASSQ(c,rest N) => rest C --already there + X := objectAssoc(x,$abbreviationTable) => + N := objectAssoc(name,rest X) => + C := objectAssoc(c,rest N) => rest C --already there newAbbreviation:= mkAbbrev(X,x) N.rest := [[c,:newAbbreviation],:rest N] newAbbreviation |