scion-browser 0.2.11 → 0.2.12

raw patch · 3 files changed

+14/−7 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• scion-browser.cabal +1/−1
• src/Scion/Packages.hs +4/−2
• src/Scion/PersistentBrowser/Parser/Internal.hs +9/−4

@@ -1,5 +1,5 @@ name:           scion-browser
-version:        0.2.11
+version:        0.2.12
 cabal-version:  >= 1.8
 build-type:     Simple
 license:        BSD3

@@ -13,6 +13,8 @@ -- Cabal-related functionality.
 module Scion.Packages ( getPkgInfos ) where
 
+import Scion.PersistentBrowser.Util
+
 import Prelude hiding (Maybe)
 import qualified Config
 import qualified System.Info
@@ -182,8 +184,8 @@               let pkgInfo = parseInstalledPackageInfo pkgStr
               case pkgInfo of
                 ParseOk _ info -> return [info]
-                ParseFailed _  -> do
-                        -- logInfo (show err)
+                ParseFailed err  -> do
+                        logToStdout (show err)
                         return [emptyInstalledPackageInfo]
         ) (\_->return [emptyInstalledPackageInfo])
         

@@ -261,7 +261,10 @@         <|>
         (do n <- varid
             return $ KindVar NoDoc n)
-
+        <|>
+        (do n <- conid
+            return $ KindVar NoDoc n)
+            
 instance_ :: Doc -> BSParser (Documented Decl)
 instance_ doc = do string "instance"
                    -- HACK: in some Hoogle files things like [overlap ok] appear
@@ -314,10 +317,12 @@                                     rests <- many1 possibleKind
                                     let rest = concat $ map fst rests
                                         k = snd (last rests)
-                                    {- rest <- many $ allButDoubleColon
+                                    {- rest <- many $ allButDoubleColon                                     
                                     k <- optionMaybe (do string "::"
-                                                         spaces0
-                                                         kind) -}
+                                       spaces0
+                                       kind)
+                                     -}
+
                                     ty <- parseType rest
                                     let (ctx, hd) = typeToContextAndHead ty
                                     consAndFns <- many $ try (spacesOrEol0 >> documented constructorOrFunction)