diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-03-28 04:34:35 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-03-28 04:34:35 +0000 |
| commit | e609586105f5a9b2b314a9dbeab0e7ec47d66b85 (patch) | |
| tree | d7d301cc8060f30154dff07b334cbc67e636432d /src/interp/server.boot | |
| parent | bd0ce3e3c5dfaad8adcb5034d9637267ed6bc857 (diff) | |
| download | open-axiom-e609586105f5a9b2b314a9dbeab0e7ec47d66b85.tar.gz | |
* interp/int-top.boot (intloopReadConsole): Use $InputStream.
* interp/bootlex.lisp (init-boot/spad-reader): Use $OutputStream.
* interp/comp.lisp (|compQuietly|): Likewise.
(|compileFileQuietly|): Likewise.
(|compileQuietly|): Likewise.
* interp/unlisp.lisp (|Prompt|): Likewise.
* interp/server.boot (serverReadLine): Indent while body.
Diffstat (limited to 'src/interp/server.boot')
| -rw-r--r-- | src/interp/server.boot | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/src/interp/server.boot b/src/interp/server.boot index 130cf887..33779dc1 100644 --- a/src/interp/server.boot +++ b/src/interp/server.boot @@ -55,50 +55,50 @@ serverReadLine(stream) == _*EOF_*: fluid := NIL line := while not $EndServerSession and not _*EOF_* repeat - if $NeedToSignalSessionManager then - sockSendInt($SessionManager, $EndOfOutput) - $NeedToSignalSessionManager := false - action := serverSwitch() - action = $CallInterp => - l := read_-line(stream) - $NeedToSignalSessionManager := true - return l - action = $CreateFrame => - frameName := GENSYM('"frame") - addNewInterpreterFrame(frameName) - $frameAlist := [[$frameNumber,:frameName], :$frameAlist] - $currentFrameNum := $frameNumber - sockSendInt($SessionManager, $frameNumber) - $frameNumber := $frameNumber + 1 - sockSendString($SessionManager, MKPROMPT()) - action = $SwitchFrames => - $currentFrameNum := sockGetInt($SessionManager) - currentFrame := LASSOC($currentFrameNum, $frameAlist) - changeToNamedInterpreterFrame currentFrame - action = $EndSession => - $EndServerSession := true - action = $LispCommand => - $NeedToSignalSessionManager := true - stringBuf := MAKE_-STRING $sockBufferLength - sockGetString($MenuServer, stringBuf, $sockBufferLength) - form := unescapeStringsInForm READ_-FROM_-STRING stringBuf - protectedEVAL form - action = $QuietSpadCommand => - $NeedToSignalSessionManager := true - executeQuietCommand() - action = $SpadCommand => - $NeedToSignalSessionManager := true - stringBuf := MAKE_-STRING 512 - sockGetString($MenuServer, stringBuf, 512) - CATCH('coerceFailure,CATCH('top__level, CATCH('SPAD__READER, - parseAndInterpret stringBuf))) - PRINC MKPROMPT() - FINISH_-OUTPUT() - action = $NonSmanSession => - $SpadServer := nil - action = $KillLispSystem => - coreQuit() -- ??? should be coreQuit errorCount() - NIL + if $NeedToSignalSessionManager then + sockSendInt($SessionManager, $EndOfOutput) + $NeedToSignalSessionManager := false + action := serverSwitch() + action = $CallInterp => + l := read_-line(stream) + $NeedToSignalSessionManager := true + return l + action = $CreateFrame => + frameName := GENSYM('"frame") + addNewInterpreterFrame(frameName) + $frameAlist := [[$frameNumber,:frameName], :$frameAlist] + $currentFrameNum := $frameNumber + sockSendInt($SessionManager, $frameNumber) + $frameNumber := $frameNumber + 1 + sockSendString($SessionManager, MKPROMPT()) + action = $SwitchFrames => + $currentFrameNum := sockGetInt($SessionManager) + currentFrame := LASSOC($currentFrameNum, $frameAlist) + changeToNamedInterpreterFrame currentFrame + action = $EndSession => + $EndServerSession := true + action = $LispCommand => + $NeedToSignalSessionManager := true + stringBuf := MAKE_-STRING $sockBufferLength + sockGetString($MenuServer, stringBuf, $sockBufferLength) + form := unescapeStringsInForm READ_-FROM_-STRING stringBuf + protectedEVAL form + action = $QuietSpadCommand => + $NeedToSignalSessionManager := true + executeQuietCommand() + action = $SpadCommand => + $NeedToSignalSessionManager := true + stringBuf := MAKE_-STRING 512 + sockGetString($MenuServer, stringBuf, 512) + CATCH('coerceFailure,CATCH('top__level, CATCH('SPAD__READER, + parseAndInterpret stringBuf))) + PRINC MKPROMPT() + FINISH_-OUTPUT() + action = $NonSmanSession => + $SpadServer := nil + action = $KillLispSystem => + coreQuit() + nil line => line "" |