mirrors/IHaskell
1
0
Fork 0
mirror of https://github.com/IHaskell/IHaskell.git synced 2025-04-16 11:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleaned things up, and initial version of stuff works!!

Browse Source
This commit is contained in:
Andrew Gibiansky 2014-03-17 20:25:53 -07:00
parent 721c5d1d45
commit f07febc32a
7 changed files with 159 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
ihaskell-display/ihaskell-parsec/IHaskell/Display/Parsec.hs
View File

@ -1,68 +1,60 @@
{-# LANGUAGE NoImplicitPrelude, TypeSynonymInstances, QuasiQuotes, FlexibleInstances #-}
{-# LANGUAGE NoImplicitPrelude, TypeSynonymInstances, QuasiQuotes, FlexibleInstances, OverloadedStrings #-}
module IHaskell.Display.Parsec () where
import ClassyPrelude
import ClassyPrelude hiding (fromList)
import System.Random
import Data.String.Here
import Data.HashMap.Strict as Map
import Text.Parsec
import Text.Parsec.Prim
import Text.Parsec.String
import Text.Parsec.Error
import Data.Aeson
import IHaskell.Display
instance IHaskellDisplay (Parser a) where
display renderable = do
key <- randomRIO (1, 100000000000) :: IO Int
return $ Display [html $ dom key]
instance Show a => IHaskellDisplay (Parser a) where
display renderable = return $ Display [html dom]
where
dom key =
let divId = "text" ++ show key ++ "" in
dom =
[i|
<form><textarea id="parsec-editor">Hello!</textarea></form>
<!--
<script>
// Register the comm target.
var ParsecWidget = function (comm) {
this.comm = comm;
this.comm.on_msg($.proxy(this.handler, this));
// get the cell that was probably executed
// msg_id:cell mapping will make this possible without guessing
this.cell = IPython.notebook.get_cell(IPython.notebook.get_selected_index()-1);
this.callbacks = {
iopub : {
output : function () {
console.log("Iopub output", arguments);
}
}
};
// Create the editor.
console.log("Editoring");
var out = this.cell.output_area.element;
var textarea = output_area.find("#parsec-editor")[0];
var editor = CodeMirror.fromTextArea(textarea);
editor.on("change", function() {
var text = editor.getDoc().getValue();
console.log("New text: " + text);
comm.send({"text": text}, function () {
console.log("Got response!", arguments);
});
});
};
ParsecWidget.prototype.handler = function(msg) {
console.log('handle', this, msg, this.cell.output_area);
};
IPython.notebook.kernel.comm_manager.register_target('parsec', IPython.utils.always_new(ParsecWidget));
</script>
-->
<script src="/static/components/codemirror/addon/lint/lint.js" charset="utf-8"></script>
<form><textarea id="parsec-editor">Insert parser text here...</textarea></form>
<pre id="parsec-output"></pre>
|]
instance IHaskellWidget (Parser a) where
-- | Text to parse.
data ParseText = ParseText String
instance FromJSON ParseText where
parseJSON (Object v) = ParseText <$> v .: "text"
parseJSON _ = fail "Expecting object"
-- | Output of parsing.
instance Show a => ToJSON (Either ParseError a) where
toJSON (Left err) = object [
"status" .= ("error" :: String),
"line" .= sourceLine (errorPos err),
"col" .= sourceColumn (errorPos err),
"msg" .= show err
]
toJSON (Right result) = object [
"status" .= ("success" :: String),
"result" .= show result
]
instance Show a => IHaskellWidget (Parser a) where
-- Name for this widget.
targetName _ = "parsec"
open widget value publisher = return ()
comm widget value publisher = do
DEAL WITH ACTUAL PARSECS
publisher value
-- When we rece
comm widget (Object dict) publisher = do
let key = "text" :: Text
Just (String text) = Map.lookup key dict
result = parse widget "<interactive>" $ unpack text
publisher $ toJSON result
-- We have no resources to close.
close widget value = return ()

2
ihaskell-display/ihaskell-parsec/ihaskell-parsec.cabal
View File

@ -58,6 +58,8 @@ library
-- Other library packages from which modules are imported.
build-depends: base ==4.6.*,
aeson ==0.7.*,
unordered-containers,
classy-prelude,
random >= 1,
parsec,

2
ipython-kernel/src/IPython/Types.hs
View File

@ -342,6 +342,8 @@ data Message
commUuid :: UUID,
commData :: Value
}
| SendNothing -- Dummy message; nothing is sent.
deriving Show
-- | Possible statuses in the execution reply messages.

1
ipython-kernel/src/IPython/ZeroMQ.hs
View File

@ -179,6 +179,7 @@ receiveMessage socket = do
-- | Encode a message in the IPython ZeroMQ communication protocol
-- | and send it through the provided socket.
sendMessage :: Sender a => Socket a -> Message -> IO ()
sendMessage _ SendNothing = return ()
sendMessage socket message = do
let head = header message
parentHeaderStr = maybe "{}" encodeStrict $ parentHeader head

181
notebooks/Test.ipynb
View File

@ -21,13 +21,33 @@
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 2
"prompt_number": 37
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"oneOf \"Hello\" :: Parser Char"
"data List = List [Int] deriving Show\n",
"\n",
"let -- Parse a nonempty int list like [1, 2, 3]\n",
" parser :: Parser List\n",
" parser = do\n",
" char '['\n",
" values <- option [] $ many1 element\n",
" char ']'\n",
" return $ List values\n",
" \n",
" -- Parse an element of an int list, like \"3, \"\n",
" element = do\n",
" value <- many1 $ oneOf \"0123456789\"\n",
" optional $ char ','\n",
" whitespace\n",
" return $ read value\n",
" \n",
" -- Parse any whitespace\n",
" whitespace = many $ oneOf \" \\t\"\n",
"\n",
"parser"
],
"language": "python",
"metadata": {},
@ -35,53 +55,17 @@
{
"html": [
"\n",
" <script src=\"/static/components/codemirror/addon/lint/lint.js\" charset=\"utf-8\"></script>\n",
" <form><textarea id=\"parsec-editor\">Hello!</textarea></form>\n",
" <!--\n",
" <script>\n",
" // Register the comm target.\n",
" var ParsecWidget = function (comm) {\n",
" this.comm = comm;\n",
" this.comm.on_msg($.proxy(this.handler, this));\n",
"\n",
" // get the cell that was probably executed\n",
" // msg_id:cell mapping will make this possible without guessing\n",
" this.cell = IPython.notebook.get_cell(IPython.notebook.get_selected_index()-1);\n",
" this.callbacks = {\n",
" iopub : {\n",
" output : function () {\n",
" console.log(\"Iopub output\", arguments);\n",
" }\n",
" }\n",
" };\n",
"\n",
" // Create the editor.\n",
" console.log(\"Editoring\");\n",
" var out = this.cell.output_area.element;\n",
" var textarea = output_area.find(\"#parsec-editor\")[0];\n",
" var editor = CodeMirror.fromTextArea(textarea);\n",
" editor.on(\"change\", function() {\n",
" var text = editor.getDoc().getValue();\n",
" console.log(\"New text: \" + text);\n",
" comm.send({\"text\": text}, function () {\n",
" console.log(\"Got response!\", arguments);\n",
" });\n",
" });\n",
" };\n",
"\n",
" ParsecWidget.prototype.handler = function(msg) {\n",
" console.log('handle', this, msg, this.cell.output_area);\n",
" };\n",
"\n",
" IPython.notebook.kernel.comm_manager.register_target('parsec', IPython.utils.always_new(ParsecWidget));\n",
" </script>\n",
" -->\n",
" <pre id=\"parsec-output\">\n",
" </pre>\n",
" "
],
"metadata": {},
"output_type": "display_data"
}
],
"prompt_number": 3
"prompt_number": 41
},
{
"cell_type": "code",
@ -92,6 +76,7 @@
":set -XQuasiQuotes\n",
"\n",
"html [i|\n",
" <link rel=\"stylesheet\" href=\"/static/components/codemirror/addon/lint/lint.css\">\n",
" <script>\n",
" // Register the comm target.\n",
" var ParsecWidget = function (comm) {\n",
@ -105,9 +90,34 @@
" // Create the editor.\n",
" var out = this.cell.output_area.element;\n",
" var textarea = out.find(\"#parsec-editor\")[0];\n",
" var editor = CodeMirror.fromTextArea(textarea);\n",
" editor.on(\"change\", function() {\n",
" var widget = this;\n",
" var editor = CodeMirror.fromTextArea(textarea, {\n",
" lineNumbers: true,\n",
" gutters: [\"CodeMirror-lint-markers\"],\n",
" lintWith: {\n",
" \"getAnnotations\": function(cm, update, opts) {\n",
" console.log(\"getAnnotations\", widget);\n",
" if (widget.hasError) {\n",
" var errs = [{\n",
" from: CodeMirror.Pos(parseInt(widget.error[\"line\"]) - 1, parseInt(widget.error[\"col\"]) - 1),\n",
" to: CodeMirror.Pos(parseInt(widget.error[\"line\"]) - 1, parseInt(widget.error[\"col\"])),\n",
" message: widget.error[\"msg\"],\n",
" severity: \"error\"\n",
" }];\n",
" console.log(\"errs\", errs);\n",
" update(cm, errs);\n",
" } else {\n",
" update(cm, []);\n",
" }\n",
" },\n",
" \"async\": true,\n",
" }\n",
" });\n",
" \n",
" this.output = out.find(\"#parsec-output\")[0];\n",
" editor.on(\"keyup\", function() {\n",
" var text = editor.getDoc().getValue();\n",
" console.log(\"Sent \" + text);\n",
" comm.send({\"text\": text});\n",
" });\n",
" this.editor = editor;\n",
@ -115,9 +125,15 @@
"\n",
" ParsecWidget.prototype.handler = function(msg) {\n",
" var data = msg.content.data;\n",
" if (data[\"status\"] == \"error\") {\n",
" editor.getDoc().setValue(\"ERROR!!!\");\n",
" console.log(data);\n",
" this.hasError = data[\"status\"] == \"error\";\n",
" if (this.hasError) {\n",
" out = data[\"msg\"];\n",
" this.error = data;\n",
" } else {\n",
" out = data[\"result\"];\n",
" }\n",
" this.output.innerHTML = out;\n",
" };\n",
"\n",
" IPython.notebook.kernel.comm_manager.register_target('parsec', IPython.utils.always_new(ParsecWidget));\n",
@ -130,39 +146,64 @@
{
"html": [
"\n",
" <link rel=\"stylesheet\" href=\"/static/components/codemirror/addon/lint/lint.css\">\n",
" <script>\n",
" // Register the comm target.\n",
" // Register the comm target.\n",
" var ParsecWidget = function (comm) {\n",
" this.comm = comm;\n",
" this.comm.on_msg($.proxy(this.handler, this));\n",
"\n",
" // get the cell that was probably executed\n",
" // msg_id:cell mapping will make this possible without guessing\n",
" // Get the cell that was probably executed.\n",
" // The msg_id:cell mapping will make this possible without guessing.\n",
" this.cell = IPython.notebook.get_cell(IPython.notebook.get_selected_index()-1);\n",
" this.callbacks = {\n",
" iopub : {\n",
" output : function () {\n",
" console.log(\"Iopub output\", arguments);\n",
" }\n",
" }\n",
" };\n",
"\n",
" // Create the editor.\n",
" console.log(\"Editoring\");\n",
" var out = this.cell.output_area.element;\n",
" var textarea = out.find(\"#parsec-editor\")[0];\n",
" var editor = CodeMirror.fromTextArea(textarea);\n",
" editor.on(\"change\", function() {\n",
" var text = editor.getDoc().getValue();\n",
" console.log(\"New text: \" + text);\n",
" comm.send({\"text\": text}, function () {\n",
" console.log(\"Got response!\", arguments);\n",
" });\n",
" var widget = this;\n",
" var editor = CodeMirror.fromTextArea(textarea, {\n",
" lineNumbers: true,\n",
" gutters: [\"CodeMirror-lint-markers\"],\n",
" lintWith: {\n",
" \"getAnnotations\": function(cm, update, opts) {\n",
" console.log(\"getAnnotations\", widget);\n",
" if (widget.hasError) {\n",
" var errs = [{\n",
" from: CodeMirror.Pos(parseInt(widget.error[\"line\"]) - 1, parseInt(widget.error[\"col\"]) - 1),\n",
" to: CodeMirror.Pos(parseInt(widget.error[\"line\"]) - 1, parseInt(widget.error[\"col\"])),\n",
" message: widget.error[\"msg\"],\n",
" severity: \"error\"\n",
" }];\n",
" console.log(\"errs\", errs);\n",
" update(cm, errs);\n",
" } else {\n",
" update(cm, []);\n",
" }\n",
" },\n",
" \"async\": true,\n",
" }\n",
" });\n",
" \n",
" this.output = out.find(\"#parsec-output\")[0];\n",
" editor.on(\"keyup\", function() {\n",
" var text = editor.getDoc().getValue();\n",
" console.log(\"Sent \" + text);\n",
" comm.send({\"text\": text});\n",
" });\n",
" this.editor = editor;\n",
" };\n",
"\n",
" ParsecWidget.prototype.handler = function(msg) {\n",
" console.log('handle', this, msg, this.cell.output_area);\n",
" var data = msg.content.data;\n",
" console.log(data);\n",
" this.hasError = data[\"status\"] == \"error\";\n",
" if (this.hasError) {\n",
" out = data[\"msg\"];\n",
" this.error = data;\n",
" } else {\n",
" out = data[\"result\"];\n",
" }\n",
" this.output.innerHTML = out;\n",
" };\n",
"\n",
" IPython.notebook.kernel.comm_manager.register_target('parsec', IPython.utils.always_new(ParsecWidget));\n",
@ -173,15 +214,7 @@
"output_type": "display_data"
}
],
"prompt_number": 1
},
{
"cell_type": "code",
"collapsed": false,
"input": [],
"language": "python",
"metadata": {},
"outputs": []
"prompt_number": 36
}
],
"metadata": {}

