Merge pull request #15 from purescript-contrib/compiler/0.12

Compiler/0.12

Author: kritzcreek

bower.json

@@ -12,16 +12,18 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git://github.com/paf31/purescript-freet.git"
+    "url": "git://github.com/purescript-contrib/purescript-freet.git"
   },
   "dependencies": {
-    "purescript-control": "^3.0.0",
-    "purescript-tailrec": "^3.0.0",
-    "purescript-transformers": "^3.0.0",
-    "purescript-exists": "^3.0.0",
-    "purescript-eff": "^3.0.0"
+    "purescript-bifunctors": "^4.0.0",
+    "purescript-effect": "^2.0.0",
+    "purescript-either": "^4.0.0",
+    "purescript-exists": "^4.0.0",
+    "purescript-prelude": "^4.0.0",
+    "purescript-tailrec": "^4.0.0",
+    "purescript-transformers": "^4.0.0"
   },
   "devDependencies": {
-    "purescript-console": "^3.0.0"
+    "purescript-console": "^4.0.0"
   }
 }

src/Control/Monad/Free/Trans.purs

@@ -14,7 +14,6 @@ module Control.Monad.Free.Trans
 import Prelude
 
 import Control.Apply (lift2)
-import Control.Monad.Eff.Class (class MonadEff, liftEff)
 import Control.Monad.Error.Class (class MonadThrow, throwError)
 import Control.Monad.Reader.Class (class MonadAsk, ask)
 import Control.Monad.Rec.Class (class MonadRec, Step(..), tailRecM)
@@ -24,7 +23,7 @@ import Control.Monad.Writer.Class (class MonadTell, tell)
 import Data.Bifunctor (bimap)
 import Data.Either (Either(..))
 import Data.Exists (Exists, mkExists, runExists)
-import Data.Monoid (class Monoid, mempty)
+import Effect.Class (class MonadEffect, liftEffect)
 
 -- | Instead of implementing `bind` directly, we capture the bind using this data structure, to
 -- | evaluate later.
@@ -88,8 +87,8 @@ instance semigroupFreeT :: (Functor f, Monad m, Semigroup w) => Semigroup (FreeT
 instance monoidFreeT :: (Functor f, Monad m, Monoid w) => Monoid (FreeT f m w) where
   mempty = pure mempty
 
-instance monadEffFreeT :: (Functor f, MonadEff eff m) => MonadEff eff (FreeT f m) where
-  liftEff = lift <<< liftEff
+instance monadEffectFreeT :: (Functor f, MonadEffect m) => MonadEffect (FreeT f m) where
+  liftEffect = lift <<< liftEffect
 
 instance monadAskFreeT :: (Functor f, MonadAsk r m) => MonadAsk r (FreeT f m) where
   ask = lift ask
@@ -109,11 +108,11 @@ liftFreeT fa = FreeT \_ -> pure (Right (map pure fa))
 
 -- | Change the underlying `Monad` for a `FreeT` action.
 hoistFreeT :: forall f m n a. Functor f => Functor n => (m ~> n) -> FreeT f m a -> FreeT f n a
-hoistFreeT = bimapFreeT id
+hoistFreeT = bimapFreeT identity
 
 -- | Change the base functor `f` for a `FreeT` action.
 interpret :: forall f g m a. Functor f => Functor m => (f ~> g) -> FreeT f m a -> FreeT g m a
-interpret nf = bimapFreeT nf id
+interpret nf = bimapFreeT nf identity
 
 -- | Change the base functor `f` and the underlying `Monad` for a `FreeT` action.
 bimapFreeT :: forall f g m n a. Functor f => Functor n => (f ~> g) -> (m ~> n) -> FreeT f m a -> FreeT g n a

test/Main.purs

@@ -2,9 +2,9 @@ module Test.Main where
 
 import Prelude
 
-import Control.Monad.Eff (Eff)
-import Control.Monad.Eff.Class (liftEff)
-import Control.Monad.Eff.Console (CONSOLE, log)
+import Effect (Effect)
+import Effect.Class (liftEffect)
+import Effect.Console (log)
 import Control.Monad.Free.Trans (FreeT, runFreeT, liftFreeT)
 import Control.Monad.Rec.Class (forever)
 import Control.Monad.Trans.Class (lift)
@@ -23,18 +23,18 @@ writeLine :: forall m. Monad m => String -> FreeT TeletypeF m Unit
 writeLine s = liftFreeT (WriteLine s unit)
 
 readLine :: forall m. Monad m => FreeT TeletypeF m String
-readLine = liftFreeT (ReadLine id)
+readLine = liftFreeT (ReadLine identity)
 
-mockTeletype :: forall a eff. Teletype (Eff (console :: CONSOLE | eff)) a -> Eff (console :: CONSOLE | eff) a
+mockTeletype :: forall a. Teletype Effect a -> Effect a
 mockTeletype = runFreeT interp
   where
     interp (WriteLine s next) = do
-      liftEff (log s)
+      liftEffect (log s)
       pure next
     interp (ReadLine k) = do
       pure (k "Fake input")
 
-main :: forall eff. Eff (console :: CONSOLE | eff) Unit
+main :: Effect Unit
 main = mockTeletype $ forever do
   lift $ log "Enter some input:"
   s <- readLine