haskellish 0.3.2.2 → 0.3.2.3

raw patch · 2 files changed

+13/−13 lines, 2 filesdep ~containersdep ~template-haskelldep ~textPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: containers, template-haskell, text

API changes (from Hackage documentation)

Files

• Language/Haskellish.hs +9/−9
• haskellish.cabal +4/−4

@@ -9,7 +9,7 @@ import Control.Monad import Control.Monad.State import Control.Monad.Except-import Data.Either (isRight)+-- import Data.Either (isRight) import Data.Maybe (catMaybes) import Data.Text (Text) import qualified Data.Text as T@@ -43,13 +43,13 @@   case Exts.parseWithMode m x of     Exts.ParseOk e -> do       case _run h st e of-        Right (a,st) -> Right (a,st)+        Right (a,st') -> Right (a,st')         Left (NonFatal s t) -> Left (s,t)         Left (Fatal s t) -> Left (s,t)-    Exts.ParseFailed loc err -> Left (((a,b),(a,b)),T.pack err)+    Exts.ParseFailed loc' err -> Left (((a,b),(a,b)),T.pack err)       where-        a = Exts.srcLine loc-        b = Exts.srcColumn loc+        a = Exts.srcLine loc'+        b = Exts.srcColumn loc'   -- removing Haskell comments (while preserving document/newlines structure) before@@ -93,10 +93,10 @@ exp = Haskellish (\st e -> return (e,st))  fatal :: Text -> Haskellish st a-fatal m = Haskellish (\st e -> Left $ Fatal (expToSpan e) m)+fatal m = Haskellish (\_ e -> Left $ Fatal (expToSpan e) m)  nonFatal :: Text -> Haskellish st a-nonFatal m = Haskellish (\st e -> Left $ NonFatal (expToSpan e) m)+nonFatal m = Haskellish (\_ e -> Left $ NonFatal (expToSpan e) m)  (<?>) :: Haskellish st a -> Text -> Haskellish st a h <?> msg = h <|> nonFatal msg@@ -185,8 +185,8 @@     let x' = _run x st e     case x' of       Right (x'',st') -> Right (x'',st')-      Left (Fatal s err) -> _run (f err) st e-      Left (NonFatal s err) -> _run (f err) st e+      Left (Fatal _ err) -> _run (f err) st e+      Left (NonFatal _ err) -> _run (f err) st e     )  

@@ -1,5 +1,5 @@ name:                haskellish-version:             0.3.2.2+version:             0.3.2.3 synopsis:            For parsing Haskell-ish languages homepage:            http://github.com/dktr0/Haskellish license:             BSD3@@ -30,9 +30,9 @@       base >=4.8 && <5     , haskell-src-exts >=1.17.1 && <1.24     , mtl >= 2.2.2 && <2.4-    , template-haskell >= 2.10.0.0 && < 2.21-    , containers < 0.7-    , text < 2.1+    , template-haskell >= 2.10.0.0 && < 2.22+    , containers < 0.8+    , text < 2.2  source-repository head   type:     git