diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-09-30 19:40:42 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-09-30 19:40:42 +0000 |
| commit | 4cb6f558586ccd4893c2acd088bba66654f6bf19 (patch) | |
| tree | abe984a499222f151ae26a6973356ac2e97ed6f8 /src/boot/strap/scanner.clisp | |
| parent | 09ad07bc33ad4ce8d7e4ac1f9e5bb5e7cb9a9498 (diff) | |
| download | open-axiom-4cb6f558586ccd4893c2acd088bba66654f6bf19.tar.gz | |
* boot/utility.boot (firstNonblankPosition): New.
(firstBlankPosition): Likewis.
* boot/translator.boot (reallyPrettyPrint): New.
(genOptimizeOptions): Use it.
(evalBootFile): Tidy.
(shoePPtoFile): Remove as deadcode.
(shoeAddbootIfNec): Rewrite.
(shoeAddStringIfNec): Remove.
* boot/scanner.boot (shoeNextLine): Use firstNonblankPosition.
(shoeEsc): Likewise.
(shoePossFloat): Likewise.
* boot/initial-env.lisp ($IEEE): Remove.
(*LISP-BIN-FILETYPE*): Likewise.
(*LISP-SOURCE-FILETYPE*): Likewise.
(SHOEPRETTYPRINT1): Likewise,
(REALLYPRETTYPRINT): Likewise.
(SHOENOPRETTYPRINT): Likewise.
(STRPOS): Likewise.
(STRPOSL): Likewise.
(shoeReadLisp): Likewise.
Diffstat (limited to 'src/boot/strap/scanner.clisp')
| -rw-r--r-- | src/boot/strap/scanner.clisp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/boot/strap/scanner.clisp b/src/boot/strap/scanner.clisp index 78c63d07..166a9dce 100644 --- a/src/boot/strap/scanner.clisp +++ b/src/boot/strap/scanner.clisp @@ -41,7 +41,8 @@ (RETURN (COND ((|bStreamNull| |s|) NIL) (T (SETQ |$linepos| |s|) (SETQ |$f| (CAR |s|)) (SETQ |$r| (CDR |s|)) - (SETQ |$ln| (CAR |$f|)) (SETQ |$n| (STRPOSL " " |$ln| 0 T)) + (SETQ |$ln| (CAR |$f|)) + (SETQ |$n| (|firstNonblankPosition| |$ln| 0)) (SETQ |$sz| (LENGTH |$ln|)) (COND ((NULL |$n|) T) ((CHAR= (SCHAR |$ln| |$n|) |shoeTAB|) @@ -216,7 +217,7 @@ (LOOP (COND (|$n| (RETURN NIL)) (T (|shoeNextLine| |$r|)))) (|shoeEsc|) NIL) (T NIL))) - (T (SETQ |n1| (STRPOSL " " |$ln| |$n| T)) + (T (SETQ |n1| (|firstNonblankPosition| |$ln| |$n|)) (COND ((NULL |n1|) (|shoeNextLine| |$r|) (LOOP (COND (|$n| (RETURN NIL)) (T (|shoeNextLine| |$r|)))) @@ -296,7 +297,7 @@ (RETURN (PROGN (SETQ |n| |$n|) - (SETQ |$n| (STRPOSL " " |$ln| |$n| T)) + (SETQ |$n| (|firstNonblankPosition| |$ln| |$n|)) (SETQ |$floatok| T) (COND ((NULL |$n|) (|shoeLeafSpaces| 0) (SETQ |$n| (LENGTH |$ln|))) (T (|shoeLeafSpaces| (- |$n| |n|)))))))) |