madlang 3.1.1.6 → 3.1.1.7

raw patch · 7 files changed

+26/−24 lines, 7 files

Files

cabal.project.local +1/−1
demo/example.mad +2/−1
demo/releases.mad +7/−0
madlang.cabal +1/−1
src/Text/Madlibs/Exec/Main.hs +4/−4
src/Text/Madlibs/Internal/Utils.hs +0/−6
src/Text/Madlibs/Packaging/Fetch.hs +11/−11

cabal.project.local view

@@ -1,3 +1,3 @@ with-compiler: ghc-8.2.1 optimization: 2-constraints: madlang +development +llvm-fast+constraints: madlang +development

demo/example.mad view

@@ -27,7 +27,7 @@     1.0 "wishes she could journey around the world."     1.0 "falls down on the subway escalator."     1.0 "meets a handsome dark stranger."-    1.0 "suffers because mercury is in gatorade."+    1.0 "suffers because mercury is in retrograde."     1.0 "charms a prince."  :define subject@@ -37,6 +37,7 @@ :define final     1.0 subject.to_upper predicate     6.0 subject predicate+ :return     1.0 final     0.02 final.oulipo # removes all mentions of the letter 'e' occasionally

demo/releases.mad view

@@ -19,8 +19,15 @@     | adjectives-oadjective.capitalize " " animals-oanimal.capitalize     | adjectives-padjective.capitalize " " animals-panimal.capitalize     | adjectives-qadjective.capitalize " " animals-qanimal.capitalize+    | adjectives-radjective.capitalize " " animals-ranimal.capitalize     | adjectives-sadjective.capitalize " " animals-sanimal.capitalize+    | adjectives-tadjective.capitalize " " animals-tanimal.capitalize+    | adjectives-uadjective.capitalize " " animals-uanimal.capitalize     | adjectives-vadjective.capitalize " " animals-vanimal.capitalize+    | adjectives-wadjective.capitalize " " animals-wanimal.capitalize+    | adjectives-xadjective.capitalize " " animals-xanimal.capitalize+    | adjectives-yadjective.capitalize " " animals-yanimal.capitalize+    | adjectives-zadjective.capitalize " " animals-zanimal.capitalize  :return     1.0 release

madlang.cabal view

@@ -1,5 +1,5 @@ name:                madlang-version:             3.1.1.6+version:             3.1.1.7 synopsis:            Randomized templating language DSL description:         Madlang is a text templating language written in Haskell,                      meant to explore computational creativity and generative

src/Text/Madlibs/Exec/Main.hs view

@@ -5,16 +5,16 @@ import           Control.Monad import           Data.Maybe import           Data.Monoid-import qualified Data.Text                   as T-import qualified Data.Text.IO                as TIO+import qualified Data.Text                    as T+import qualified Data.Text.IO                 as TIO import           Data.Version-import           Options.Applicative         hiding (ParseError)+import           Options.Applicative          hiding (ParseError) import           Paths_madlang import           System.Directory import           Text.Madlibs.Ana.Resolve import           Text.Madlibs.Cata.Display-import           Text.Madlibs.Packaging.Fetch import           Text.Madlibs.Internal.Utils+import           Text.Madlibs.Packaging.Fetch import           Text.Megaparsec  -- | datatype for the program

src/Text/Madlibs/Internal/Utils.hs view

@@ -25,12 +25,6 @@ (.$) :: (a -> a -> b) -> a -> b (.$) f x = f x x --- | Add a PR for this? Could be useful in Megaparsec idk--- Allows us to use monoidal addition on parsers---instance (Monoid a) => Monoid (Parser a) where---    mempty = pure mempty---    mappend x y = mappend <$> x <*> y- -- | Normalize pre-tokens/corresponding probabilities normalize :: [(Prob, [PreTok])] -> [(Prob, [PreTok])] normalize list = fmap (first (/total)) list

src/Text/Madlibs/Packaging/Fetch.hs view

@@ -6,16 +6,16 @@                                     , installVimPlugin                                     ) where -import Control.Monad (unless)-import qualified Codec.Archive.Tar      as Tar-import           Codec.Archive.Zip      (ZipOption (..),-                                         extractFilesFromArchive, toArchive)-import           Codec.Compression.GZip (decompress)-import           Network.HTTP.Client    hiding (decompress)-import           System.Directory       (removeFile, renameDirectory)-import           System.Environment     (getEnv)-import           System.Info            (os)-import Network.HTTP.Client.TLS (tlsManagerSettings)+import qualified Codec.Archive.Tar       as Tar+import           Codec.Archive.Zip       (ZipOption (..),+                                          extractFilesFromArchive, toArchive)+import           Codec.Compression.GZip  (decompress)+import           Control.Monad           (unless)+import           Network.HTTP.Client     hiding (decompress)+import           Network.HTTP.Client.TLS (tlsManagerSettings)+import           System.Directory        (removeFile, renameDirectory)+import           System.Environment      (getEnv)+import           System.Info             (os)  -- https://hub.darcs.net/vmchale/madlang-libraries/dist @@ -27,7 +27,7 @@ fetchGithub s = unless (invalid s) $ do      putStrLn $ "fetching library at " ++ s-    +     manager <- newManager tlsManagerSettings     initialRequest <- parseRequest $ "https://github.com/" ++ s ++ "/archive/master.zip"     response <- responseBody <$> httpLbs (initialRequest { method = "GET" }) manager