diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-06-20 15:00:29 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-06-20 15:00:29 +0000 |
| commit | 9cde874de258533a18944602afa62c9e56ac991a (patch) | |
| tree | 0ba1cbbf0a13d8d5085aa411304ff34ca63e7bb0 /src/algebra/strap/LIST.lsp | |
| parent | 4ee9e8c9ec410567f7904da3e3be59c06f059a6c (diff) | |
| download | open-axiom-9cde874de258533a18944602afa62c9e56ac991a.tar.gz | |
* interp/compiler.boot (massageLoop): New.
(compRepeatOrCollect): Use it to generate appropriate %loop forms.
Bind new special variable $mayHaveFreeIteratorVariables.
(complainIfShadowing): Set it as appropriate.
Diffstat (limited to 'src/algebra/strap/LIST.lsp')
| -rw-r--r-- | src/algebra/strap/LIST.lsp | 85 |
1 files changed, 44 insertions, 41 deletions
diff --git a/src/algebra/strap/LIST.lsp b/src/algebra/strap/LIST.lsp index 4f3d5c16..a91654a2 100644 --- a/src/algebra/strap/LIST.lsp +++ b/src/algebra/strap/LIST.lsp @@ -63,12 +63,15 @@ (DEFUN |LIST;writeOMList| (|dev| |x| $) (SEQ (SPADCALL |dev| (|getShellEntry| $ 16)) (SPADCALL |dev| "list1" "list" (|getShellEntry| $ 18)) - (SEQ G190 (COND ((NULL (NOT (NULL |x|))) (GO G191))) - (SEQ (SPADCALL |dev| (SPADCALL |x| (|getShellEntry| $ 20)) - NIL (|getShellEntry| $ 22)) - (EXIT (LETT |x| (SPADCALL |x| (|getShellEntry| $ 23)) - |LIST;writeOMList|))) - NIL (GO G190) G191 (EXIT NIL)) + (LOOP + (COND + ((NOT (NOT (NULL |x|))) (RETURN NIL)) + (T (SEQ (SPADCALL |dev| + (SPADCALL |x| (|getShellEntry| $ 20)) NIL + (|getShellEntry| $ 22)) + (EXIT (LETT |x| + (SPADCALL |x| (|getShellEntry| $ 23)) + |LIST;writeOMList|)))))) (EXIT (SPADCALL |dev| (|getShellEntry| $ 24))))) (DEFUN |LIST;OMwrite;$S;6| (|x| $) @@ -125,23 +128,23 @@ |LIST;setIntersection;3$;11|) (LETT |l1| (SPADCALL |l1| (|getShellEntry| $ 36)) |LIST;setIntersection;3$;11|) - (SEQ G190 - (COND - ((NULL (NOT (SPADCALL |l1| (|getShellEntry| $ 39)))) - (GO G191))) - (SEQ (COND - ((SPADCALL - (SPADCALL |l1| (|getShellEntry| $ 20)) |l2| - (|getShellEntry| $ 40)) - (LETT |u| - (CONS (SPADCALL |l1| - (|getShellEntry| $ 20)) - |u|) - |LIST;setIntersection;3$;11|))) - (EXIT (LETT |l1| - (SPADCALL |l1| (|getShellEntry| $ 23)) - |LIST;setIntersection;3$;11|))) - NIL (GO G190) G191 (EXIT NIL)) + (LOOP + (COND + ((NOT (NOT (SPADCALL |l1| (|getShellEntry| $ 39)))) + (RETURN NIL)) + (T (SEQ (COND + ((SPADCALL + (SPADCALL |l1| (|getShellEntry| $ 20)) + |l2| (|getShellEntry| $ 40)) + (LETT |u| + (CONS (SPADCALL |l1| + (|getShellEntry| $ 20)) + |u|) + |LIST;setIntersection;3$;11|))) + (EXIT (LETT |l1| + (SPADCALL |l1| + (|getShellEntry| $ 23)) + |LIST;setIntersection;3$;11|)))))) (EXIT |u|))))) (DEFUN |LIST;setDifference;3$;12| (|l1| |l2| $) @@ -151,24 +154,24 @@ |LIST;setDifference;3$;12|) (LETT |lu| (SPADCALL (|getShellEntry| $ 38)) |LIST;setDifference;3$;12|) - (SEQ G190 - (COND - ((NULL (NOT (SPADCALL |l1| (|getShellEntry| $ 39)))) - (GO G191))) - (SEQ (LETT |l11| - (SPADCALL |l1| 1 (|getShellEntry| $ 42)) - |LIST;setDifference;3$;12|) - (COND - ((NOT (SPADCALL |l11| |l2| - (|getShellEntry| $ 40))) - (LETT |lu| - (SPADCALL |l11| |lu| - (|getShellEntry| $ 43)) - |LIST;setDifference;3$;12|))) - (EXIT (LETT |l1| - (SPADCALL |l1| (|getShellEntry| $ 23)) - |LIST;setDifference;3$;12|))) - NIL (GO G190) G191 (EXIT NIL)) + (LOOP + (COND + ((NOT (NOT (SPADCALL |l1| (|getShellEntry| $ 39)))) + (RETURN NIL)) + (T (SEQ (LETT |l11| + (SPADCALL |l1| 1 (|getShellEntry| $ 42)) + |LIST;setDifference;3$;12|) + (COND + ((NOT (SPADCALL |l11| |l2| + (|getShellEntry| $ 40))) + (LETT |lu| + (SPADCALL |l11| |lu| + (|getShellEntry| $ 43)) + |LIST;setDifference;3$;12|))) + (EXIT (LETT |l1| + (SPADCALL |l1| + (|getShellEntry| $ 23)) + |LIST;setDifference;3$;12|)))))) (EXIT |lu|))))) (DEFUN |LIST;convert;$If;13| (|x| $) |