Commit d16d056f authored by Bas Lijnse's avatar Bas Lijnse

Merge branch 'mapJson' into 'master'

adapt to move of JSON instances to Data.Map.GenJSON

See merge request !228
parents 02915797 01dbcef8
Pipeline #19481 failed with stage
in 1 minute and 21 seconds
......@@ -14,6 +14,7 @@ import iTasks.UI.Definition
import iTasks.Extensions.DateTime
from StdFunc import seq
import qualified Data.Map as DM
import Data.Map.GenJSON
from Data.Map import instance Functor (Map a)
from Control.Monad import `b`, class Monad(bind)
import qualified iTasks.Internal.SDS as DSDS
......
......@@ -7,6 +7,7 @@ import iTasks.Internal.Serialization
import iTasks.Internal.Store
from StdFunc import seq
import qualified Data.Map as DM
import Data.Map.GenJSON
import Data.List, Data.Tuple
import iTasks.UI.Definition, iTasks.UI.Editor, iTasks.UI.Editor.Controls, iTasks.UI.Editor.Common, iTasks.UI.Layout.Default, iTasks.UI.Layout.Common
import iTasks.Extensions.DateTime
......
......@@ -3,6 +3,7 @@ import iTasks
import Text
import Data.Functor, Data.Either, Data.Maybe
import qualified Data.Map as DM
import Data.Map.GenJSON
import iTasks.UI.Definition, iTasks.UI.Editor, iTasks.UI.Editor.Controls, iTasks.UI.Editor.Modifiers
import iTasks.UI.Layout.Default
......
......@@ -21,6 +21,7 @@ import iTasks.Internal.TaskEval
import iTasks.Internal.IWorld
import qualified Data.Set as Set
import qualified Data.Map as Map
import Data.Map.GenJSON
import Text
/** hostname, connection on which to send the reply, accumulated data received **/
......
implementation module iTasks.Internal.TaskState
import Text.GenJSON, StdString, Data.Func, Data.GenEq, Data.Maybe, Data.Functor
import Text.GenJSON, StdString, Data.Func, Data.GenEq, Data.Maybe, Data.Functor, Data.Map.GenJSON
import iTasks.UI.Definition, iTasks.UI.Layout
import iTasks.WF.Definition
from iTasks.WF.Combinators.Core import :: AttachmentStatus
......
......@@ -23,6 +23,7 @@ import iTasks.WF.Combinators.Tune
import iTasks.Extensions.Document
import qualified Data.Map as DM
import Data.Map.GenJSON
import qualified Data.Set as DS
import qualified Data.Queue as DQ
from Data.Queue import :: Queue(..)
......
......@@ -30,6 +30,7 @@ import StdArray
import System.Directory, System.FilePath, Data.Func, Data.Functor, Data.List
import qualified Data.Map as DM
from Data.Map import instance Functor (Map a)
import Data.Map.GenJSON
from Data.Set import :: Set
import qualified Data.Set as DS
import qualified Data.Foldable as DF
......
......@@ -3,6 +3,7 @@ implementation module iTasks.Internal.Tonic.AbsSyn
import Text.GenJSON, Data.Maybe
from Data.GenEq import generic gEq
from Data.Map import :: Map
import Data.Map.GenJSON
import qualified Data.Map as DM
import StdBool, StdList, StdTuple
from StdOverloaded import class == (..)
......
......@@ -20,6 +20,7 @@ import iTasks.Internal.TaskEval
import iTasks.Internal.Task
from StdFunc import seq
import qualified Data.Map as DM
import Data.Map.GenJSON
import System.File, StdFile
import StdArray
import System.Directory, System.FilePath
......
......@@ -4,6 +4,7 @@ import iTasks
from Text import class Text, instance Text String
import qualified Text as T
import qualified Data.Map as DM
import Data.Map.GenJSON
from Data.Map import :: Map
import qualified Data.IntMap.Strict as DIS
import qualified Data.List as DL
......
implementation module iTasks.Internal.Tonic.Shares
import qualified Data.Map as DM
import Data.Map.GenJSON
import qualified iTasks.Internal.SDS as DSDS
import Data.Error
import iTasks.Internal.Tonic.AbsSyn
......
......@@ -5,6 +5,7 @@ import StdOverloaded
import iTasks.Internal.Tonic.AbsSyn
import qualified Data.Map as DM
from Data.Map import instance Functor (Map k)
import Data.Map.GenJSON
import qualified Data.IntMap.Strict as DIS
from Data.IntMap.Strict import :: IntMap
import Data.Functor
......
......@@ -3,6 +3,7 @@ implementation module iTasks.UI.Definition
import StdEnv
import Text.GenJSON, Data.GenEq, Text.HTML, Text, Data.Maybe
from Data.Map import :: Map (..)
import Data.Map.GenJSON
from Data.Functor import class Functor(..)
import qualified Data.Map as DM
import qualified Data.List as DL
......
......@@ -8,6 +8,7 @@ import iTasks.Internal.Generic.Defaults
import StdEnum
from Data.Map as DM import qualified newMap, put, get, del, toList, fromList, delList, alter, union, keys, unions, singleton, member, null
import Data.Map.GenJSON
from Data.Set as DS import qualified newSet, insert, delete, toList, fromList, null
from Data.Set import instance Foldable Set
from Data.Tuple import appSnd
......
implementation module iTasks.UI.Layout.Common
import StdEnv
import iTasks.UI.Layout, iTasks.UI.Layout.Default
......@@ -10,6 +9,7 @@ import iTasks.WF.Combinators.Overloaded
import Data.List, Text.GenJSON, Data.Maybe, StdString, Data.GenEq
import Data.Monoid
import qualified Data.Map as DM
import Data.Map.GenJSON
from Data.Func import $
from StdListExtensions import foldlSt
from iTasks.Internal.TaskEval import :: TaskEvalOpts(..), :: TonicOpts
......
......@@ -8,6 +8,7 @@ import iTasks.Internal.IWorld
import Data.Either
import Data.Error
import Data.Map.GenJSON
import System.Time
import Text.HTML
import Text.GenJSON
......
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