diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-05-29 00:58:58 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-05-29 00:58:58 +0000 |
| commit | 05f1dbf1e8564c316a4e0ed7146b4991162f8875 (patch) | |
| tree | c909542d73594a47898ed440a7e4f13c256d3f07 /src/interp/server.boot | |
| parent | f274326c2d4e1912fd99105ce72298684f5ee0ab (diff) | |
| download | open-axiom-05f1dbf1e8564c316a4e0ed7146b4991162f8875.tar.gz | |
* lisp/core.lisp.in (readExpr): New.
* interp/as.boot: Replace READLINE with readLine.
* interp/br-data.boot: Likewise.
* interp/br-saturn.boot: Likewise.
* interp/br-search.boot: Likewise.
* interp/c-doc.boot: Likewise.
* interp/cstream.boot: Likewise.
* interp/g-error.boot: Likewise.
* interp/ht-root.boot: Likewise.
* interp/htcheck.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/msgdb.boot: Likewise.
* interp/server.boot: Likewise.
* interp/topics.boot: Likewise.
* interp/compat.boot (READLINE): Remove.
* interp/sys-macros.lisp (shoeConsole): Remove.
(shoeInputFile): Likewise.
(shoeread-line): Likewise.
* boot/ast.boot (bfQ): %nothing only needs EQ.
* algebra/files.spad.pamphlet (File) [read!, readIfCan!]: Use
readExpr instead of VMREAD. Avoid PLACEP
(TextFile) [readLine!, readLineIfCan!]: Likewise.
Diffstat (limited to 'src/interp/server.boot')
| -rw-r--r-- | src/interp/server.boot | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/interp/server.boot b/src/interp/server.boot index 3e46b28a..6455f880 100644 --- a/src/interp/server.boot +++ b/src/interp/server.boot @@ -50,7 +50,9 @@ serverReadLine(stream) == -- used in place of READ-LINE in a scratchpad server system. FORCE_-OUTPUT() not $SpadServer or not IS_-CONSOLE stream => - read_-line(stream) + line := readLine stream + line ~= %nothing => line + nil IN_-STREAM: local := stream _*EOF_*: local := nil line := @@ -60,7 +62,7 @@ serverReadLine(stream) == $NeedToSignalSessionManager := false action := serverSwitch() action = $CallInterp => - l := read_-line(stream) + l := readLine stream $NeedToSignalSessionManager := true return l action = $CreateFrame => @@ -96,7 +98,7 @@ serverReadLine(stream) == action = $KillLispSystem => coreQuit() nil - line => line + line ~= %nothing and line ~= nil => line "" parseAndInterpret str == |