madlang 4.0.2.14 → 4.0.2.15

raw patch · 12 files changed

+17/−19 lines, 12 filesdep ~base

Dependency ranges changed: base

Files

• CHANGELOG.md +4/−0
• app/Main.hs +0/−1
• app/Text/Madlibs/Packaging/Fetch.hs +3/−2
• cabal.project +4/−0
• cabal.project.local +0/−2
• madlang.cabal +4/−4
• src/Text/Madlibs/Ana/Parse.hs +0/−1
• src/Text/Madlibs/Ana/ParseUtils.hs +0/−1
• src/Text/Madlibs/Ana/Resolve.hs +0/−1
• src/Text/Madlibs/Generate/TH.hs +2/−4
• src/Text/Madlibs/Internal/Types.hs +0/−2
• src/Text/Madlibs/Internal/Utils.hs +0/−1

@@ -1,5 +1,9 @@ # madlang +## 4.0.2.15++  * Fix bug related to unpacking zip archives+ ## 4.0.2.14    * Fix minor Windows bugs related to paths

@@ -2,7 +2,6 @@ module Main ( main ) where  import           Data.Maybe-import           Data.Semigroup import qualified Data.Text                    as T import qualified Data.Text.Lazy               as TL import qualified Data.Text.Lazy.IO            as TLIO

@@ -13,7 +13,7 @@ import           Data.Foldable           (traverse_) import           Network.HTTP.Client     hiding (decompress) import           Network.HTTP.Client.TLS (tlsManagerSettings)-import           System.Directory        (getAppUserDataDirectory, removeFile, renameDirectory)+import           System.Directory        (getAppUserDataDirectory, removeFile, renameDirectory, withCurrentDirectory) import           System.Environment      (getEnv) import           System.FilePath         (pathSeparator, (</>)) import           System.Info             (os)@@ -51,7 +51,8 @@     home <- getEnv "HOME"     let packageDir = if os /= "mingw32" then home ++ "/.vim" else home ++ "\\vimfiles"     let options = OptDestination packageDir-    extractFilesFromArchive [options] (toArchive response)+    withCurrentDirectory packageDir $+        extractFilesFromArchive [options] (toArchive response)      putStrLn "cleaning junk..." 

@@ -0,0 +1,4 @@+packages: ./++constraints: madlang +development+max-backjumps: 120000

@@ -1,2 +0,0 @@-constraints: madlang +development-max-backjumps: 120000

@@ -1,6 +1,6 @@ cabal-version: 1.18 name: madlang-version: 4.0.2.14+version: 4.0.2.15 license: BSD3 license-file: LICENSE copyright: Copyright: (c) 2016-2018 Vanessa McHale@@ -19,7 +19,7 @@     test/templates/*.mad     test/templates/err/*.mad     demo/*.mad-    cabal.project.local+    cabal.project     man/madlang.1 extra-doc-files: README.md                  CHANGELOG.md@@ -65,7 +65,7 @@                       TemplateHaskell     ghc-options: -Wall     build-depends:-        base >=4.9 && <5,+        base >=4.11 && <5,         megaparsec >=7.0,         text -any,         template-haskell -any,@@ -99,7 +99,7 @@     default-language: Haskell2010     ghc-options: -Wall     build-depends:-        base >=4.9,+        base >=4.11,         madlang -any,         optparse-applicative -any,         text -any,

@@ -17,7 +17,6 @@ import           Control.Monad.State import qualified Data.Map                    as M import           Data.Maybe-import           Data.Semigroup import qualified Data.Text                   as T import           Data.Void import           Text.Madlibs.Ana.ParseUtils

@@ -19,7 +19,6 @@ import           Data.List import qualified Data.Map                    as M import           Data.Maybe                  (mapMaybe)-import           Data.Semigroup import qualified Data.Set                    as S import qualified Data.Text                   as T import           Data.Text.Titlecase

@@ -17,7 +17,6 @@ import           Control.Monad.IO.Class      (MonadIO, liftIO) import           Control.Monad.Random.Class import           Data.Foldable               (fold)-import           Data.Semigroup import qualified Data.Text                   as T import           Data.Void import           System.Directory

@@ -8,16 +8,14 @@  import           Control.Arrow               (first) import           Data.FileEmbed              (embedStringFile)-import           Data.Semigroup import qualified Data.Text                   as T import qualified Data.Text.IO                as TIO import           Data.Void import           Language.Haskell.TH         hiding (Dec) import           Language.Haskell.TH.Quote import           Language.Haskell.TH.Syntax  (lift)-import           System.Directory            (doesFileExist,-                                              getAppUserDataDirectory)-import System.FilePath (pathSeparator, dropExtension)+import           System.Directory            (doesFileExist, getAppUserDataDirectory)+import           System.FilePath             (dropExtension, pathSeparator) import           Text.Madlibs.Ana.Parse import           Text.Madlibs.Internal.Types (Key, RandTok) import           Text.Madlibs.Internal.Utils

@@ -14,7 +14,6 @@ import           Control.Recursion import           Data.Binary                (Binary) import           Data.Function-import           Data.Semigroup import qualified Data.Text                  as T import           GHC.Generics               (Generic) import           Instances.TH.Lift          ()@@ -59,7 +58,6 @@ -- > (List [(0.5,"Hello you"), (0.5, "Hello me")]) instance Monoid RandTok where     mempty = Value ""-    mappend = (<>)  -- TODO make this a map instead of keys for faster parse. -- | State monad providing context, i.e. function we've already called before

@@ -6,7 +6,6 @@  import           Control.Arrow               (first) import           Control.Exception           (IOException, catch, throw)-import           Control.Monad import qualified Data.Text                   as T import           Data.Void import           System.FilePath             (pathSeparator)