madlang 2.1.0.3 → 2.1.0.4

raw patch · 5 files changed

+67/−9 lines, 5 filesdep +microlensdep −lens

Dependencies added: microlens

Dependencies removed: lens

Files

• madlang.cabal +2/−2
• src/Text/Madlibs/Ana/Parse.hs +1/−2
• src/Text/Madlibs/Internal/Types.hs +1/−1
• src/Text/Madlibs/Internal/Utils.hs +1/−1
• stack.yaml +62/−3

@@ -1,5 +1,5 @@ name:                madlang-version:             2.1.0.3+version:             2.1.0.4 synopsis:            Randomized templating language DSL description:         Please see README.md homepage:            https://github.com/vmchale/madlang#readme@@ -46,11 +46,11 @@                      , composition                      , directory                      , mwc-random+                     , microlens                      , mtl                      , ansi-wl-pprint                      , containers                      , tibetan-utils-                     , lens   default-language:    Haskell2010   default-extensions:  OverloadedStrings                      , DeriveGeneric

@@ -13,7 +13,6 @@ import Data.Monoid import Control.Monad import Control.Monad.State-import Text.Megaparsec.Lexer.Tibetan import Control.Exception hiding (try) import Data.Composition @@ -35,7 +34,7 @@  -- | Parse an integer integer :: Parser Integer-integer = lexeme (L.integer <|> parseNumber) <?> "Integer"+integer = lexeme (L.integer {--<|> parseNumber--}) <?> "Integer"  -- | Make sure definition blocks start un-indented nonIndented = L.nonIndented spaceConsumer

@@ -7,7 +7,7 @@ import qualified Data.Text as T import Control.Monad.State import Data.Functor.Identity-import Control.Lens hiding (List, Context)+import Lens.Micro import Data.Function import Data.Monoid --

@@ -9,7 +9,7 @@ import Text.Megaparsec.Error import qualified Data.Text as T import System.IO.Unsafe-import Control.Lens+import Lens.Micro import Data.Tree  -- | Draw as a syntax Tree

@@ -1,7 +1,66 @@-resolver: lts-8.6+# This file was automatically generated by 'stack init'+#+# Some commonly used options have been documented as comments in this file.+# For advanced use and comprehensive documentation of the format, please see:+# http://docs.haskellstack.org/en/stable/yaml_configuration/++# Resolver to choose a 'specific' stackage snapshot or a compiler version.+# A snapshot resolver dictates the compiler version and the set of packages+# to be used for project dependencies. For example:+#+# resolver: lts-3.5+# resolver: nightly-2015-09-21+# resolver: ghc-7.10.2+# resolver: ghcjs-0.1.0_ghc-7.10.2+# resolver:+#  name: custom-snapshot+#  location: "./custom-snapshot.yaml"+resolver: nightly-2017-04-10++# User packages to be built.+# Various formats can be used as shown in the example below.+#+# packages:+# - some-directory+# - https://example.com/foo/bar/baz-0.0.2.tar.gz+# - location:+#    git: https://github.com/commercialhaskell/stack.git+#    commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a+# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a+#   extra-dep: true+#  subdirs:+#  - auto-update+#  - wai+#+# A package marked 'extra-dep: true' will only be built if demanded by a+# non-dependency (i.e. a user package), and its test suites and benchmarks+# will not be run. This is useful for tweaking upstream packages. packages: - '.'-extra-deps:-- tibetan-utils-0.1.1.2+# Dependency packages to be pulled from upstream that are not in the resolver+# (e.g., acme-missiles-0.3)+extra-deps: []++# Override default flag values for local packages and extra-deps flags: {}++# Extra package databases containing global packages extra-package-dbs: []++# Control whether we use the GHC we find on the path+# system-ghc: true+#+# Require a specific version of stack, using version ranges+# require-stack-version: -any # Default+# require-stack-version: ">=1.4"+#+# Override the architecture used by stack, especially useful on Windows+# arch: i386+# arch: x86_64+#+# Extra directories used by stack for building+# extra-include-dirs: [/path/to/dir]+# extra-lib-dirs: [/path/to/dir]+#+# Allow a newer minor version of GHC than the snapshot specifies+# compiler-check: newer-minor