diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-04-29 15:25:28 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-04-29 15:25:28 +0000 |
| commit | 7e465ce1b99903491c6132466808c9fa51ae500e (patch) | |
| tree | 5f97fdd88cbada50122e5ef86c99d73157da8337 /src/interp/server.boot | |
| parent | 3223409ab97b1a6a8e60d541b0c7b5b69c8b9a83 (diff) | |
| download | open-axiom-7e465ce1b99903491c6132466808c9fa51ae500e.tar.gz | |
Cleanup, part 2.
Diffstat (limited to 'src/interp/server.boot')
| -rw-r--r-- | src/interp/server.boot | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/interp/server.boot b/src/interp/server.boot index 02525de7..ea65ff3c 100644 --- a/src/interp/server.boot +++ b/src/interp/server.boot @@ -79,17 +79,15 @@ serverReadLine(stream) == $EndServerSession := true action = $LispCommand => $NeedToSignalSessionManager := true - stringBuf := MAKE_-STRING $sockBufferLength - sockGetString($MenuServer, stringBuf, $sockBufferLength) - form := unescapeStringsInForm READ_-FROM_-STRING stringBuf + buf := sockGetString $MenuServer + form := unescapeStringsInForm READ_-FROM_-STRING buf protectedEVAL form action = $QuietSpadCommand => $NeedToSignalSessionManager := true executeQuietCommand() action = $SpadCommand => $NeedToSignalSessionManager := true - stringBuf := MAKE_-STRING 512 - sockGetString($MenuServer, stringBuf, 512) + stringBuf := sockGetString $MenuServer CATCH('coerceFailure,CATCH('top__level, CATCH('SPAD__READER, parseAndInterpret stringBuf))) PRINC MKPROMPT() @@ -116,8 +114,7 @@ oldParseAndInterpret str == executeQuietCommand() == $QuietCommand: fluid := true - stringBuf := MAKE_-STRING 512 - sockGetString($MenuServer, stringBuf, 512) + stringBuf := sockGetString $MenuServer CATCH('coerceFailure,CATCH('top__level, CATCH('SPAD__READER, parseAndInterpret stringBuf))) @@ -150,15 +147,13 @@ serverLoop() == action = $EndSession => $EndServerSession := true action = $LispCommand => - stringBuf := MAKE_-STRING 512 - sockGetString($MenuServer, stringBuf, 512) + stringBuf := sockGetString $MenuServer form := unescapeStringsInForm READ_-FROM_-STRING stringBuf EVAL form action = $QuietSpadCommand => executeQuietCommand() action = $SpadCommand => - stringBuf := MAKE_-STRING 512 - sockGetString($MenuServer, stringBuf, 512) + stringBuf := sockGetString $MenuServer CATCH('coerceFailure,CATCH('top__level, CATCH('SPAD__READER, parseAndInterpret stringBuf))) PRINC MKPROMPT() |