diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-05-01 21:02:41 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-05-01 21:02:41 +0000 |
| commit | 50ffaabb3e56f7dec884c7e44c0fc0296772dfc8 (patch) | |
| tree | 6e24f407fb4d1b871135cba4d7c794564b939874 /src/boot/strap | |
| parent | edaf84d62bf70e3e3ad6ea4f910397f03b77688b (diff) | |
| download | open-axiom-50ffaabb3e56f7dec884c7e44c0fc0296772dfc8.tar.gz | |
* boot/utility.boot (applySubstNQ): New.
* interp/compiler.boot (finishLambdaExpression): Use it.
* interp/i-intern.boot (mkAtreeExpandMacros): Likewise.
* interp/i-map.boot (addMap): Likewise.
* interp/vmlisp.lisp (SUBLISNQ, SUBANQ, SUBB): Remove.
Diffstat (limited to 'src/boot/strap')
| -rw-r--r-- | src/boot/strap/utility.clisp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/boot/strap/utility.clisp b/src/boot/strap/utility.clisp index e399057f..f10a1749 100644 --- a/src/boot/strap/utility.clisp +++ b/src/boot/strap/utility.clisp @@ -9,7 +9,13 @@ |scalarMember?| |listMember?| |reverse| |reverse!| |lastNode| |append| |append!| |copyList| |substitute| |substitute!| |setDifference| |applySubst| |applySubst!| - |remove| |removeSymbol|)) + |applySubstNQ| |remove| |removeSymbol|)) + +(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Thing|) |%Thing|) + |substitute|)) + +(DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Thing|) |%Thing|) + |substitute!|)) (DECLAIM (FTYPE (FUNCTION ((|%List| |%Thing|) (|%List| |%Thing|)) (|%List| |%Thing|)) @@ -204,6 +210,23 @@ (CDR |p|)) (T |t|))))) +(DEFUN |applySubstNQ| (|sl| |t|) + (PROG (|p| |tl| |hd|) + (RETURN + (COND + ((AND (CONSP |t|) + (PROGN (SETQ |hd| (CAR |t|)) (SETQ |tl| (CDR |t|)) T)) + (COND + ((EQ |hd| 'QUOTE) |t|) + (T (SETQ |hd| (|applySubstNQ| |sl| |hd|)) + (SETQ |tl| (|applySubstNQ| |sl| |tl|)) + (COND + ((AND (EQ |hd| (CAR |t|)) (EQ |tl| (CDR |t|))) |t|) + (T (CONS |hd| |tl|)))))) + ((AND (SYMBOLP |t|) (SETQ |p| (|assocSymbol| |t| |sl|))) + (CDR |p|)) + (T |t|))))) + (DEFUN |setDifference| (|x| |y|) (PROG (|a| |l| |p|) (RETURN |