diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-05-26 03:03:02 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-05-26 03:03:02 +0000 |
| commit | 2ffc3883061b8d61a387bcff63a1cae1756afff4 (patch) | |
| tree | aae428e1670ae612e689118de74d88ee7f3de629 /src/boot/strap | |
| parent | 27c22a0663a26cf2450c303638721435806a12fe (diff) | |
| download | open-axiom-2ffc3883061b8d61a387bcff63a1cae1756afff4.tar.gz | |
* boot/ast.boot (shoeCompTran1): Translate arguments to vector
constructor too.
Diffstat (limited to 'src/boot/strap')
| -rw-r--r-- | src/boot/strap/ast.clisp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp index 61a5f103..90ce113f 100644 --- a/src/boot/strap/ast.clisp +++ b/src/boot/strap/ast.clisp @@ -1820,7 +1820,7 @@ (T NIL))))) (DEFUN |shoeCompTran1| (|x|) - (PROG (|n| |args| |newbindings| |r| |ISTMP#2| |l| |zs| |y| |ISTMP#1| + (PROG (|n| |elts| |newbindings| |r| |ISTMP#2| |l| |zs| |y| |ISTMP#1| U) (DECLARE (SPECIAL |$fluidVars| |$locVars| |$dollarVars|)) (RETURN @@ -1918,20 +1918,12 @@ (PROGN (SETQ |ISTMP#1| (CDR |x|)) (AND (CONSP |ISTMP#1|) (NULL (CDR |ISTMP#1|)) - (PROGN - (SETQ |ISTMP#2| (CAR |ISTMP#1|)) - (AND (CONSP |ISTMP#2|) - (EQ (CAR |ISTMP#2|) 'LIST) - (PROGN - (SETQ |args| (CDR |ISTMP#2|)) - T)))))) - (RPLACA |x| 'VECTOR) (RPLACD |x| |args|) |x|) - ((AND (CONSP |x|) (EQ (CAR |x|) '|vector|) - (PROGN - (SETQ |ISTMP#1| (CDR |x|)) - (AND (CONSP |ISTMP#1|) (NULL (CDR |ISTMP#1|)) - (EQ (CAR |ISTMP#1|) 'NIL)))) - (RPLACA |x| 'VECTOR) (RPLACD |x| NIL) |x|) + (PROGN (SETQ |elts| (CAR |ISTMP#1|)) T)))) + (RPLACA |x| 'VECTOR) + (COND + ((EQ |elts| 'NIL) (RPLACD |x| NIL)) + (T (RPLACD |x| (|shoeCompTran1| (CDR |elts|))))) + |x|) ((AND (CONSP |x|) (EQ (CAR |x|) '|%Namespace|) (PROGN (SETQ |ISTMP#1| (CDR |x|)) |