Formatting fixes

This commit is contained in:
Sumit Sahrawat 2015-10-28 15:39:59 +05:30
parent a8e09f58c8
commit 4ebeb1fb58
4 changed files with 29 additions and 28 deletions

View File

@ -153,8 +153,8 @@ executeErrorParser = requestParser $ \obj -> do
return $ ExecuteError noHeader [] traceback ename evalue
makeDisplayDatas :: Object -> [DisplayData]
makeDisplayDatas dataDict = [DisplayData (read $ unpack mimeType) content |
(mimeType, String content) <- HM.toList dataDict]
makeDisplayDatas dataDict = [DisplayData (read $ unpack mimeType) content | (mimeType, String content) <- HM.toList
dataDict]
-- | Parse an execute result
executeResultParser :: LByteString -> Message
@ -173,9 +173,10 @@ displayDataParser = requestParser $ \obj -> do
maybeSource <- obj .:? "source"
return $ PublishDisplayData noHeader (fromMaybe "" maybeSource) displayDatas
requestParser parser content = case parseEither parser decoded of
Right parsed -> parsed
Left err -> trace ("Parse error: " ++ show err) SendNothing
requestParser parser content =
case parseEither parser decoded of
Right parsed -> parsed
Left err -> trace ("Parse error: " ++ show err) SendNothing
where
Just decoded = decode content

View File

@ -29,14 +29,22 @@ instance ToJSON Message where
, "language_info" .= languageInfo rep
]
toJSON ExecuteRequest { getCode = code, getSilent = silent, getStoreHistory = storeHistory,
getAllowStdin = allowStdin, getUserVariables = userVariables,
getUserExpressions = userExpressions
} =
object ["code" .= code, "silent" .= silent, "store_history" .= storeHistory,
"allow_stdin" .= allowStdin, "user_variables" .= userVariables,
"user_expressions" .= userExpressions
]
toJSON ExecuteRequest
{ getCode = code
, getSilent = silent
, getStoreHistory = storeHistory
, getAllowStdin = allowStdin
, getUserVariables = userVariables
, getUserExpressions = userExpressions
} =
object
[ "code" .= code
, "silent" .= silent
, "store_history" .= storeHistory
, "allow_stdin" .= allowStdin
, "user_variables" .= userVariables
, "user_expressions" .= userExpressions
]
toJSON ExecuteReply { status = status, executionCounter = counter, pagerOutput = pager } =
object

View File

@ -115,7 +115,7 @@ instance ToJSON Transport where
-------------------- IPython Kernelspec Types ----------------------
data KernelSpec =
KernelSpec
{
{
-- | Name shown to users to describe this kernel (e.g. "Haskell")
kernelDisplayName :: String
-- | Name for the kernel; unique kernel identifier (e.g. "haskell")
@ -278,7 +278,7 @@ data Message =
, languageInfo :: LanguageInfo
}
|
-- | A request from a frontend to execute some code.
-- | A request from a frontend to execute some code.
ExecuteInput
{ header :: MessageHeader
, getCode :: Text -- ^ The code string.
@ -349,17 +349,10 @@ data Message =
, inCode :: String -- ^ Submitted input code.
, executionCount :: Int -- ^ Which input this is.
}
| Input
{ header :: MessageHeader
, getCode :: Text
, executionCount :: Int
}
| Output
{ header :: MessageHeader
, getText :: [DisplayData]
, executionCount :: Int
}
| CompleteRequest
| Input { header :: MessageHeader, getCode :: Text, executionCount :: Int }
| Output { header :: MessageHeader, getText :: [DisplayData], executionCount :: Int }
|
CompleteRequest
{ header :: MessageHeader
, getCode :: Text {- ^
The entire block of text where the line is. This may be useful in the
@ -489,7 +482,6 @@ instance FromJSON StreamType where
parseJSON (String "stdout") = return Stdout
parseJSON (String "stderr") = return Stderr
-- | Get the reply message type for a request message type.
replyType :: MessageType -> Maybe MessageType
replyType KernelInfoRequestMessage = Just KernelInfoReplyMessage

View File

@ -37,7 +37,7 @@ import IHaskell.IPython.Types
-- should functionally serve as high-level sockets which speak Messages instead of ByteStrings.
data ZeroMQInterface =
Channels
{
{
-- | A channel populated with requests from the frontend.
shellRequestChannel :: Chan Message
-- | Writing to this channel causes a reply to be sent to the frontend.