Commit 08d2246f authored by Mart Lubbers's avatar Mart Lubbers

Merge branch 'adaption-to-macro-operators-in-platform' into 'master'

adapted to <$> and  being defined as macros

See merge request !99
parents b32de30b 643e5fe5
...@@ -15,7 +15,7 @@ import iTasks.Extensions.DateTime ...@@ -15,7 +15,7 @@ import iTasks.Extensions.DateTime
from StdFunc import seq from StdFunc import seq
import qualified Data.Map as DM import qualified Data.Map as DM
from Data.Map import instance Functor (Map a) from Data.Map import instance Functor (Map a)
from Control.Monad import `b`, class Monad, instance Monad Maybe from Control.Monad import `b`, class Monad(bind), instance Monad Maybe
import qualified iTasks.Internal.SDS as DSDS import qualified iTasks.Internal.SDS as DSDS
import Data.List import Data.List
import iTasks.Extensions.SVG.SVGEditor import iTasks.Extensions.SVG.SVGEditor
......
...@@ -38,7 +38,7 @@ from Data.IntMap.Strict import :: IntMap ...@@ -38,7 +38,7 @@ from Data.IntMap.Strict import :: IntMap
import qualified Data.IntMap.Strict as DIS import qualified Data.IntMap.Strict as DIS
import Text import Text
import GenLexOrd import GenLexOrd
from Control.Monad import `b`, class Monad, instance Monad Maybe from Control.Monad import `b`, class Monad(bind), instance Monad Maybe
import qualified Control.Applicative as CA import qualified Control.Applicative as CA
from Control.Applicative import class Applicative, instance Applicative Maybe from Control.Applicative import class Applicative, instance Applicative Maybe
import Data.CircularStack import Data.CircularStack
......
...@@ -25,7 +25,7 @@ import qualified Data.Queue as DQ ...@@ -25,7 +25,7 @@ import qualified Data.Queue as DQ
import Data.Maybe, Data.Either, Data.Error import Data.Maybe, Data.Either, Data.Error
import Text.JSON import Text.JSON
from Data.Functor import <$> from Data.Functor import <$>, class Functor(fmap)
derive gEq ParallelTaskChange derive gEq ParallelTaskChange
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment