update to 0.12 and psc-package

Author: justinwoo

exercises/chapter10/src/Control/Monad/Eff/Alert.purs

@@ -1,8 +1,8 @@
-module Control.Monad.Eff.Alert where
+module Effect.Alert where
 
 import Prelude
 
-import Control.Monad.Eff (kind Effect, Eff)
+import Effect (kind Effect, Effect)
 
 foreign import data ALERT :: Effect
 

exercises/chapter10/src/Control/Monad/Eff/Storage.purs

@@ -1,8 +1,8 @@
-module Control.Monad.Eff.Storage where
+module Effect.Storage where
 
 import Prelude
 
-import Control.Monad.Eff (kind Effect, Eff)
+import Effect (kind Effect, Effect)
 import Data.Foreign (Foreign)
 
 foreign import data STORAGE :: Effect

exercises/chapter10/src/Main.purs

@@ -2,10 +2,10 @@ module Main where
 
 import Prelude
 
-import Control.Monad.Eff (Eff)
-import Control.Monad.Eff.Alert (ALERT, alert)
-import Control.Monad.Eff.Console (CONSOLE, log)
-import Control.Monad.Eff.Storage (STORAGE, setItem, getItem)
+import Effect (Effect)
+import Effect.Alert (ALERT, alert)
+import Effect.Console (log)
+import Effect.Storage (STORAGE, setItem, getItem)
 import Control.Monad.Except (runExcept)
 import DOM (DOM)
 import DOM.HTML (window)

exercises/chapter11/.gitignore

@@ -5,3 +5,5 @@
 /output/
 /node_modules/
 /bower_components/
+.psc-package
+.psc-package

exercises/chapter11/bower.json

@@ -0,0 +1,12 @@
+{
+  "name": "chapter2",
+  "set": "psc-0.12.0-20180625-2",
+  "source": "https://github.com/purescript/package-sets.git",
+  "depends": [
+    "node-readline",
+    "ordered-collections",
+    "strings",
+    "transformers",
+    "yargs"
+  ]
+}

exercises/chapter11/psc-package.json

@@ -6,7 +6,7 @@ import Data.Map as M
 import Data.Set as S
 import Control.Monad.RWS (RWS)
 import Control.Monad.Reader.Class (ask)
-import Control.Monad.State.Class (get, modify, put)
+import Control.Monad.State.Class (get, modify_, put)
 import Control.Monad.Writer.Class (tell)
 import Data.Coords (Coords(..), prettyPrintCoords, coords)
 import Data.Foldable (for_)
@@ -42,7 +42,7 @@ pickUp item = do
     _ -> tell (L.singleton "I don't see that item here.")
 
 move :: Int -> Int -> Game Unit
-move dx dy = modify (\(GameState state) -> GameState (state { player = updateCoords state.player }))
+move dx dy = modify_ (\(GameState state) -> GameState (state { player = updateCoords state.player }))
   where
   updateCoords :: Coords -> Coords
   updateCoords (Coords p) = coords (p.x + dx) (p.y + dy)

exercises/chapter11/src/Game.purs

@@ -2,9 +2,8 @@ module Main where
 
 import Prelude
 import Node.ReadLine as RL
-import Control.Monad.Eff (Eff)
-import Control.Monad.Eff.Console (CONSOLE, log)
-import Control.Monad.Eff.Exception (EXCEPTION)
+import Effect (Effect)
+import Effect.Console (log)
 import Control.Monad.RWS (RWSResult(..), runRWS)
 import Data.Either (Either(..))
 import Data.Foldable (for_)
@@ -18,13 +17,8 @@ import Node.Yargs.Applicative (Y, runY, flag, yarg)
 import Node.Yargs.Setup (usage)
 
 runGame
-  :: forall eff
-   . GameEnvironment
-  -> Eff ( exception :: EXCEPTION
-         , readline :: RL.READLINE
-         , console :: CONSOLE
-         | eff
-         ) Unit
+  :: GameEnvironment
+  -> Effect Unit
 runGame env = do
   interface <- RL.createConsoleInterface RL.noCompletion
   RL.setPrompt "> " 2 interface
@@ -33,11 +27,7 @@ runGame env = do
     lineHandler
       :: GameState
       -> String
-      -> Eff ( exception :: EXCEPTION
-             , console :: CONSOLE
-             , readline :: RL.READLINE
-             | eff
-             ) Unit
+      -> Effect Unit
     lineHandler currentState input = do
       case runRWS (game (split (wrap " ") input)) env currentState of
         RWSResult state _ written -> do
@@ -51,10 +41,7 @@ runGame env = do
 
   pure unit
 
-main :: Eff ( exception :: EXCEPTION
-            , console :: CONSOLE
-            , readline :: RL.READLINE
-            ) Unit
+main :: Effect Unit
 main = runY (usage "$0 -p <player name>") $ map runGame env
   where
   env :: Y GameEnvironment

exercises/chapter11/src/Main.purs

@@ -5,3 +5,4 @@
 /output/
 /node_modules/
 /bower_components/
+.psc-package