madlang 4.0.2.11 → 4.0.2.12

raw patch · 4 files changed

+7/−3 lines, 4 filesdep ~composition-preludePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: composition-prelude

API changes (from Hackage documentation)

Files

• CHANGELOG.md +4/−0
• madlang.cabal +1/−1
• src/Text/Madlibs/Ana/Parse.hs +1/−1
• src/Text/Madlibs/Ana/Resolve.hs +1/−1

@@ -1,5 +1,9 @@ # madlang +## 4.0.2.12++  * Patch for new `composition-prelude`+ ## 4.0.2.11    * Use `recursion` rather than `recursion-schemes`

@@ -1,6 +1,6 @@ cabal-version: 1.18 name: madlang-version: 4.0.2.11+version: 4.0.2.12 license: BSD3 license-file: LICENSE copyright: Copyright: (c) 2016-2018 Vanessa McHale

@@ -13,7 +13,7 @@   , parseTokFInternal   ) where -import           Control.Composition+import           Control.Composition         hiding (between) import           Control.Monad.State import qualified Data.Map                    as M import           Data.Maybe

@@ -40,7 +40,7 @@ -- | Generate text from file with inclusions getInclusionCtx :: (MonadIO m) => Bool -> [T.Text] -> FilePath -> FilePath -> m (Either (ParseError Char (ErrorFancy Void)) [(Key, RandTok)]) getInclusionCtx isTree ins folder filepath = liftIO $ do-    libDir <- do { pathDir <- getAppUserDataDirectory "madlang" ; pure ((pathDir <> pure pathSep)) }+    libDir <- do { pathDir <- getAppUserDataDirectory "madlang" ; pure (pathDir <> pure pathSep) }     file <- catch (readFile' (folder ++ filepath)) (pure (readLibFile (libDir <> folder <> filepath)) :: IOException -> IO T.Text)     let filenames = map T.unpack $ either (error . show) id $ parseInclusions filepath file -- TODO pass up errors correctly     let resolveKeys file' = fmap (first (((T.pack . (<> "-")) . dropExtension) file' <>))