diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-01-02 10:09:37 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-01-02 10:09:37 +0000 |
| commit | 2b2ae9894f66dba65af62fb08b9d79b2aee2a2a8 (patch) | |
| tree | a993fb841dbecc560c217651a8504f23ed526481 /src/algebra/strap/ILIST.lsp | |
| parent | b9a4e3cd1880e977a827a98b1cb69175e7ad1e74 (diff) | |
| download | open-axiom-2b2ae9894f66dba65af62fb08b9d79b2aee2a2a8.tar.gz | |
* interp/nrunfast.boot (evalSlotDomain): Expand to VM forms before
value argument evaluation.
(lazyMatch): Check for %llength too.
* interp/g-opt.boot ($VMsideEffectFreeOperators): Include %2bit
and %2bool.
* interp/g-util.boot: Expand them.
* interp/define.boot (compJoin): Check for %llenght too.
* algebra/boolean.spad.pamphlet: Tidy.
* algebra/domain.spad.pamphlet: Likewise.
* algebra/draw.spad.pamphlet: Likewise.
* algebra/files.spad.pamphlet: Likewise.
* algebra/list.spad.pamphlet: Likewise.
* algebra/outform.spad.pamphlet: Likewise.
* algebra/sex.spad.pamphlet: Likewise.
* algebra/sf.spad.pamphlet: Likewise.
Diffstat (limited to 'src/algebra/strap/ILIST.lsp')
| -rw-r--r-- | src/algebra/strap/ILIST.lsp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp index 70b228e2..f8d9855d 100644 --- a/src/algebra/strap/ILIST.lsp +++ b/src/algebra/strap/ILIST.lsp @@ -4,7 +4,7 @@ (DECLAIM (FTYPE (FUNCTION (|%List| |%Shell|) (|%IntegerSection| 0)) |ILIST;#;$Nni;1|)) -(PUT '|ILIST;#;$Nni;1| '|SPADreplace| 'LENGTH) +(PUT '|ILIST;#;$Nni;1| '|SPADreplace| '|%llength|) (DECLAIM (FTYPE (FUNCTION (|%Thing| |%List| |%Shell|) |%List|) |ILIST;concat;S2$;2|)) @@ -73,12 +73,12 @@ (DECLAIM (FTYPE (FUNCTION (|%List| |%Shell|) |%List|) |ILIST;reverse!;2$;16|)) -(PUT '|ILIST;reverse!;2$;16| '|SPADreplace| 'NREVERSE) +(PUT '|ILIST;reverse!;2$;16| '|SPADreplace| '|%lreverse!|) (DECLAIM (FTYPE (FUNCTION (|%List| |%Shell|) |%List|) |ILIST;reverse;2$;17|)) -(PUT '|ILIST;reverse;2$;17| '|SPADreplace| 'REVERSE) +(PUT '|ILIST;reverse;2$;17| '|SPADreplace| '|%lreverse|) (DECLAIM (FTYPE (FUNCTION (|%List| |%Shell|) |%Integer|) |ILIST;minIndex;$I;18|)) @@ -121,7 +121,9 @@ |%List|) |ILIST;mergeSort|)) -(DEFUN |ILIST;#;$Nni;1| (|x| $) (DECLARE (IGNORE $)) (LENGTH |x|)) +(DEFUN |ILIST;#;$Nni;1| (|x| $) + (DECLARE (IGNORE $)) + (LIST-LENGTH |x|)) (DEFUN |ILIST;concat;S2$;2| (|s| |x| $) (DECLARE (IGNORE $)) @@ -336,7 +338,7 @@ (EXIT |l|)))))) (DEFUN |ILIST;sort!;M2$;27| (|f| |l| $) - (|ILIST;mergeSort| |f| |l| (LENGTH |l|) $)) + (|ILIST;mergeSort| |f| |l| (LIST-LENGTH |l|) $)) (DEFUN |ILIST;merge!;M3$;28| (|f| |p| |q| $) (PROG (|r| |t|) |