diff options
| -rw-r--r-- | src/algebra/list.spad.pamphlet | 2 | ||||
| -rw-r--r-- | src/algebra/strap/LIST.lsp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/algebra/list.spad.pamphlet b/src/algebra/list.spad.pamphlet index 2ac22b9f..89d79936 100644 --- a/src/algebra/list.spad.pamphlet +++ b/src/algebra/list.spad.pamphlet @@ -270,7 +270,7 @@ List(S:Type): Exports == Implementation where IndexedList(S, LISTMININDEX) add import %nil: % from Foreign Builtin import %peq: (%,%) -> Boolean from Foreign Builtin - import %makepair: (S,%) -> S from Foreign Builtin + import %makepair: (S,%) -> % from Foreign Builtin nil == %nil null l == %peq(l,%nil) diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp index d2431d27..c0e755de 100644 --- a/src/algebra/strap/LIST.lsp +++ b/src/algebra/strap/LIST.lsp @@ -3,17 +3,18 @@ (DECLAIM (FTYPE (FUNCTION (|%Shell|) |%List|) |LIST;nil;$;1|)) -(PUT '|LIST;nil;$;1| '|SPADreplace| '(XLAM NIL NIL)) +(PUT '|LIST;nil;$;1| '|SPADreplace| '(XLAM NIL |%nil|)) (DECLAIM (FTYPE (FUNCTION (|%List| |%Shell|) |%Boolean|) |LIST;null;$B;2|)) -(PUT '|LIST;null;$B;2| '|SPADreplace| 'NULL) +(PUT '|LIST;null;$B;2| '|SPADreplace| + '(XLAM (|l|) (|%peq| |l| |%nil|))) (DECLAIM (FTYPE (FUNCTION (|%Thing| |%List| |%Shell|) |%List|) |LIST;cons;S2$;3|)) -(PUT '|LIST;cons;S2$;3| '|SPADreplace| 'CONS) +(PUT '|LIST;cons;S2$;3| '|SPADreplace| '|%makepair|) (DECLAIM (FTYPE (FUNCTION (|%List| |%List| |%Shell|) |%List|) |LIST;append;3$;4|)) |