minor changes, new ipython commit hash

demo/IHaskell.ipynb

@@ -368,7 +368,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 12
+     "prompt_number": 1
     },
     {
      "cell_type": "markdown",
@@ -398,7 +398,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 13
+     "prompt_number": 2
     },
     {
      "cell_type": "markdown",
@@ -440,7 +440,7 @@
        "output_type": "display_data"
       }
      ],
-     "prompt_number": 14
+     "prompt_number": 6
     },
     {
      "cell_type": "markdown",
@@ -507,7 +507,7 @@
        ]
       }
      ],
-     "prompt_number": 15
+     "prompt_number": 7
     },
     {
      "cell_type": "markdown",
@@ -573,7 +573,7 @@
        ]
       }
      ],
-     "prompt_number": 16
+     "prompt_number": 8
     },
     {
      "cell_type": "markdown",
@@ -731,7 +731,7 @@
        ]
       }
      ],
-     "prompt_number": 2
+     "prompt_number": 18
     },
     {
      "cell_type": "markdown",
@@ -1184,7 +1184,7 @@
        "output_type": "display_data"
       }
      ],
-     "prompt_number": 3
+     "prompt_number": 25
     },
     {
      "cell_type": "markdown",
@@ -1216,7 +1216,7 @@
        "output_type": "display_data"
       }
      ],
-     "prompt_number": 4
+     "prompt_number": 26
     },
     {
      "cell_type": "markdown",

IHaskell.cabal → ihaskell.cabal

@@ -7,7 +7,7 @@ name:                ihaskell
 -- PVP summary:      +-+------- breaking API changes
 --                   | | +----- non-breaking API additions
 --                   | | | +--- code changes with no API change
-version:             0.3.0.0
+version:             0.3.0.1
 
 -- A short (one-line) description of the package.
 synopsis:            A Haskell backend kernel for the IPython project.

src/IHaskell/Eval/Evaluate.hs

@@ -1044,11 +1044,12 @@ formatErrorWithClass :: String -> ErrMsg -> String
 formatErrorWithClass cls =
     printf "<span class='%s'>%s</span>" cls .
     replace "\n" "<br/>" .
-    fixStdinError .
     replace useDashV "" .
+    fixDollarSigns .
     rstrip .
     typeCleaner
   where
+    fixDollarSigns str = traceShowId  (replace "$" "<span>$</span>" str)
     useDashV = "\nUse -v to see a list of the files searched for."
     isShowError err =
       startswith "No instance for (Show" err &&
@@ -1066,16 +1067,7 @@ formatType :: String -> Display
 formatType typeStr =  Display [plain typeStr, html $ formatGetType typeStr]
 
 displayError :: ErrMsg -> Display
-displayError msg = Display [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
+displayError msg = Display [plain . typeCleaner $ msg, html $ formatError msg]
 
 mono :: String -> String
 mono = printf "<span class='mono'>%s</span>"

src/IHaskell/Eval/Hoogle.hs

@@ -150,7 +150,7 @@ renderSelf string loc
         span "hoogle-module" (link loc $ extractModule string) ++
         packageSub package
 
-  | otherwise
+  | otherwise 
     = let [name, args] = split "::" string
           package = extractPackageName loc
           modname = extractModuleName loc in

src/IHaskell/IPython.hs

@@ -40,7 +40,7 @@ data WhichIPython
 
 -- | Which commit of IPython we are on.
 ipythonCommit :: Text
-ipythonCommit = "9c922f54af799704f4000aeee94ec7c74cada194"
+ipythonCommit = "12247a8f4feffe16fb0bbdc0a18e7a1f46cd2ba1"
 
 -- | The IPython profile name.
 ipythonProfile :: String