diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-06-22 17:20:38 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-06-22 17:20:38 +0000 |
| commit | b06599402ca23cce8ba7eea03886dc11a5d29af4 (patch) | |
| tree | 763ae52bb73dfb7f76feb7433b7853056acb9605 /src/algebra/strap/ILIST.lsp | |
| parent | 48d55f8e89cdc22afbf661b823bf059d231b0db4 (diff) | |
| download | open-axiom-b06599402ca23cce8ba7eea03886dc11a5d29af4.tar.gz | |
Group sequence of LETT definitions into LET/LET* expressions where
appropriate.
* interp/g-opt.boot (jumpToToplevel?): New.
(singleAssignment?): Likewise.
(groupVariableDefinitions): Likewise. Use them.
(optimizeFunctionDef): Group toplevel variable definitions into
a bind expression.
* interp/g-util.boot (expandBind): Tidy.
* interp/c-util.boot (transformToBackendCode): Refrain from
enclosing let-expressions in SEQ if not needed.
Diffstat (limited to 'src/algebra/strap/ILIST.lsp')
| -rw-r--r-- | src/algebra/strap/ILIST.lsp | 177 |
1 files changed, 87 insertions, 90 deletions
diff --git a/src/algebra/strap/ILIST.lsp b/src/algebra/strap/ILIST.lsp index 820134e2..3f05b3f2 100644 --- a/src/algebra/strap/ILIST.lsp +++ b/src/algebra/strap/ILIST.lsp @@ -193,66 +193,62 @@ (EXIT |x|))) (DEFUN |ILIST;copy;2$;20| (|x| $) - (PROG (|y|) - (RETURN - (SEQ (LETT |y| NIL |ILIST;copy;2$;20|) - (LET ((|i| 0)) - (LOOP - (COND - ((NOT (NOT (NULL |x|))) (RETURN NIL)) - (T (SEQ (COND - ((EQL |i| 1000) - (COND - ((SPADCALL |x| (|getShellEntry| $ 35)) - (|error| "cyclic list"))))) - (SETQ |y| (CONS (CAR |x|) |y|)) - (EXIT (SETQ |x| (CDR |x|)))))) - (SETQ |i| (+ |i| 1)))) - (EXIT (NREVERSE |y|)))))) + (LET ((|y| (SPADCALL (|getShellEntry| $ 16)))) + (SEQ (LET ((|i| 0)) + (LOOP + (COND + ((NOT (NOT (NULL |x|))) (RETURN NIL)) + (T (SEQ (COND + ((EQL |i| 1000) + (COND + ((SPADCALL |x| (|getShellEntry| $ 35)) + (|error| "cyclic list"))))) + (SETQ |y| (CONS (CAR |x|) |y|)) + (EXIT (SETQ |x| (CDR |x|)))))) + (SETQ |i| (+ |i| 1)))) + (EXIT (NREVERSE |y|))))) (DEFUN |ILIST;coerce;$Of;21| (|x| $) - (PROG (|y| |s| |z|) + (PROG (|z|) (RETURN - (SEQ (LETT |y| NIL |ILIST;coerce;$Of;21|) - (LETT |s| (SPADCALL |x| (|getShellEntry| $ 40)) - |ILIST;coerce;$Of;21|) - (LOOP - (COND - ((NOT (NOT (EQ |x| |s|))) (RETURN NIL)) - (T (SEQ (SETQ |y| - (CONS (SPADCALL (|SPADfirst| |x|) - (|getShellEntry| $ 41)) - |y|)) - (EXIT (SETQ |x| (CDR |x|))))))) - (SETQ |y| (NREVERSE |y|)) - (EXIT (COND - ((NULL |s|) (SPADCALL |y| (|getShellEntry| $ 45))) - ('T - (SEQ (LETT |z| - (SPADCALL - (SPADCALL (|SPADfirst| |x|) - (|getShellEntry| $ 41)) - (|getShellEntry| $ 46)) - |ILIST;coerce;$Of;21|) - (LOOP - (COND - ((NOT (NOT (EQ |s| (CDR |x|)))) - (RETURN NIL)) - (T (SEQ (SETQ |x| (CDR |x|)) - (EXIT - (SETQ |z| - (CONS - (SPADCALL (|SPADfirst| |x|) - (|getShellEntry| $ 41)) - |z|))))))) - (EXIT (SPADCALL - (SPADCALL |y| - (SPADCALL - (SPADCALL (NREVERSE |z|) - (|getShellEntry| $ 47)) - (|getShellEntry| $ 48)) - (|getShellEntry| $ 49)) - (|getShellEntry| $ 45))))))))))) + (LET* ((|y| NIL) (|s| (SPADCALL |x| (|getShellEntry| $ 40)))) + (SEQ (LOOP + (COND + ((NOT (NOT (EQ |x| |s|))) (RETURN NIL)) + (T (SEQ (SETQ |y| + (CONS (SPADCALL (|SPADfirst| |x|) + (|getShellEntry| $ 41)) + |y|)) + (EXIT (SETQ |x| (CDR |x|))))))) + (SETQ |y| (NREVERSE |y|)) + (EXIT (COND + ((NULL |s|) (SPADCALL |y| (|getShellEntry| $ 45))) + ('T + (SEQ (LETT |z| + (SPADCALL + (SPADCALL (|SPADfirst| |x|) + (|getShellEntry| $ 41)) + (|getShellEntry| $ 46)) + |ILIST;coerce;$Of;21|) + (LOOP + (COND + ((NOT (NOT (EQ |s| (CDR |x|)))) + (RETURN NIL)) + (T (SEQ (SETQ |x| (CDR |x|)) + (EXIT + (SETQ |z| + (CONS + (SPADCALL (|SPADfirst| |x|) + (|getShellEntry| $ 41)) + |z|))))))) + (EXIT (SPADCALL + (SPADCALL |y| + (SPADCALL + (SPADCALL (NREVERSE |z|) + (|getShellEntry| $ 47)) + (|getShellEntry| $ 48)) + (|getShellEntry| $ 49)) + (|getShellEntry| $ 45)))))))))))) (DEFUN |ILIST;=;2$B;22| (|x| |y| $) (SEQ (COND @@ -272,21 +268,19 @@ (EXIT (COND ((NULL |x|) (NULL |y|)) ('T NIL)))))))) (DEFUN |ILIST;latex;$S;23| (|x| $) - (PROG (|s|) - (RETURN - (SEQ (LETT |s| "\\left[" |ILIST;latex;$S;23|) - (LOOP - (COND - ((NOT (NOT (NULL |x|))) (RETURN NIL)) - (T (SEQ (SETQ |s| - (STRCONC |s| - (SPADCALL (CAR |x|) - (|getShellEntry| $ 56)))) - (SETQ |x| (CDR |x|)) - (EXIT (COND - ((NOT (NULL |x|)) - (SETQ |s| (STRCONC |s| ", "))))))))) - (EXIT (STRCONC |s| " \\right]")))))) + (LET ((|s| "\\left[")) + (SEQ (LOOP + (COND + ((NOT (NOT (NULL |x|))) (RETURN NIL)) + (T (SEQ (SETQ |s| + (STRCONC |s| + (SPADCALL (CAR |x|) + (|getShellEntry| $ 56)))) + (SETQ |x| (CDR |x|)) + (EXIT (COND + ((NOT (NULL |x|)) + (SETQ |s| (STRCONC |s| ", "))))))))) + (EXIT (STRCONC |s| " \\right]"))))) (DEFUN |ILIST;member?;S$B;24| (|s| |x| $) (SEQ (LOOP @@ -317,29 +311,32 @@ (QRPLACD |z| |y|) (EXIT |x|)))))))) (DEFUN |ILIST;removeDuplicates!;2$;26| (|l| $) - (PROG (|p| |pp| |f| |pr|) + (PROG (|pp| |f| |pr|) (RETURN - (SEQ (LETT |p| |l| |ILIST;removeDuplicates!;2$;26|) - (LOOP - (COND - ((NOT (NOT (NULL |p|))) (RETURN NIL)) - (T (SEQ (LETT |pp| |p| |ILIST;removeDuplicates!;2$;26|) - (LETT |f| (CAR |p|) - |ILIST;removeDuplicates!;2$;26|) - (SETQ |p| (CDR |p|)) - (EXIT (LOOP - (COND - ((NOT (NOT - (NULL - (LETT |pr| (CDR |pp|) - |ILIST;removeDuplicates!;2$;26|)))) - (RETURN NIL)) - (T (COND + (LET ((|p| |l|)) + (SEQ (LOOP + (COND + ((NOT (NOT (NULL |p|))) (RETURN NIL)) + (T (SEQ (LETT |pp| |p| + |ILIST;removeDuplicates!;2$;26|) + (LETT |f| (CAR |p|) + |ILIST;removeDuplicates!;2$;26|) + (SETQ |p| (CDR |p|)) + (EXIT (LOOP + (COND + ((NOT + (NOT + (NULL + (LETT |pr| (CDR |pp|) + |ILIST;removeDuplicates!;2$;26|)))) + (RETURN NIL)) + (T + (COND ((SPADCALL (CAR |pr|) |f| (|getShellEntry| $ 59)) (QRPLACD |pp| (CDR |pr|))) ('T (SETQ |pp| |pr|))))))))))) - (EXIT |l|))))) + (EXIT |l|)))))) (DEFUN |ILIST;sort!;M2$;27| (|f| |l| $) (|ILIST;mergeSort| |f| |l| (LENGTH |l|) $)) |