diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-10-08 02:49:53 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-10-08 02:49:53 +0000 |
| commit | a1b2cf9cb8b3369a938ee80cc028eca8fef4d1ce (patch) | |
| tree | 25b8d5cb4b4df1d1568a25b4ce21bf23232e3a49 /src/interp/server.boot | |
| parent | dab5bd48d7830f4e11a19cf3ea28528099a5c1e0 (diff) | |
| download | open-axiom-a1b2cf9cb8b3369a938ee80cc028eca8fef4d1ce.tar.gz | |
* interp/i-util.boot (printPrompt): New.
* interp/ht-util.boot (executeInterpreterCommand): Use it.
* interp/int-top.boot (SpadInterpretStream): Likewise.
* interp/metalex.lisp (get-a-line): Likewise.
* interp/server.boot (serverReadLine): Likewise.
(serverLoop): Likewise.
Diffstat (limited to 'src/interp/server.boot')
| -rw-r--r-- | src/interp/server.boot | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/interp/server.boot b/src/interp/server.boot index 57a706a3..6e0ee514 100644 --- a/src/interp/server.boot +++ b/src/interp/server.boot @@ -90,8 +90,7 @@ serverReadLine(stream) == stringBuf := sockGetString $MenuServer CATCH('coerceFailure,CATCH($intTopLevel, CATCH($SpadReaderTag, parseAndInterpret stringBuf))) - PRINC MKPROMPT() - FINISH_-OUTPUT() + printPrompt "andFlush" action = $NonSmanSession => $SpadServer := nil action = $KillLispSystem => @@ -122,14 +121,13 @@ serverLoop() == IN_-STREAM: fluid := $InputStream _*EOF_*: fluid := NIL while not $EndServerSession and not _*EOF_* repeat - if $Prompt then (PRINC MKPROMPT(); FINISH_-OUTPUT()) + if $Prompt then printPrompt "andFlush" $Prompt := NIL action := serverSwitch() action = $CallInterp => CATCH('coerceFailure,CATCH($intTopLevel, CATCH($SpadReaderTag, parseAndInterpret read_-line($InputStream) ))) - PRINC MKPROMPT() - FINISH_-OUTPUT() + printPrompt "andFlush" sockSendInt($SessionManager, $EndOfOutput) action = $CreateFrame => frameName := GENSYM('"frame") @@ -155,8 +153,7 @@ serverLoop() == stringBuf := sockGetString $MenuServer CATCH('coerceFailure,CATCH($intTopLevel, CATCH($SpadReaderTag, parseAndInterpret stringBuf))) - PRINC MKPROMPT() - FINISH_-OUTPUT() + printPrompt "andFlush" sockSendInt($SessionManager, $EndOfOutput) NIL if _*EOF_* then $Prompt := true |