Merge remote-tracking branch 'upstream/master' into path_completion

Conflicts:
	src/IHaskell/Eval/Evaluate.hs

IHaskell.cabal

@@ -48,6 +48,7 @@ data-files:
 library
   hs-source-dirs:      src
   build-depends:       base ==4.6.*,
+                       process >= 1.1,
                        hlint,
                        cmdargs >= 0.10,
                        tar,
@@ -109,6 +110,7 @@ executable IHaskell
   
   -- Other library packages from which modules are imported.
   build-depends:       base ==4.6.*,
+                       process >= 1.1,
                        hlint,
                        cmdargs >= 0.10,
                        tar,
@@ -145,6 +147,7 @@ Test-Suite hspec
   Ghc-Options: -threaded
   Main-Is: Hspec.hs
   build-depends:       base ==4.6.*,
+                       process >= 1.1,
                        hlint,
                        cmdargs >= 0.10,
                        tar,

README.md

@@ -12,6 +12,8 @@ As well as the IPython browser-based notebook interface:
 
 ![IPython Notebook](https://raw.github.com/gibiansky/IHaskell/master/images/ihaskell-notebook.png)
 
+*More usage information on the [wiki](https://github.com/gibiansky/IHaskell/wiki).*
+
 Installation
 ===
 

build.sh

+#!/bin/sh
+cd profile
+rm profile.tar
+tar -cvf profile.tar *
+cd ..
+cabal install --force-reinstalls || return 1
+cd ihaskell-display
+for dir in `ls`
+do
+    cd $dir
+    cabal install || return 1
+    cd ..
+done
+
+# Remove my profile
+rm -rf ~/.ipython/profile_haskell

ihaskell-display/ihaskell-aeson/IHaskell/Display/Aeson.hs

+{-# LANGUAGE NoImplicitPrelude, TypeSynonymInstances, QuasiQuotes #-}
+module IHaskell.Display.Aeson () where
+
+import ClassyPrelude
+import Data.Textual.Encoding
+import Data.Aeson
+import Data.Aeson.Encode.Pretty
+import Data.String.Here
+
+import IHaskell.Display
+
+instance IHaskellDisplay Value where
+  display renderable = return [plain json, html dom]
+    where 
+      json = unpack $ decodeUtf8 $ encodePretty renderable
+      dom = [i|<div class="highlight-code" id="javascript">${json}</div>|]

ihaskell-display/ihaskell-aeson/LICENSE

+The MIT License (MIT)
+
+Copyright (c) 2013 Andrew Gibiansky
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

ihaskell-display/ihaskell-aeson/Setup.hs

+import Distribution.Simple
+main = defaultMain

ihaskell-display/ihaskell-aeson/ihaskell-aeson.cabal

+-- The name of the package.
+name:                ihaskell-aeson
+
+-- The package version.  See the Haskell package versioning policy (PVP) 
+-- for standards guiding when and how versions should be incremented.
+-- http://www.haskell.org/haskellwiki/Package_versioning_policy
+-- PVP summary:      +-+------- breaking API changes
+--                   | | +----- non-breaking API additions
+--                   | | | +--- code changes with no API change
+version:             0.1.0.0
+
+-- A short (one-line) description of the package.
+synopsis:            IHaskell display instances for Aeson
+
+-- A longer description of the package.
+-- description:         
+
+-- URL for the project homepage or repository.
+homepage:            http://www.github.com/gibiansky/IHaskell-Display
+
+-- The license under which the package is released.
+-- license:             
+
+-- The file containing the license text.
+license-file:        LICENSE
+
+-- The package author(s).
+author:              Andrew Gibiansky
+
+-- An email address to which users can send suggestions, bug reports, and 
+-- patches.
+maintainer:          andrew.gibiansky@gmail.com
+
+-- A copyright notice.
+-- copyright:           
+
+category:            Development
+
+build-type:          Simple
+
+-- Extra files to be distributed with the package, such as examples or a 
+-- README.
+-- extra-source-files:  
+
+-- Constraint on the version of Cabal needed to build this package.
+cabal-version:       >=1.16
+
+library
+  -- Modules exported by the library.
+  exposed-modules:     IHaskell.Display.Aeson
+  
+  -- Modules included in this library but not exported.
+  -- other-modules:       
+  
+  -- Language extensions.
+  default-extensions: DoAndIfThenElse
+              OverloadedStrings
+             
+  -- Other library packages from which modules are imported.
+  build-depends:       base ==4.6.*,
+                       here,
+                       classy-prelude >=0.7,
+                       aeson,
+                       aeson-pretty,
+                       ihaskell
+  
+  -- Directories containing source files.
+  -- hs-source-dirs:      
+  
+  -- Base language which the package is written in.
+  default-language:    Haskell2010

ihaskell-display/ihaskell-basic/IHaskell/Display/Display.hs

+{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
+module IHaskell.Display.Display () where
+
+import IHaskell.Display
+
+import Text.Printf
+
+instance Show a => IHaskellDisplay (Maybe a) where
+  display just = return [stringDisplay, htmlDisplay]
+    where 
+      stringDisplay = plain (show just)
+      htmlDisplay = html str
+      str = case just of
+        Nothing -> "<span style='color: red; font-weight: bold;'>Nothing</span>"
+        Just x -> printf "<span style='color: green; font-weight: bold;'>Just</span><span style='font-family: monospace;'>%s</span>" (show x)

ihaskell-display/ihaskell-basic/LICENSE

+The MIT License (MIT)
+
+Copyright (c) 2013 Andrew Gibiansky
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

ihaskell-display/ihaskell-basic/README.md

+IHaskell-Display
+================
+
+Instances of IHaskellDisplay for default prelude data types.

ihaskell-display/ihaskell-basic/Setup.hs

+import Distribution.Simple
+main = defaultMain

ihaskell-display/ihaskell-basic/ihaskell-display.cabal

+-- Initial ihaskell-display.cabal generated by cabal init.  For further 
+-- documentation, see http://haskell.org/cabal/users-guide/
+
+-- The name of the package.
+name:                ihaskell-display
+
+-- The package version.  See the Haskell package versioning policy (PVP) 
+-- for standards guiding when and how versions should be incremented.
+-- http://www.haskell.org/haskellwiki/Package_versioning_policy
+-- PVP summary:      +-+------- breaking API changes
+--                   | | +----- non-breaking API additions
+--                   | | | +--- code changes with no API change
+version:             0.1.0.0
+
+-- A short (one-line) description of the package.
+synopsis:            IHaskell display instances for basic types
+
+-- A longer description of the package.
+-- description:         
+
+-- URL for the project homepage or repository.
+homepage:            http://www.github.com/gibiansky/IHaskell
+
+-- The license under which the package is released.
+-- license:             
+
+-- The file containing the license text.
+license-file:        LICENSE
+
+-- The package author(s).
+author:              Andrew Gibiansky
+
+-- An email address to which users can send suggestions, bug reports, and 
+-- patches.
+maintainer:          andrew.gibiansky@gmail.com
+
+-- A copyright notice.
+-- copyright:           
+
+category:            Development
+
+build-type:          Simple
+
+-- Extra files to be distributed with the package, such as examples or a 
+-- README.
+-- extra-source-files:  
+
+-- Constraint on the version of Cabal needed to build this package.
+cabal-version:       >=1.16
+
+
+library
+  -- Modules exported by the library.
+  exposed-modules:     IHaskell.Display.Display
+  
+  -- Modules included in this library but not exported.
+  -- other-modules:       
+  
+  -- Language extensions.
+  default-extensions: DoAndIfThenElse
+              OverloadedStrings
+             
+  -- Other library packages from which modules are imported.
+  build-depends:       base ==4.6.*,
+                       classy-prelude >=0.6,
+                       ihaskell
+  
+  -- Directories containing source files.
+  -- hs-source-dirs:      
+  
+  -- Base language which the package is written in.
+  default-language:    Haskell2010
+  

ihaskell-display/ihaskell-blaze/IHaskell/Display/Blaze.hs

+{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
+module IHaskell.Display.Blaze () where
+
+import IHaskell.Display
+
+import Text.Printf
+import Text.Blaze.Html
+import Text.Blaze.Renderer.Pretty
+import Text.Blaze.Internal
+import Control.Monad
+
+instance IHaskellDisplay (MarkupM a) where
+  display val = return [stringDisplay, htmlDisplay]
+    where 
+      str = renderMarkup (void val)
+      stringDisplay = plain str
+      htmlDisplay = html str

ihaskell-display/ihaskell-blaze/LICENSE

+The MIT License (MIT)
+
+Copyright (c) 2013 Andrew Gibiansky
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

ihaskell-display/ihaskell-blaze/Setup.hs

+import Distribution.Simple
+main = defaultMain

ihaskell-display/ihaskell-blaze/ihaskell-blaze.cabal

+-- Initial ihaskell-display.cabal generated by cabal init.  For further 
+-- documentation, see http://haskell.org/cabal/users-guide/
+
+-- The name of the package.
+name:                ihaskell-blaze
+
+-- The package version.  See the Haskell package versioning policy (PVP) 
+-- for standards guiding when and how versions should be incremented.
+-- http://www.haskell.org/haskellwiki/Package_versioning_policy
+-- PVP summary:      +-+------- breaking API changes
+--                   | | +----- non-breaking API additions
+--                   | | | +--- code changes with no API change
+version:             0.1.0.0
+
+-- A short (one-line) description of the package.
+synopsis:            IHaskell display instances for blaze-html types
+
+-- A longer description of the package.
+-- description:         
+
+-- URL for the project homepage or repository.
+homepage:            http://www.github.com/gibiansky/IHaskell-Display
+
+-- The license under which the package is released.
+-- license:             
+
+-- The file containing the license text.
+license-file:        LICENSE
+
+-- The package author(s).
+author:              Andrew Gibiansky
+
+-- An email address to which users can send suggestions, bug reports, and 
+-- patches.
+maintainer:          andrew.gibiansky@gmail.com
+
+-- A copyright notice.
+-- copyright:           
+
+category:            Development
+
+build-type:          Simple
+
+-- Extra files to be distributed with the package, such as examples or a 
+-- README.
+-- extra-source-files:  
+
+-- Constraint on the version of Cabal needed to build this package.
+cabal-version:       >=1.16
+
+
+library
+  -- Modules exported by the library.
+  exposed-modules:     IHaskell.Display.Blaze
+  
+  -- Modules included in this library but not exported.
+  -- other-modules:       
+  
+  -- Language extensions.
+  default-extensions: DoAndIfThenElse
+              OverloadedStrings
+             
+  -- Other library packages from which modules are imported.
+  build-depends:       base ==4.6.*,
+                       classy-prelude >=0.6,
+                       blaze-html >= 0.6,
+                       blaze-markup >= 0.5,
+                       ihaskell
+  
+  -- Directories containing source files.
+  -- hs-source-dirs:      
+  
+  -- Base language which the package is written in.
+  default-language:    Haskell2010

ihaskell-display/ihaskell-charts/IHaskell/Display/Charts.hs

+{-# LANGUAGE NoImplicitPrelude #-}
+module IHaskell.Display.Charts () where
+
+import ClassyPrelude
+
+import System.Directory
+import Data.Default.Class
+import Graphics.Rendering.Chart.Renderable
+import Graphics.Rendering.Chart.Backend.Cairo
+import qualified Data.ByteString.Base64 as Base64
+import qualified Data.ByteString.Char8 as Char
+import System.IO.Unsafe
+
+import IHaskell.Display
+
+width :: Width
+width = 450
+
+height :: Height
+height = 300
+
+instance IHaskellDisplay (Renderable a) where
+  display renderable = do
+    imgData <- chartData renderable PNG
+
+    -- We can add `svg svgDisplay` to the output of `display`,
+    -- but SVGs are not resizable in the IPython notebook.
+    svgDisplay <- chartData renderable SVG
+
+    return [png width height imgData, svg svgDisplay]
+
+chartData :: Renderable a -> FileFormat -> IO String
+chartData renderable format = do
+  -- Switch to a temporary directory so that any files we create aren't
+  -- visible. On Unix, this is usually /tmp.
+  try (getTemporaryDirectory >>= setCurrentDirectory) :: IO (Either SomeException ())
+
+  -- Write the PNG image.
+  let filename = ".ihaskell-chart.png"
+      opts = def{_fo_format = format, _fo_size = (width, height)}
+  renderableToFile opts renderable filename
+
+  -- Convert to base64.
+  imgData <- readFile $ fpFromString filename
+  return $ Char.unpack $ case format of
+    PNG -> Base64.encode imgData
+    _ -> imgData

ihaskell-display/ihaskell-charts/LICENSE

+The MIT License (MIT)
+
+Copyright (c) 2013 Andrew Gibiansky
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

ihaskell-display/ihaskell-charts/Setup.hs

+import Distribution.Simple
+main = defaultMain

ihaskell-display/ihaskell-charts/ihaskell-charts.cabal

+-- The name of the package.
+name:                ihaskell-charts
+
+-- The package version.  See the Haskell package versioning policy (PVP) 
+-- for standards guiding when and how versions should be incremented.
+-- http://www.haskell.org/haskellwiki/Package_versioning_policy
+-- PVP summary:      +-+------- breaking API changes
+--                   | | +----- non-breaking API additions
+--                   | | | +--- code changes with no API change
+version:             0.1.0.0
+
+-- A short (one-line) description of the package.
+synopsis:            IHaskell display instances for charts types
+
+-- A longer description of the package.
+-- description:         
+
+-- URL for the project homepage or repository.
+homepage:            http://www.github.com/gibiansky/IHaskell-Display
+
+-- The license under which the package is released.
+-- license:             
+
+-- The file containing the license text.
+license-file:        LICENSE
+
+-- The package author(s).
+author:              Andrew Gibiansky
+
+-- An email address to which users can send suggestions, bug reports, and 
+-- patches.
+maintainer:          andrew.gibiansky@gmail.com
+
+-- A copyright notice.
+-- copyright:           
+
+category:            Development
+
+build-type:          Simple
+
+-- Extra files to be distributed with the package, such as examples or a 
+-- README.
+-- extra-source-files:  
+
+-- Constraint on the version of Cabal needed to build this package.
+cabal-version:       >=1.16
+
+
+library
+  -- Modules exported by the library.
+  exposed-modules:     IHaskell.Display.Charts
+  
+  -- Modules included in this library but not exported.
+  -- other-modules:       
+  
+  -- Language extensions.
+  default-extensions: DoAndIfThenElse
+              OverloadedStrings
+             
+  -- Other library packages from which modules are imported.
+  build-depends:       base ==4.6.*,
+                       classy-prelude >=0.6,
+                       base64-bytestring,
+                       bytestring,
+                       data-default-class,
+                       directory,
+                       Chart,
+                       Chart-cairo,
+                       ihaskell
+  
+  -- Directories containing source files.
+  -- hs-source-dirs:      
+  
+  -- Base language which the package is written in.
+  default-language:    Haskell2010

ihaskell-display/ihaskell-diagrams/IHaskell/Display/Diagrams.hs

+{-# LANGUAGE NoImplicitPrelude, TypeSynonymInstances, FlexibleInstances  #-}
+module IHaskell.Display.Diagrams (diagram) where
+
+import ClassyPrelude
+
+import System.Directory
+import qualified Data.ByteString.Base64 as Base64
+import qualified Data.ByteString.Char8 as Char
+import System.IO.Unsafe
+
+import Diagrams.Prelude
+import Diagrams.Backend.Cairo
+
+import IHaskell.Display
+
+instance IHaskellDisplay (Diagram Cairo R2) where
+  display renderable = do
+    (width, height, imgData) <- diagramData renderable PNG
+    (_, _, svgData) <- diagramData renderable SVG
+    return [png (floor width) (floor height) imgData, svg svgData]
+
+diagramData :: Diagram Cairo R2 -> OutputType -> IO (Double, Double, String)
+diagramData renderable format = do
+  -- Switch to a temporary directory so that any files we create aren't
+  -- visible. On Unix, this is usually /tmp.
+  try (getTemporaryDirectory >>= setCurrentDirectory) :: IO (Either SomeException ())
+
+  -- Compute width and height.
+  let w = width renderable
+      h = height renderable
+      aspect = w / h
+      imgHeight = 300
+      imgWidth = aspect * imgHeight
+
+  -- Write the image.
+  let filename = ".ihaskell-diagram." ++ extension format
+  renderCairo filename (Height imgHeight) renderable
+
+  -- Convert to base64.
+  imgData <- readFile $ fpFromString filename
+  let value = Char.unpack $ case format of
+        PNG -> Base64.encode imgData
+        _ ->   imgData
+
+  return (imgWidth, imgHeight, value)
+  where
+    extension SVG = "svg"
+    extension PNG = "png"
+
+-- Rendering hint.
+diagram :: Diagram Cairo R2 -> Diagram Cairo R2
+diagram = id

ihaskell-display/ihaskell-diagrams/LICENSE

+The MIT License (MIT)
+
+Copyright (c) 2013 Andrew Gibiansky
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

ihaskell-display/ihaskell-diagrams/Setup.hs

+import Distribution.Simple
+main = defaultMain

ihaskell-display/ihaskell-diagrams/ihaskell-diagrams.cabal

+-- The name of the package.
+name:                ihaskell-diagrams
+
+-- The package version.  See the Haskell package versioning policy (PVP) 
+-- for standards guiding when and how versions should be incremented.
+-- http://www.haskell.org/haskellwiki/Package_versioning_policy
+-- PVP summary:      +-+------- breaking API changes
+--                   | | +----- non-breaking API additions
+--                   | | | +--- code changes with no API change
+version:             0.1.0.0
+
+-- A short (one-line) description of the package.
+synopsis:            IHaskell display instances for diagram types
+
+-- A longer description of the package.
+-- description:         
+
+-- URL for the project homepage or repository.
+homepage:            http://www.github.com/gibiansky/IHaskell-Display
+
+-- The license under which the package is released.
+-- license:             
+
+-- The file containing the license text.
+license-file:        LICENSE
+
+-- The package author(s).
+author:              Andrew Gibiansky
+
+-- An email address to which users can send suggestions, bug reports, and 
+-- patches.
+maintainer:          andrew.gibiansky@gmail.com
+
+-- A copyright notice.
+-- copyright:           
+
+category:            Development
+
+build-type:          Simple
+
+-- Extra files to be distributed with the package, such as examples or a 
+-- README.
+-- extra-source-files:  
+
+-- Constraint on the version of Cabal needed to build this package.
+cabal-version:       >=1.16
+
+
+library
+  -- Modules exported by the library.
+  exposed-modules:     IHaskell.Display.Diagrams
+  
+  -- Modules included in this library but not exported.
+  -- other-modules:       
+  
+  -- Language extensions.
+  default-extensions: DoAndIfThenElse
+              OverloadedStrings
+             
+  -- Other library packages from which modules are imported.
+  build-depends:       base ==4.6.*,
+                       classy-prelude >=0.6,
+                       base64-bytestring,
+                       bytestring,
+                       directory,
+                       diagrams,
+                       diagrams-lib, 
+                       diagrams-cairo,
+                       ihaskell
+  
+  -- Directories containing source files.
+  -- hs-source-dirs:      
+  
+  -- Base language which the package is written in.
+  default-language:    Haskell2010

profile/static/custom/custom.js

-// leave at least 2 line with only a star on it below, or doc generation fails
-/**
- *
- *
- * Placeholder for custom user javascript
- * mainly to be overridden in profile/static/js/custom.js
- * This will always be an empty file in IPython
- *
- * User could add any javascript in the `profile/static/js/custom.js` file
- * (and should create it if it does not exist).
- * It will be executed by the ipython notebook at load time.
- *
- * Same thing with `profile/static/css/custom.css` to inject custom css into the notebook.
- *
- * Example :
- *
- * Create a custom button in toolbar that execute `%qtconsole` in kernel
- * and hence open a qtconsole attached to the same kernel as the current notebook
- *
- *    $([IPython.events]).on('notebook_loaded.Notebook', function(){
- *        IPython.toolbar.add_buttons_group([
- *            {
- *                 'label'   : 'run qtconsole',
- *                 'icon'    : 'ui-icon-calculator', // select your icon from http://jqueryui.com/themeroller/
- *                 'callback': function(){IPython.notebook.kernel.execute('%qtconsole')}
- *            }
- *            // add more button here if needed.
- *            ]);
- *    });
- *
- * Example :
- *
- *  Use `jQuery.getScript(url [, success(script, textStatus, jqXHR)] );`
- *  to load custom script into the notebook.
- *
- *    // to load the metadata ui extension example.
- *    $.getScript('/static/js/celltoolbarpresets/example.js');
- *    // or
- *    // to load the metadata ui extension to control slideshow mode / reveal js for nbconvert
- *    $.getScript('/static/js/celltoolbarpresets/slideshow.js');
- *
- *
- * @module IPython
- * @namespace IPython
- * @class customjs
- * @static
- */
-
-// end of IPython unmodified version 
-
-
 $([IPython.events]).on('notebook_loaded.Notebook', function(){
     // add here logic that should be run once per **notebook load**
     // (!= page load), like restarting a checkpoint
@@ -88,8 +37,11 @@ $([IPython.events]).on('app_initialized.NotebookApp', function(){
     IPython.CodeCell.options_default['cm_config']['mode'] = 'haskell';
 });
 
-var highlightCodes = function() {
+$([IPython.events]).on('shell_reply.Kernel', function() {
     // Add logic here that should be run once per reply.
+
+    // Highlight things with a .highlight-code class
+    // The id is the mode with with to highlight
     $('.highlight-code').each(function() {
         var $this = $(this),
             $code = $this.html(),
@@ -107,6 +59,4 @@ var highlightCodes = function() {
                 readOnly: true
             });
     });
-};
-
-$([IPython.events]).on('shell_reply.Kernel', highlightCodes);
+});

src/IHaskell/Eval/Evaluate.hs

@@ -26,6 +26,9 @@ import System.IO (hGetChar, hFlush)
 import System.Random (getStdGen, randomRs)
 import Unsafe.Coerce
 import Control.Monad (guard)
+import System.Process
+import System.Exit
+import Data.Maybe (fromJust)
 
 import NameSet
 import Name
@@ -82,7 +85,7 @@ globalImports :: [String]
 globalImports =
   [ "import IHaskell.Display"
   , "import Control.Applicative ((<$>))"
-  , "import GHC.IO.Handle (hDuplicateTo, hDuplicate)"
+  , "import GHC.IO.Handle (hDuplicateTo, hDuplicate, hClose)"
   , "import System.Posix.IO"
   , "import System.Posix.Files"
   , "import System.IO"
@@ -100,6 +103,11 @@ interpret action = runGhc (Just libdir) $ do
   void $ setSessionDynFlags $ dflags { hscTarget = HscInterpreted, ghcLink = LinkInMemory }
 
   initializeImports
+
+  -- Close stdin so it can't be used.
+  -- Otherwise it'll block the kernel forever.
+  runStmt "System.IO.hClose System.IO.stdin" RunToCompletion
+
   initializeItVariable
 
   -- Run the rest of the interpreter
@@ -397,6 +405,73 @@ evalCommand _ (Directive SetOpt option) state = do
 
     setOpt _ _ = Nothing
 
+evalCommand publish (Directive ShellCmd ('!':cmd)) state = wrapExecution state $ liftIO $ 
+  case words cmd of 
+    "cd":dirs ->
+      let directory = unwords dirs in do
+        setCurrentDirectory directory
+        return []
+    cmd -> do
+      (readEnd, writeEnd) <- createPipe
+      handle <- fdToHandle writeEnd
+      pipe <- fdToHandle readEnd
+      let initProcSpec = shell $ unwords cmd
+          procSpec = initProcSpec {
+            std_in = Inherit,
+            std_out = UseHandle handle,
+            std_err = UseHandle handle
+          }
+      (_, _, _, process) <- createProcess procSpec
+          
+      -- Accumulate output from the process.
+      outputAccum <- liftIO $ newMVar ""
+
+      -- Start a loop to publish intermediate results.
+      let 
+        -- Compute how long to wait between reading pieces of the output. 
+        -- `threadDelay` takes an argument of microseconds.
+        ms = 1000
+        delay = 100 * ms
+
+        -- Maximum size of the output (after which we truncate).
+        maxSize = 100 * 1000
+        incSize = 200
+        output str = publish False [plain str]
+
+        loop = do
+          -- Wait and then check if the computation is done.
+          threadDelay delay
+
+          -- Read next chunk and append to accumulator.
+          nextChunk <- readChars pipe "\n" incSize
+          modifyMVar_ outputAccum (return . (++ nextChunk))
+
+          -- Check if we're done.
+          exitCode <- getProcessExitCode process
+          let computationDone = isJust exitCode
+
+          when computationDone $ do
+            nextChunk <- readChars pipe "" maxSize
+            modifyMVar_ outputAccum (return . (++ nextChunk))
+
+          if not computationDone
+          then do
+            -- Write to frontend and repeat.
+            readMVar outputAccum >>= output 
+            loop
+          else do
+            out <- readMVar outputAccum
+            case fromJust exitCode of
+              ExitSuccess -> return [plain out]
+              ExitFailure code -> do
+                let errMsg = "Process exited with error code " ++ show code
+                    htmlErr = printf "<span class='err-msg'>%s</span>" errMsg
+                return [plain $ out ++ "\n" ++ errMsg,
+                        html $ printf "<span class='mono'>%s</span>" out ++ htmlErr]
+
+      loop
+      
+
 -- This is taken largely from GHCi's info section in InteractiveUI.
 evalCommand _ (Directive GetHelp _) state = do
   write "Help via :help or :?."
@@ -483,7 +558,7 @@ evalCommand output (Statement stmt) state = wrapExecution state $ do
           return $ name ++ " :: " ++ theType
 
         let joined = unlines types
-            htmled = formatGetType joined
+            htmled = unlines $ map formatGetType types
 
         return $ case output of
           [] -> [html htmled]
@@ -491,7 +566,7 @@ evalCommand output (Statement stmt) state = wrapExecution state $ do
           -- Return plain and html versions.
           -- Previously there was only a plain version.
           [Display PlainText text] ->
-            [plain $ joined ++ "n" ++ text,
+            [plain $ joined ++ "\n" ++ text,
              html  $ htmled ++ mono text]
 
     RunException exception -> throw exception
@@ -518,7 +593,7 @@ evalCommand output (Expression expr) state = do
   -- If evaluation failed, return the failure.  If it was successful, we
   -- may be able to use the IHaskellDisplay typeclass.
   if not canRunDisplay
-  then return $ if not showErr
+  then return $ if not showErr || useShowErrors state
                 then evalOut
                 else postprocessShowError evalOut
   else case evalStatus evalOut of
@@ -609,10 +684,23 @@ evalCommand output (Expression expr) state = do
 
 evalCommand _ (Declaration decl) state = wrapExecution state $ do
   write $ "Declaration:\n" ++ decl
-  runDecls decl
+  names <- runDecls decl
+
+  dflags <- getSessionDynFlags
+  let boundNames = map (replace ":Interactive." "" . showPpr dflags) names  
+      nonDataNames = filter (not . isUpper . head) boundNames
+
+  -- Display the types of all bound names if the option is on.
+  -- This is similar to GHCi :set +t.
+  if not $ useShowTypes state
+  then return []
+  else do
+    -- Get all the type strings.
+    types <- forM nonDataNames $ \name -> do
+      theType <- showSDocUnqual dflags . ppr <$> exprType name
+      return $ name ++ " :: " ++ theType
 
-  -- Do not display any output
-  return []
+    return [html $ unlines $ map formatGetType types]
 
 evalCommand _ (TypeSignature sig) state = wrapExecution state $
   -- We purposefully treat this as a "success" because that way execution
@@ -629,6 +717,29 @@ evalCommand _ (ParseError loc err) state = do
     evalState = state
   }
 
+-- Read from a file handle until we hit a delimiter or until we've read
+-- as many characters as requested
+readChars :: Handle -> String -> Int -> IO String
+
+-- If we're done reading, return nothing.
+readChars handle delims 0 = return []
+
+readChars handle delims nchars = do
+  -- Try reading a single character. It will throw an exception if the
+  -- handle is already closed.
+  tryRead <- gtry $ hGetChar handle :: IO (Either SomeException Char)
+  case tryRead of
+    Right char ->
+      -- If this is a delimiter, stop reading.
+      if char `elem` delims
+      then return [char]
+      else do
+        next <- readChars handle delims (nchars - 1)
+        return $ char:next
+    -- An error occurs at the end of the stream, so just stop reading.
+    Left _ -> return []
+
+
 doLoadModule :: String -> String -> Ghc [DisplayData]
 doLoadModule name modName = flip gcatch unload $ do
   -- Compile loaded modules.
@@ -756,6 +867,7 @@ capturedStatement output stmt = do
         -- An error occurs at the end of the stream, so just stop reading.
         Left _ -> return []
 
+
   -- Keep track of whether execution has completed.
   completed <- liftIO $ newMVar False
   finishedReading <- liftIO newEmptyMVar
@@ -821,6 +933,7 @@ formatErrorWithClass cls =
     printf "<span class='%s'>%s</span>" cls .
     replace "\n" "<br/>" .
     fixLineWrapping .
+    fixStdinError .
     replace useDashV "" .
     rstrip .
     typeCleaner
@@ -868,7 +981,16 @@ formatType :: String -> [DisplayData]
 formatType typeStr =  [plain typeStr, html $ formatGetType typeStr]
 
 displayError :: ErrMsg -> [DisplayData]
-displayError msg = [plain . typeCleaner $ msg, html $ formatError msg]
+displayError msg = [plain . fixStdinError . typeCleaner $ msg, html $ formatError msg] 
+
+fixStdinError :: ErrMsg -> ErrMsg
+fixStdinError err =
+  if isStdinErr err
+  then "<stdin> is not available in IHaskell. Use special `inputLine` instead of `getLine`."
+  else err
+  where
+    isStdinErr err = startswith "<stdin>" err
+      && "illegal operation (handle is closed)" `isInfixOf` err
 
 mono :: String -> String
 mono = printf "<span class='mono'>%s</span>"

src/IHaskell/Eval/Parser.hs

@@ -62,6 +62,7 @@ data DirectiveType
   | SetExtension    -- ^ Enable or disable an extension via ':extension' (or prefixes)
   | LoadFile        -- ^ Load a Haskell module.
   | SetOpt          -- ^ Set various options.
+  | ShellCmd        -- ^ Execute a shell command.
   | GetHelp         -- ^ General help via ':?' or ':help'.
   deriving (Show, Eq)
 
@@ -219,6 +220,8 @@ joinFunctions [] = []
 parseDirective :: String       -- ^ Directive string.
                -> Int          -- ^ Line number at which the directive appears.
                -> CodeBlock    -- ^ Directive code block or a parse error.
+
+parseDirective (':':'!':directive) line = Directive ShellCmd $ '!':directive
 parseDirective (':':directive) line = case find rightDirective directives of
   Just (directiveType, _) -> Directive directiveType arg
     where arg = unwords restLine
@@ -292,6 +295,9 @@ joinLines = intercalate "\n"
 dropComments :: String -> String
 dropComments = removeOneLineComments . removeMultilineComments
   where
+    -- Don't remove comments after cmd directives
+    removeOneLineComments (':':'!':remaining) = ":!" ++ takeWhile (/= '\n') remaining ++ 
+      removeOneLineComments (dropWhile (/= '\n') remaining)
     removeOneLineComments ('-':'-':remaining) = removeOneLineComments (dropWhile (/= '\n') remaining)
     removeOneLineComments (x:xs) = x:removeOneLineComments xs
     removeOneLineComments x = x

src/IHaskell/Types.hs

@@ -74,7 +74,6 @@ instance ToJSON Profile where
 data KernelState = KernelState
   { getExecutionCounter :: Int,
     getLintStatus :: LintStatus,  -- Whether to use hlint, and what arguments to pass it. 
-    getCwd :: String,
     useSvg :: Bool,
     useShowErrors :: Bool,
     useShowTypes :: Bool
@@ -85,7 +84,6 @@ defaultKernelState :: KernelState
 defaultKernelState = KernelState
   { getExecutionCounter = 1,
     getLintStatus = LintOn,
-    getCwd = ".",
     useSvg = True,
     useShowErrors = False,
     useShowTypes = False

src/Main.hs

@@ -223,8 +223,6 @@ runKernel profileSrc initInfo = do
 
   -- Create initial state in the directory the kernel *should* be in.
   state <- initialKernelState
-  modifyMVar_ state $ \initState ->
-    return initState { getCwd = initDir initInfo }
 
   -- Receive and reply to all messages on the shell socket.
   interpret $ do