antagonist 0.1.0.1 → 0.1.0.3

raw patch · 2 files changed

+6/−3 lines, 2 filesdep ~antisplicedep ~chatty

Dependency ranges changed: antisplice, chatty

Files

• antagonist.cabal +3/−3
• server/Web/Antagonist/Server.hs +3/−0

@@ -10,7 +10,7 @@ -- PVP summary:      +-+------- breaking API changes --                   | | +----- non-breaking API additions --                   | | | +--- code changes with no API change-version:             0.1.0.1+version:             0.1.0.3  -- A short (one-line) description of the package. synopsis:            A web interface to Antisplice dungeons.@@ -48,7 +48,7 @@  library   exposed-modules: Web.Antagonist.Server, Web.Antagonist.Server.Data-  build-depends:       base >=4.6 && <4.7, yesod >=1.2 && <1.3, antisplice >=0.11 && <0.12, text >=0.11 && <0.12, chatty >=0.3 && <0.4, shakespeare-text >=1.0 && <1.1, hamlet >=1.1 && <1.2, mtl >=2.1 && <2.2, shakespeare-css >=1.0 && <1.1, shakespeare-js >=1.2 && <1.3, time >=1.4 && <1.5, old-locale >=1.0 && <1.1+  build-depends:       base >=4.6 && <4.7, yesod >=1.2 && <1.3, antisplice >=0.12.1 && <0.13, text >=0.11 && <0.12, chatty >=0.5 && <0.6, shakespeare-text >=1.0 && <1.1, hamlet >=1.1 && <1.2, mtl >=2.1 && <2.2, shakespeare-css >=1.0 && <1.1, shakespeare-js >=1.2 && <1.3, time >=1.4 && <1.5, old-locale >=1.0 && <1.1   default-language: Haskell2010   hs-source-dirs:   shared, server, . @@ -63,7 +63,7 @@   -- other-extensions:          -- Other library packages from which modules are imported.-  build-depends:       base >=4.6 && <4.7, yesod >=1.2 && <1.3, antisplice >=0.11 && <0.12, text >=0.11 && <0.12, chatty >=0.3 && <0.4, shakespeare-text >=1.0 && <1.1, hamlet >=1.1 && <1.2, mtl >=2.1 && <2.2, shakespeare-css >=1.0 && <1.1, shakespeare-js >=1.2 && <1.3, ironforge >=0.1 && <0.2, time >=1.4 && <1.5, old-locale >=1.0 && <1.1+  build-depends:       base >=4.6 && <4.7, yesod >=1.2 && <1.3, antisplice >=0.12.1 && <0.13, text >=0.11 && <0.12, chatty >=0.5 && <0.6, shakespeare-text >=1.0 && <1.1, hamlet >=1.1 && <1.2, mtl >=2.1 && <2.2, shakespeare-css >=1.0 && <1.1, shakespeare-js >=1.2 && <1.3, ironforge >=0.1 && <0.2, time >=1.4 && <1.5, old-locale >=1.0 && <1.1      -- Directories containing source files.   hs-source-dirs:      shared, server, .

@@ -15,6 +15,7 @@ import Text.Chatty.Expansion.Vars import Text.Chatty.Interactor import Text.Chatty.Scanner+import Text.Chatty.Channel.Printer import System.Chatty.Misc import Control.Applicative import Control.Arrow@@ -136,6 +137,7 @@        withSession :: (MonadIO m,MonadClock m,MonadRandom m,MonadPrinter m) => SessionState -> ChattyDungeonM a -> m (Either SplErr (a,SessionState)) withSession ((((s,ts),as),c),es) m =+  runJoinerT $   runNullExpanderT $   liftM rot $ flip runExpanderT es $   runHtmlPrinterT $@@ -144,6 +146,7 @@   liftM rot $ flip runVocabT ts $   runFailT $   flip runDungeonT s m+  where unjust (Just j) = j  startSession :: (MonadIO m,MonadClock m,MonadRandom m,MonadPrinter m) => Constructor -> m SessionState startSession init = do