diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-09-04 05:50:37 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-09-04 05:50:37 +0000 |
| commit | 9d4b58dc1f45d4d49ce68997000825dd3e7f247a (patch) | |
| tree | 81124164f4adbb0d9c8f14426ca5f35c40d625d6 /src/boot/strap | |
| parent | 5ec566efd3ae43b1bf470e5da19de940ac95c0dd (diff) | |
| download | open-axiom-9d4b58dc1f45d4d49ce68997000825dd3e7f247a.tar.gz | |
Diffstat (limited to 'src/boot/strap')
| -rw-r--r-- | src/boot/strap/includer.clisp | 5 | ||||
| -rw-r--r-- | src/boot/strap/scanner.clisp | 11 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/boot/strap/includer.clisp b/src/boot/strap/includer.clisp index 646429c2..f88bfa6f 100644 --- a/src/boot/strap/includer.clisp +++ b/src/boot/strap/includer.clisp @@ -121,9 +121,8 @@ ((|bStreamNull| |b|) (|shoeConsole| (CONCAT |name| " not found in " |fn|)) NIL) - (T (COND - ((NULL |lines|) (|shoeConsole| ")package not found"))) - (APPEND (REVERSE |lines|) (CAR |b|))))))))) + ((NULL |lines|) (|shoeConsole| ")package not found")) + (T (APPEND (REVERSE |lines|) (CAR |b|))))))))) (DEFPARAMETER |$bStreamNil| (LIST '|nullstream|)) diff --git a/src/boot/strap/scanner.clisp b/src/boot/strap/scanner.clisp index f7d77f67..4c4bda04 100644 --- a/src/boot/strap/scanner.clisp +++ b/src/boot/strap/scanner.clisp @@ -238,13 +238,10 @@ (T (SETQ |$n| |n|) (|shoeLeafLispExp| |exp|))))))))))) (DEFUN |shoeEscape| () - (PROG (|a|) - (DECLARE (SPECIAL |$n|)) - (RETURN - (PROGN - (SETQ |$n| (+ |$n| 1)) - (SETQ |a| (|shoeEsc|)) - (COND (|a| (|shoeWord| T)) (T NIL)))))) + (DECLARE (SPECIAL |$n|)) + (PROGN + (SETQ |$n| (+ |$n| 1)) + (COND ((|shoeEsc|) (|shoeWord| T)) (T NIL)))) (DEFUN |shoeEsc| () (PROG (|n1|) |