1
src/IHaskell/Types.hs
View File

@ -109,7 +109,6 @@ instance IHaskellDisplay Widget where
instance IHaskellWidget Widget where
targetName (Widget widget) = targetName widget
open (Widget widget) = open widget
comm (Widget widget) = comm widget
close (Widget widget) = close widget

10
src/Main.hs
View File

@ -189,6 +189,7 @@ runKernel profileSrc initInfo = do
let replier = writeChan (iopubChannel interface)
newState <- handleComm replier oldState request replyHeader
putMVar state newState
writeChan (shellReplyChannel interface) SendNothing
else do
-- Create the reply, possibly modifying kernel state.
oldState <- liftIO $ takeMVar state
@ -201,7 +202,7 @@ runKernel profileSrc initInfo = do
ignoreCtrlC =
installHandler keyboardSignal (CatchOnce $ putStrLn "Press Ctrl-C again to quit kernel.") Nothing
isCommMessage req = msgType (header req) `elem` [CommOpenMessage, CommDataMessage, CommCloseMessage]
isCommMessage req = msgType (header req) `elem` [CommDataMessage, CommCloseMessage]
-- Initial kernel state.
initialKernelState :: IO (MVar KernelState)
@ -373,25 +374,18 @@ replyTo _ ObjectInfoRequest{objectName = oname} replyHeader state = do
handleComm :: (Message -> IO ()) -> KernelState -> Message -> MessageHeader -> IO KernelState
handleComm replier kernelState req replyHeader = do
putStrLn "Handle comm"
print req
let widgets = openComms kernelState
uuid = commUuid req
dat = commData req
communicate value = do
head <- dupHeader replyHeader CommDataMessage
putStrLn "Sending back data:"
print value
replier $ CommData head uuid value
case lookup uuid widgets of
Nothing -> fail $ "no widget with uuid " ++ show uuid
Just (Widget widget) ->
case msgType $ header req of
CommOpenMessage -> do
open widget dat communicate
return kernelState
CommDataMessage -> do
putStrLn "comm data"
comm widget dat communicate
return kernelState
CommCloseMessage -> do