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/astr.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/astr.boot')
| -rw-r--r-- | src/interp/astr.boot | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/interp/astr.boot b/src/interp/astr.boot index abbac83c..b68250a5 100644 --- a/src/interp/astr.boot +++ b/src/interp/astr.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2010, Gabriel Dos Reis. +-- Copyright (C) 2007-2011, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -61,9 +61,8 @@ ncAlist x == --- Get the entry for key k on x's association list ncEltQ(x,k) == - r := QASSQ(k,ncAlist x) - null r => ncBug ('S2CB0007,[k]) - rest r + r := objectAssoc(k,ncAlist x) => rest r + ncBug ('S2CB0007,[k]) -- Put (k . v) on the association list of x and return v -- case1: ncPutQ(x,k,v) where k is a key (an identifier), v a value @@ -74,7 +73,7 @@ ncPutQ(x,k,v) == LISTP k => for key in k for val in v repeat ncPutQ(x,key,val) v - r := QASSQ(k,ncAlist x) + r := objectAssoc(k,ncAlist x) if null r then r := [[k,:v], :ncAlist x] x.first := [ncTag x,:r] |