diff options
| author | dos-reis <gdr@axiomatics.org> | 2012-05-08 01:58:29 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2012-05-08 01:58:29 +0000 |
| commit | aaf651bcb0b8b0cef21cc4e5cceb1be231d5a2b7 (patch) | |
| tree | edbc65c4ad8d8feea69958ea14b5b260407376eb /src/interp/preparse.lisp | |
| parent | d521a65ba712bf80f5bb6677e04d6a5ab36a42a6 (diff) | |
| download | open-axiom-aaf651bcb0b8b0cef21cc4e5cceb1be231d5a2b7.tar.gz | |
* interp/spad.lisp (INIT-BOOT/SPAD-READER): Don't set FILE-CLOSED.
(SPAD): Tidy.
* interp/spad-parser.boot (parseSpadFile): Do not test for *EOF*
or FILE-CLOSED.
* interp/preparse.lisp (INITIALIZED-PREPARSE): Use readLine.
(preparseReadLine1): Likewise.
* interp/parsing.lisp (FILE-CLOSED): Remove.
(GET-A-LINE): Likewise.
(CURRENT-FRAGMENT): Likewise.
(INPUT-CLEAR): Likewise.
(READ-A-LINE): Likewise.
(IOSTREAMS-CLEAR): Don't set FILE-CLOSED.
(IOCLEAR): Don't call INPUT-CLEAR.
Diffstat (limited to 'src/interp/preparse.lisp')
| -rw-r--r-- | src/interp/preparse.lisp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/interp/preparse.lisp b/src/interp/preparse.lisp index d3585cea..bab9621c 100644 --- a/src/interp/preparse.lisp +++ b/src/interp/preparse.lisp @@ -76,7 +76,7 @@ (defun Initialize-Preparse (strm) (setq $INDEX 0 $LineList nil $EchoLineStack nil) - (setq $preparse-last-line (get-a-line strm))) + (setq $preparse-last-line (|readLine| strm))) (defvar $skipme) @@ -223,12 +223,12 @@ (PROG (LINE IND) (SETQ LINE (if $LINELIST (pop $LINELIST) - (expand-tabs (get-a-line in-stream)))) + (expand-tabs (|readLine| in-stream)))) (setq $preparse-last-line LINE) (and (stringp line) (incf $INDEX)) (COND ( (NOT (STRINGP LINE)) - (RETURN (CONS $INDEX LINE)) ) ) + (RETURN (LIST $INDEX)) ) ) (SETQ LINE (DROPTRAILINGBLANKS LINE)) (PUSH (COPY-SEQ LINE) $EchoLineStack) ;; next line must evaluate $INDEX before recursive call |