Commit 4ebeb1fb authored by Sumit Sahrawat's avatar Sumit Sahrawat

Formatting fixes

parent a8e09f58
...@@ -153,8 +153,8 @@ executeErrorParser = requestParser $ \obj -> do ...@@ -153,8 +153,8 @@ executeErrorParser = requestParser $ \obj -> do
return $ ExecuteError noHeader [] traceback ename evalue return $ ExecuteError noHeader [] traceback ename evalue
makeDisplayDatas :: Object -> [DisplayData] makeDisplayDatas :: Object -> [DisplayData]
makeDisplayDatas dataDict = [DisplayData (read $ unpack mimeType) content | makeDisplayDatas dataDict = [DisplayData (read $ unpack mimeType) content | (mimeType, String content) <- HM.toList
(mimeType, String content) <- HM.toList dataDict] dataDict]
-- | Parse an execute result -- | Parse an execute result
executeResultParser :: LByteString -> Message executeResultParser :: LByteString -> Message
...@@ -173,9 +173,10 @@ displayDataParser = requestParser $ \obj -> do ...@@ -173,9 +173,10 @@ displayDataParser = requestParser $ \obj -> do
maybeSource <- obj .:? "source" maybeSource <- obj .:? "source"
return $ PublishDisplayData noHeader (fromMaybe "" maybeSource) displayDatas return $ PublishDisplayData noHeader (fromMaybe "" maybeSource) displayDatas
requestParser parser content = case parseEither parser decoded of requestParser parser content =
Right parsed -> parsed case parseEither parser decoded of
Left err -> trace ("Parse error: " ++ show err) SendNothing Right parsed -> parsed
Left err -> trace ("Parse error: " ++ show err) SendNothing
where where
Just decoded = decode content Just decoded = decode content
......
...@@ -29,14 +29,22 @@ instance ToJSON Message where ...@@ -29,14 +29,22 @@ instance ToJSON Message where
, "language_info" .= languageInfo rep , "language_info" .= languageInfo rep
] ]
toJSON ExecuteRequest { getCode = code, getSilent = silent, getStoreHistory = storeHistory, toJSON ExecuteRequest
getAllowStdin = allowStdin, getUserVariables = userVariables, { getCode = code
getUserExpressions = userExpressions , getSilent = silent
} = , getStoreHistory = storeHistory
object ["code" .= code, "silent" .= silent, "store_history" .= storeHistory, , getAllowStdin = allowStdin
"allow_stdin" .= allowStdin, "user_variables" .= userVariables, , getUserVariables = userVariables
"user_expressions" .= userExpressions , 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 } = toJSON ExecuteReply { status = status, executionCounter = counter, pagerOutput = pager } =
object object
......
...@@ -115,7 +115,7 @@ instance ToJSON Transport where ...@@ -115,7 +115,7 @@ instance ToJSON Transport where
-------------------- IPython Kernelspec Types ---------------------- -------------------- IPython Kernelspec Types ----------------------
data KernelSpec = data KernelSpec =
KernelSpec KernelSpec
{ {
-- | Name shown to users to describe this kernel (e.g. "Haskell") -- | Name shown to users to describe this kernel (e.g. "Haskell")
kernelDisplayName :: String kernelDisplayName :: String
-- | Name for the kernel; unique kernel identifier (e.g. "haskell") -- | Name for the kernel; unique kernel identifier (e.g. "haskell")
...@@ -278,7 +278,7 @@ data Message = ...@@ -278,7 +278,7 @@ data Message =
, languageInfo :: LanguageInfo , languageInfo :: LanguageInfo
} }
| |
-- | A request from a frontend to execute some code. -- | A request from a frontend to execute some code.
ExecuteInput ExecuteInput
{ header :: MessageHeader { header :: MessageHeader
, getCode :: Text -- ^ The code string. , getCode :: Text -- ^ The code string.
...@@ -349,17 +349,10 @@ data Message = ...@@ -349,17 +349,10 @@ data Message =
, inCode :: String -- ^ Submitted input code. , inCode :: String -- ^ Submitted input code.
, executionCount :: Int -- ^ Which input this is. , executionCount :: Int -- ^ Which input this is.
} }
| Input | Input { header :: MessageHeader, getCode :: Text, executionCount :: Int }
{ header :: MessageHeader | Output { header :: MessageHeader, getText :: [DisplayData], executionCount :: Int }
, getCode :: Text |
, executionCount :: Int CompleteRequest
}
| Output
{ header :: MessageHeader
, getText :: [DisplayData]
, executionCount :: Int
}
| CompleteRequest
{ header :: MessageHeader { header :: MessageHeader
, getCode :: Text {- ^ , getCode :: Text {- ^
The entire block of text where the line is. This may be useful in the The entire block of text where the line is. This may be useful in the
...@@ -489,7 +482,6 @@ instance FromJSON StreamType where ...@@ -489,7 +482,6 @@ instance FromJSON StreamType where
parseJSON (String "stdout") = return Stdout parseJSON (String "stdout") = return Stdout
parseJSON (String "stderr") = return Stderr parseJSON (String "stderr") = return Stderr
-- | Get the reply message type for a request message type. -- | Get the reply message type for a request message type.
replyType :: MessageType -> Maybe MessageType replyType :: MessageType -> Maybe MessageType
replyType KernelInfoRequestMessage = Just KernelInfoReplyMessage replyType KernelInfoRequestMessage = Just KernelInfoReplyMessage
......
...@@ -37,7 +37,7 @@ import IHaskell.IPython.Types ...@@ -37,7 +37,7 @@ import IHaskell.IPython.Types
-- should functionally serve as high-level sockets which speak Messages instead of ByteStrings. -- should functionally serve as high-level sockets which speak Messages instead of ByteStrings.
data ZeroMQInterface = data ZeroMQInterface =
Channels Channels
{ {
-- | A channel populated with requests from the frontend. -- | A channel populated with requests from the frontend.
shellRequestChannel :: Chan Message shellRequestChannel :: Chan Message
-- | Writing to this channel causes a reply to be sent to the frontend. -- | Writing to this channel causes a reply to be sent to the frontend.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment