diff options
| author | dos-reis <gdr@axiomatics.org> | 2012-05-20 14:39:19 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2012-05-20 14:39:19 +0000 |
| commit | c96ac1e9ec3aae8744293a052d85d7decddcd52a (patch) | |
| tree | f2871cfdfcd3f2db00f1c0ae0c74a7b69f868b7b /src/boot/strap/scanner.clisp | |
| parent | b1cd408a22e554e9e9a950aef3a89ea9f665a5b6 (diff) | |
| download | open-axiom-c96ac1e9ec3aae8744293a052d85d7decddcd52a.tar.gz | |
* boot/ast.boot (shoeCompTran): Simplify.
(shoeCompTran1): Partially defer translation of fluid variable
definition.
(bindFluidVars!): New. Complete translation.
(groupFluidVars): New.
* interp/newfort.boot (fortFormatIntrinsics): Remove redundant return.
Diffstat (limited to 'src/boot/strap/scanner.clisp')
| -rw-r--r-- | src/boot/strap/scanner.clisp | 58 |
1 files changed, 28 insertions, 30 deletions
diff --git a/src/boot/strap/scanner.clisp b/src/boot/strap/scanner.clisp index af316d42..b48125fc 100644 --- a/src/boot/strap/scanner.clisp +++ b/src/boot/strap/scanner.clisp @@ -53,37 +53,35 @@ (T T))))))) (DEFUN |shoeLineToks| (|s|) - (PROG (|$linepos| |$floatok| |$sz| |$n| |$ln| |$r| |$f| |toks| |dq| - |command|) - (DECLARE (SPECIAL |$linepos| |$floatok| |$sz| |$n| |$ln| |$r| |$f|)) + (PROG (|toks| |dq| |command|) (RETURN - (PROGN - (SETQ |$f| NIL) - (SETQ |$r| NIL) - (SETQ |$ln| NIL) - (SETQ |$n| NIL) - (SETQ |$sz| NIL) - (SETQ |$floatok| T) - (SETQ |$linepos| |s|) - (COND ((NOT (|shoeNextLine| |s|)) (CONS NIL NIL)) - ((NULL |$n|) (|shoeLineToks| |$r|)) - ((CHAR= (SCHAR |$ln| 0) (|char| '|)|)) - (COND - ((SETQ |command| (|shoeLine?| |$ln|)) - (SETQ |dq| - (|dqUnit| - (|shoeConstructToken| |$linepos| - (|shoeLeafLine| |command|) 0))) - (CONS (LIST |dq|) |$r|)) - ((SETQ |command| (|shoeLisp?| |$ln|)) - (|shoeLispToken| |$r| |command|)) - (T (|shoeLineToks| |$r|)))) - (T (SETQ |toks| NIL) - (LOOP - (COND ((NOT (< |$n| |$sz|)) (RETURN NIL)) - (T (SETQ |toks| (|dqAppend| |toks| (|shoeToken|)))))) - (COND ((NULL |toks|) (|shoeLineToks| |$r|)) - (T (CONS (LIST |toks|) |$r|))))))))) + (LET* ((|$f| NIL) + (|$r| NIL) + (|$ln| NIL) + (|$n| NIL) + (|$sz| NIL) + (|$floatok| T) + (|$linepos| |s|)) + (DECLARE (SPECIAL |$f| |$r| |$ln| |$n| |$sz| |$floatok| |$linepos|)) + (COND ((NOT (|shoeNextLine| |s|)) (CONS NIL NIL)) + ((NULL |$n|) (|shoeLineToks| |$r|)) + ((CHAR= (SCHAR |$ln| 0) (|char| '|)|)) + (COND + ((SETQ |command| (|shoeLine?| |$ln|)) + (SETQ |dq| + (|dqUnit| + (|shoeConstructToken| |$linepos| + (|shoeLeafLine| |command|) 0))) + (CONS (LIST |dq|) |$r|)) + ((SETQ |command| (|shoeLisp?| |$ln|)) + (|shoeLispToken| |$r| |command|)) + (T (|shoeLineToks| |$r|)))) + (T (SETQ |toks| NIL) + (LOOP + (COND ((NOT (< |$n| |$sz|)) (RETURN NIL)) + (T (SETQ |toks| (|dqAppend| |toks| (|shoeToken|)))))) + (COND ((NULL |toks|) (|shoeLineToks| |$r|)) + (T (CONS (LIST |toks|) |$r|))))))))) (DEFUN |shoeLispToken| (|s| |string|) (PROG (|dq| |st| |r| |LETTMP#1| |linepos| |ln|) |