Commit 2657a422 authored by Camil Staps's avatar Camil Staps 🍃

Update for clean-platform!135 (generics namespace)

parent acb7d8d0
definition module C2.Apps.ShipAdventure.Types
import C2.Framework.MapEnvironment
import Data.Generics.GenLexOrd
import Data.GenLexOrd
from C2.Apps.ShipAdventure.Images import :: RenderMode
:: MyActor :== Actor ObjectType ActorStatus
......
......@@ -7,7 +7,7 @@ import iTasks.Extensions.Admin.TonicAdmin
from Data.IntMap.Strict import :: IntMap
import qualified Data.Map as DM
from Data.Map import :: Map
import Data.Generics.GenLexOrd
import Data.GenLexOrd
:: Maps2D :== [Map2D] // enumerate sub-maps, order is assumed `lowest' to `highest', mapID identifies map
......
......@@ -13,7 +13,7 @@ import qualified Data.IntMap.Strict as DIS
from Data.IntMap.Strict import :: IntMap
import qualified Data.Heap as DH
from Data.Heap import :: Heap
import Data.Generics.GenLexOrd
import Data.GenLexOrd
from C2.Framework.Logging import addLog
import Data.List
import Data.Eq
......
......@@ -2,7 +2,7 @@ implementation module Ligretto.UI
import StdBool, StdEnum, StdList
from StdFunc import id, const
import Data.Generics.GenEq
import Data.GenEq
import iTasks.UI.JS.Encoding
import iTasks.WF.Tasks.Interaction
import ScalableExts.Scalable
......
......@@ -5,7 +5,7 @@ import Data.Maybe // for the Maybe type
import Math.Random // for generating random numbers
import iTasks.WF.Definition // for the iTask infrastructure
import iTasks.Extensions.User // for the User data type
import Data.Generics.GenEq
import Data.GenEq
from iTasks.Internal.Generic.Visualization import <+++ // <+++ shouldn't be imported from here
// Make iTask infrastructure available for Ligretto model data types:
......
......@@ -5,8 +5,8 @@ from iTasks.Extensions.User import :: User
import PlatformExts.Tuple
from StdClass import class zero, class ~
import Data.Maybe
import Data.Generics.GenFDomain
import Data.Generics.GenEq, Data.Generics.GenLexOrd, Data.Generics.GenMap
import Data.GenFDomain
import Data.GenEq, Data.GenLexOrd, Control.GenMap
derive class iTask TraxSt, /*Coordinate,*/ TileEdge, LineColor
......
......@@ -7,8 +7,8 @@ import StdMisc
from StdFunc import flip
from Data.List import lookup, deleteFirstsBy, hasDup, qfoldl
import Data.Maybe
import Data.Generics.GenFDomain
import Data.Generics.GenLexOrd, Data.Generics.GenMap, Data.Generics.GenPrint
import Data.GenFDomain
import Data.GenLexOrd, Control.GenMap, Text.GenPrint
import Text
lookup1 x = fromJust o (lookup x)
......
......@@ -4,7 +4,7 @@ import iTasks.Engine
import iTasks.WF.Tasks.Interaction
import iTasks.WF.Combinators.Common
import iTasks.SDS.Sources.Store
import Data.Generics.GenPrint
import Text.GenPrint
import iTasks.UI.Prompt
import Graphics.Scalable.Image
import iTasks.Extensions.SVG.SVGEditor
......
......@@ -4,7 +4,7 @@ import iTasks.Engine
import iTasks.WF.Tasks.Interaction
import iTasks.WF.Combinators.Common
import iTasks.SDS.Sources.Store
import Data.Generics.GenPrint // printing via <+++ has a known bug, so we use printToString instead
import Text.GenPrint // printing via <+++ has a known bug, so we use printToString instead
import iTasks.UI.Prompt
import Graphics.Scalable.Image
import iTasks.Extensions.SVG.SVGEditor
......
......@@ -4,7 +4,7 @@ import iTasks.Engine
import iTasks.WF.Tasks.Interaction
import iTasks.WF.Combinators.Common
import iTasks.SDS.Sources.Store
import Data.Generics.GenPrint // printing via <+++ has a known bug, so we use printToString instead
import Text.GenPrint // printing via <+++ has a known bug, so we use printToString instead
import iTasks.UI.Prompt
import Graphics.Scalable.Image
import iTasks.Extensions.SVG.SVGEditor
......
......@@ -4,7 +4,7 @@ import iTasks.Engine
import iTasks.WF.Tasks.Interaction
import iTasks.WF.Combinators.Common
import iTasks.SDS.Sources.Store
import Data.Generics.GenPrint // printing via <+++ has a known bug, so we use printToString instead
import Text.GenPrint // printing via <+++ has a known bug, so we use printToString instead
import iTasks.UI.Prompt
import Graphics.Scalable.Image
import iTasks.Extensions.SVG.SVGEditor
......
......@@ -4,7 +4,7 @@ import iTasks.Engine
import iTasks.WF.Tasks.Interaction
import iTasks.WF.Combinators.Common
import iTasks.SDS.Sources.Store
import Data.Generics.GenPrint
import Text.GenPrint
import iTasks.UI.Prompt
import Graphics.Scalable.Image
import iTasks.Extensions.SVG.SVGEditor
......
......@@ -34,7 +34,7 @@ import
, iTasks.UI.Editor.Modifiers
// Miscellaneous machinery
, Text.JSON // JSON is used for serializing/deserializing strings
, Text.GenJSON // JSON is used for serializing/deserializing strings
, iTasks.UI.Prompt // Standard for creating prompts
, iTasks.UI.Layout.Common // Standard layout patterns
......
implementation module iTasks
import Text.JSON
import Text.GenJSON
......@@ -17,7 +17,7 @@ import iTasks.UI.Editor.Modifiers
import StdBool, StdArray, StdEnum, StdList, StdString
import Text, Text.JSON, System.Time
import Text, Text.GenJSON, System.Time
import Data.Maybe, Data.Error
import qualified Data.Map as DM
......
......@@ -6,7 +6,7 @@ import iTasks.UI.Editor.Controls, iTasks.UI.Editor.Modifiers
import iTasks.Internal.Task, iTasks.Internal.IWorld, iTasks.Internal.TaskStore
import StdBool, StdString, StdFile, StdArray, StdInt
import Text.JSON, Text.Encodings.MIME, Text.HTML, System.FilePath, System.File, System.OSError, Data.Error
import Text.GenJSON, Text.Encodings.MIME, Text.HTML, System.FilePath, System.File, System.OSError, Data.Error
import qualified Data.Map as DM
from StdFunc import const
......
implementation module iTasks.Extensions.JSONFile
import StdBool, StdList, StdFile, StdArray, System.FilePath, System.File, Data.Error, Text.JSON, StdString
import StdBool, StdList, StdFile, StdArray, System.FilePath, System.File, Data.Error, Text.GenJSON, StdString
import iTasks.Internal.IWorld, iTasks.Internal.Task, iTasks.Internal.TaskState, iTasks.Internal.TaskStore
:: JSONParseException = CannotParse !String
......
......@@ -4,7 +4,7 @@ import Graphics.Scalable.Internal.Image`
import iTasks.UI.Definition, iTasks.UI.Editor, iTasks.UI.JS.Encoding
import StdArray, StdBool, StdEnum, StdInt, StdMisc, StdReal, StdTuple
from StdFunc import o
from Data.Generics.GenEq import generic gEq
from Data.GenEq import generic gEq
import Data.List
import Data.Error
import Data.MapCollection
......@@ -15,7 +15,7 @@ import qualified Data.Set as DS
import Text
import Data.Matrix
import Text.HTML
import Text.JSON
import Text.GenJSON
import Math.Geometry
CLICK_DELAY :== 225
......
......@@ -14,7 +14,7 @@ from Data.Queue as DQ import qualified newQueue, dequeue
import iTasks.Extensions.DateTime
import System.Time, Math.Random
import Text.JSON
import Text.GenJSON
:: TaskState a =
{ instanceNo :: !InstanceNo
......
definition module iTasks.Internal.DynamicUtil
import Text.JSON
import Text.GenJSON
//derive JSONEncode TypeCode
//derive JSONDecode TypeCode
......
implementation module iTasks.Internal.DynamicUtil
import _SystemDynamic
import Data.Maybe, Text.JSON
import Data.Maybe, Text.GenJSON
:: MyTypeCodeConstructor = E.a: { my_tcc_cons :: !a }
......
definition module iTasks.Internal.Generic.Defaults
import Data.Generics.GenDefault
import Data.GenDefault
derive gDefault (->), Bool, Char, Maybe, Either, MaybeError, Map, JSONNode, HtmlTag, Timestamp
from Text.JSON import :: JSONNode
from Text.GenJSON import :: JSONNode
from Text.HTML import :: HtmlTag
from Data.Maybe import :: Maybe
from Data.Either import :: Either
......
implementation module iTasks.Internal.Generic.Defaults
import StdGeneric, StdFunc
import Data.Maybe, Data.Either, Data.Error, Data.Map, Text.HTML, Text.JSON, System.Time
import Data.Generics.GenDefault
import Data.Maybe, Data.Either, Data.Error, Data.Map, Text.HTML, Text.GenJSON, System.Time
import Data.GenDefault
gDefault{|Bool|} = False
gDefault{|Char|} = '-'
......
definition module iTasks.Internal.Generic.Visualization
from StdGeneric import ::UNIT,::PAIR,::EITHER,::CONS,::OBJECT,::RECORD,::FIELD
from Text.JSON import :: JSONNode
from Text.GenJSON import :: JSONNode
from Text.HTML import :: HtmlTag
from Data.Maybe import :: Maybe
from Data.Either import :: Either
......
......@@ -5,7 +5,7 @@ import Data.Maybe, Data.Either, Data.Functor
from Data.Map import :: Map (..)
import qualified Data.Map as DM
import qualified Data.List as DL
import Text, Text.JSON, Text.HTML
import Text, Text.GenJSON, Text.HTML
import System.Time
import iTasks.Internal.Util
......
......@@ -2,7 +2,7 @@ implementation module iTasks.Internal.HtmlUtil
from Data.Map import :: Map
import qualified Data.Map as DM
import Text.HTML, Text.JSON, Text, Internet.HTTP, System.OS
import Text.HTML, Text.GenJSON, Text, Internet.HTTP, System.OS
import StdList, StdBool
embeddedStyle :: HtmlTag
......
......@@ -8,7 +8,7 @@ from Data.Set import :: Set
from Data.Queue import :: Queue
from StdFile import class FileSystem
from System.Time import :: Timestamp
from Text.JSON import :: JSONNode
from Text.GenJSON import :: JSONNode
from System.Process import :: ProcessHandle, :: ProcessIO
from iTasks.Engine import :: EngineOptions
from iTasks.UI.Definition import :: UI, :: UIType
......
......@@ -5,7 +5,7 @@ from Data.Map import :: Map
from Data.Maybe import :: Maybe
from Data.Error import :: MaybeError(..), :: MaybeErrorString(..)
from System.Time import :: Timestamp, time
from Text.JSON import :: JSONNode
from Text.GenJSON import :: JSONNode
from iTasks.WF.Definition import :: TaskId, :: InstanceNo, :: TaskNo
from iTasks.WF.Combinators.Core import :: TaskListItem, :: ParallelTaskType
from iTasks.Extensions.DateTime import :: Time, :: Date, :: DateTime, toTime, toDate
......@@ -21,7 +21,7 @@ from StdOrdList import sortBy
from TCPIP import :: TCP_Listener, :: TCP_Listener_, :: TCP_RChannel_, :: TCP_SChannel_, :: TCP_DuplexChannel, :: DuplexChannel, :: IPAddress, :: ByteSeq
import System.Time, StdList, Text.Encodings.Base64, _SystemArray, StdBool, StdTuple, Text.JSON, Data.Error, Math.Random
import System.Time, StdList, Text.Encodings.Base64, _SystemArray, StdBool, StdTuple, Text.GenJSON, Data.Error, Math.Random
import iTasks.Internal.TaskStore, iTasks.Internal.Util
import iTasks.Internal.Serialization
import iTasks.Internal.SDS
......
definition module iTasks.Internal.SDS
import Data.Generics.GenEq
import System.FilePath, Data.Maybe, Data.Either, Data.Error, System.Time, Text.JSON
import Data.GenEq
import System.FilePath, Data.Maybe, Data.Either, Data.Error, System.Time, Text.GenJSON
from Data.Set import :: Set
from iTasks.Internal.IWorld import :: IWorld
from iTasks.Internal.Generic.Visualization import :: TextFormat
......
......@@ -4,7 +4,7 @@ from StdFunc import const
import StdString, StdTuple, StdMisc, StdList, StdBool
from Data.Map import :: Map
import qualified Data.Map as DM
import Data.Error, Data.Func, Data.Tuple, System.OS, System.Time, Text, Text.JSON
import Data.Error, Data.Func, Data.Tuple, System.OS, System.Time, Text, Text.GenJSON
import qualified Data.Set as Set
import iTasks.Engine
import iTasks.Internal.IWorld
......
......@@ -11,15 +11,15 @@ from Data.Queue import :: Queue
from Data.Maybe import :: Maybe
from Data.Error import :: MaybeError, :: MaybeErrorString
from Data.Map import :: Map
from Text.JSON import :: JSONNode
from Text.GenJSON import :: JSONNode
from iTasks.WF.Definition import class iTask
from iTasks.UI.Editor import :: Editor
from iTasks.UI.Editor.Generic import generic gEditor
from iTasks.Internal.Generic.Visualization import generic gText, :: TextFormat
from iTasks.Internal.Generic.Defaults import generic gDefault
from Text.JSON import generic JSONEncode, generic JSONDecode
from Data.Generics.GenEq import generic gEq
from Text.GenJSON import generic JSONEncode, generic JSONDecode
from Data.GenEq import generic gEq
from iTasks.SDS.Definition import :: SDS
......
......@@ -19,7 +19,7 @@ import StdString, StdList
from Data.Map import qualified get, fromList
from Data.Map import fromList
import Data.Maybe, Data.Error
import Text.JSON, Text.URI
import Text.GenJSON, Text.URI
import StdMisc, graph_to_sapl_string
import Data.Queue, Data.Functor
......
definition module iTasks.Internal.Serialization
from Text.JSON import generic JSONEncode, generic JSONDecode, ::JSONNode
from Text.GenJSON import generic JSONEncode, generic JSONDecode, ::JSONNode
from Data.Error import ::MaybeError, ::MaybeErrorString
from Data.Maybe import ::Maybe
......
......@@ -5,7 +5,7 @@ import dynamic_string
import Text.Encodings.Base64
import Data.Error
import Text.JSON
import Text.GenJSON
import Data.Maybe
serialize :: !a -> *String
......
......@@ -9,7 +9,7 @@ definition module iTasks.Internal.Store
* Dynamics are generally more expensive, so only when really necessary (for example to store tasks or
* functions) should they be used.
*/
from Text.JSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from Text.GenJSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from Data.Maybe import :: Maybe
from Data.Error import :: MaybeError, :: MaybeErrorString
from System.Time import :: Timestamp
......@@ -21,7 +21,7 @@ from iTasks.UI.Editor import :: Editor, :: EditMask, :: Masked, :: VSt
from iTasks.UI.Editor.Generic import generic gEditor
from iTasks.Internal.Generic.Visualization import generic gText, :: TextFormat(..), toMultiLineText
from iTasks.Internal.Generic.Defaults import generic gDefault
from Data.Generics.GenEq import generic gEq
from Data.GenEq import generic gEq
:: StoreNamespace :== String
:: StoreName :== String
......
......@@ -5,7 +5,7 @@ from Data.Map import :: Map
import qualified Data.Map as DM
import Data.Maybe, Data.Functor, Data.Error
import System.File, System.Directory, System.OSError, System.FilePath
import Text, Text.JSON, iTasks.Internal.Serialization
import Text, Text.GenJSON, iTasks.Internal.Serialization
import iTasks.Internal.Client.JSStore
import iTasks.Internal.SDS
......@@ -28,7 +28,7 @@ import iTasks.SDS.Sources.Store
import iTasks.SDS.Combinators.Core
import iTasks.SDS.Combinators.Common
from System.Time import :: Timestamp(..), instance < Timestamp, instance toInt Timestamp
from Data.Generics.GenEq import generic gEq
from Data.GenEq import generic gEq
instance toString StoreReadError
where
......
......@@ -4,7 +4,7 @@ from StdFunc import const, id
import StdClass, StdArray, StdTuple, StdInt, StdList, StdBool, StdMisc
from Data.Map import :: Map
import qualified Data.Map as DM
import Text.HTML, Internet.HTTP, Data.Error, Data.Functor, Text.JSON
import Text.HTML, Internet.HTTP, Data.Error, Data.Functor, Text.GenJSON
import iTasks.Internal.IWorld, iTasks.UI.Definition, iTasks.Internal.Util, iTasks.Internal.DynamicUtil
from System.OSError import :: MaybeOSError, :: OSError, :: OSErrorCode, :: OSErrorMessage
......
......@@ -9,7 +9,7 @@ from iTasks.Internal.IWorld import :: IWorld
from iTasks.Internal.SDS import :: SDS, :: Shared, :: ReadOnlyShared
from iTasks.Internal.Tonic import :: ExprId
from Text.JSON import :: JSONNode
from Text.GenJSON import :: JSONNode
from Data.Maybe import :: Maybe
from Data.Error import :: MaybeErrorString, :: MaybeError
from Data.CircularStack import :: CircularStack
......
implementation module iTasks.Internal.TaskEval
import StdList, StdBool, StdTuple, StdMisc, StdString
import Data.Error, Data.Func, Data.Tuple, Data.Either, Data.Functor, Data.List, Text, Text.JSON
import Data.Error, Data.Func, Data.Tuple, Data.Either, Data.Functor, Data.List, Text, Text.GenJSON
import iTasks.Internal.IWorld, iTasks.Internal.Task, iTasks.Internal.TaskState
import iTasks.Internal.Store, iTasks.Internal.TaskStore, iTasks.Internal.Util
import iTasks.UI.Layout
......
......@@ -7,7 +7,7 @@ from iTasks.WF.Definition import :: InstanceNo, :: InstanceKey, :: InstanceProgr
from iTasks.WF.Combinators.Core import :: AttachmentStatus
from iTasks.UI.Definition import :: UIChange
from iTasks.UI.Editor import :: EditMask
from Text.JSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from Text.GenJSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from Data.Map import :: Map
from Data.Maybe import :: Maybe
from Data.Queue import :: Queue
......
implementation module iTasks.Internal.TaskState
import Text.JSON, StdString
import Text.GenJSON, StdString
import iTasks.UI.Definition
import iTasks.WF.Definition
from iTasks.WF.Combinators.Core import :: AttachmentStatus
......
......@@ -9,7 +9,7 @@ definition module iTasks.Internal.TaskStore
import iTasks.Internal.Task, iTasks.Internal.TaskState, iTasks.UI.Definition, iTasks.Internal.SDS
import iTasks.WF.Combinators.Core
import iTasks.Extensions.Document
import Data.Generics.GenEq
import Data.GenEq
from Data.Maybe import :: Maybe
from Data.Error import :: MaybeError
......
......@@ -2,7 +2,7 @@ implementation module iTasks.Internal.TaskStore
import StdOverloaded, StdBool, StdArray, StdTuple, StdString
from StdFunc import const, id, o
import Data.Maybe, Data.Either, Text, System.Time, Math.Random, Text.JSON, Data.Func, Data.Tuple, Data.List, Data.Error, System.FilePath, Data.Functor
import Data.Maybe, Data.Either, Text, System.Time, Math.Random, Text.GenJSON, Data.Func, Data.Tuple, Data.List, Data.Error, System.FilePath, Data.Functor
import iTasks.Engine
import iTasks.Internal.IWorld, iTasks.Internal.TaskState, iTasks.Internal.Task, iTasks.Internal.Store
......@@ -28,7 +28,7 @@ import qualified Data.Set as DS
import qualified Data.Queue as DQ
from Data.Queue import :: Queue(..)
from Control.Applicative import class Alternative(<|>)
import Data.Generics.GenEq
import Data.GenEq
//Derives required for storage of UI definitions
derive JSONEncode TaskOutputMessage, TaskResult, TaskEvalInfo, TIValue, ParallelTaskState, ParallelTaskChange, TIUIState
......
......@@ -36,7 +36,7 @@ from Data.Foldable import class Foldable
from Data.IntMap.Strict import :: IntMap
import qualified Data.IntMap.Strict as DIS
import Text
import Data.Generics.GenLexOrd
import Data.GenLexOrd
from Control.Monad import `b`, class Monad(bind)
import qualified Control.Applicative as CA
from Control.Applicative import class Applicative
......
......@@ -2,8 +2,8 @@ definition module iTasks.Internal.Tonic.AbsSyn
from Data.Map import :: Map
from Data.Maybe import :: Maybe
from Text.JSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from Data.Generics.GenEq import generic gEq
from Text.GenJSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from Data.GenEq import generic gEq
from StdOverloaded import class ==
derive JSONEncode TonicModule, TonicFunc, TExpr, TPriority, TAssoc, TLit
......
implementation module iTasks.Internal.Tonic.AbsSyn
import Text.JSON, Data.Maybe
from Data.Generics.GenEq import generic gEq
import Text.GenJSON, Data.Maybe
from Data.GenEq import generic gEq
from Data.Map import :: Map
import qualified Data.Map as DM
import StdBool, StdList, StdTuple
......
......@@ -17,8 +17,8 @@ from iTasks.UI.Editor import :: Editor
from iTasks.UI.Editor.Generic import generic gEditor
from iTasks.Internal.Generic.Visualization import generic gText, :: TextFormat
from iTasks.Internal.Generic.Defaults import generic gDefault
from Text.JSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from Data.Generics.GenEq import generic gEq
from Text.GenJSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from Data.GenEq import generic gEq
:: ActionState a s = { state :: s, action :: Maybe a }
......
implementation module iTasks.Internal.Util
import StdBool, StdChar, StdList, StdFile, StdMisc, StdArray, StdString, StdTuple, StdFunc, StdGeneric, StdOrdList
import Data.Maybe, Data.Tuple, Data.Func, System.Time, System.OS, Text, System.FilePath, System.Directory, Text.JSON, Data.Error, Data.Generics.GenEq
import Data.Maybe, Data.Tuple, Data.Func, System.Time, System.OS, Text, System.FilePath, System.Directory, Text.GenJSON, Data.Error, Data.GenEq
import Data.Error, System.OSError, System.File
from iTasks.Internal.IWorld import :: IWorld{current}, :: TaskEvalState
from iTasks.Extensions.DateTime import :: Date{..}, :: Time{..}, :: DateTime(..)
......
......@@ -9,7 +9,7 @@ import qualified Data.Map as DM
import qualified Data.Queue as DQ
import qualified iTasks.Internal.SDS as SDS
import System.Time, Text, Text.JSON, Internet.HTTP, Data.Error
import System.Time, Text, Text.GenJSON, Internet.HTTP, Data.Error
import System.File, System.FilePath, System.Directory
import iTasks.Engine
import iTasks.Internal.Task, iTasks.Internal.TaskState, iTasks.Internal.TaskEval, iTasks.Internal.TaskStore
......
......@@ -17,7 +17,7 @@ from Data.IntMap.Strict import :: IntMap
from StdOverloaded import class <
from System.FilePath import :: FilePath
from Text.JSON import :: JSONNode, generic JSONEncode, generic JSONDecode
from Text.GenJSON import :: JSONNode, generic JSONEncode, generic JSONDecode
:: SDSReadProjection rs rt
= SDSLensRead (rs -> MaybeError TaskException rt) //Read lens-like
......
......@@ -10,7 +10,7 @@ import qualified Data.IntMap.Strict as DIS
from Data.IntMap.Strict import :: IntMap
from Data.Map import :: Map
import Data.Maybe, Data.Error, Data.Either, StdString
import Text.JSON
import Text.GenJSON
import System.FilePath
sdsFocus :: !p !(RWShared p r w) -> (RWShared p` r w) | iTask p & TC r & TC w
......
......@@ -6,7 +6,7 @@ from iTasks.SDS.Definition import :: SDS, :: SDSLensRead, :: SDSLensWrite, :: SD
from iTasks.Internal.IWorld import :: IWorld
from Data.Either import :: Either
from Data.Maybe import :: Maybe
from Text.JSON import :: JSONNode
from Text.GenJSON import :: JSONNode
from iTasks.WF.Definition import class iTask
from iTasks.WF.Definition import generic gEditor, generic gEq, generic gDefault, generic gText, generic JSONEncode, generic JSONDecode
......
......@@ -7,7 +7,7 @@ import iTasks.Internal.Generic.Visualization
import iTasks.Internal.Generic.Defaults
import iTasks.UI.Editor.Generic
import iTasks.WF.Definition
import Data.Generics.GenEq, StdString
import Data.GenEq, StdString
sdsLens :: !String (p -> ps) (SDSLensRead p r rs) (SDSLensWrite p w rs ws) (SDSLensNotify p p w rs) !(SDS ps rs ws) -> SDS p r w | iTask ps & TC rs & TC ws
sdsLens name param read write notify sds = SDSLens sds {SDSLens|name=name,param=param,read=read,write=write,notify=notify}
......
......@@ -8,7 +8,7 @@ from iTasks.Internal.IWorld import :: IWorld
import iTasks.Internal.Generic.Visualization
import iTasks.Internal.Generic.Defaults
import iTasks.UI.Editor.Generic
import Data.Generics.GenEq
import Data.GenEq
from Data.Either import :: Either
from Data.Error import :: MaybeError
......
......@@ -6,7 +6,7 @@ import iTasks.Internal.Task
import iTasks.Internal.Generic.Visualization
import iTasks.Internal.Generic.Defaults
import iTasks.UI.Editor.Generic
import Data.Generics.GenEq
import Data.GenEq
import Data.Either
import Data.Error
......
......@@ -6,7 +6,7 @@ from iTasks.SDS.Definition import :: SDS
from System.FilePath import :: FilePath
from Data.Error import :: MaybeError, :: MaybeErrorString
from Data.Maybe import :: Maybe
from Text.JSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from Text.GenJSON import generic JSONEncode, generic JSONDecode, :: JSONNode
// constant share from which you always read the same value
constShare :: !a -> SDS p a ()
......
......@@ -5,7 +5,7 @@ import iTasks.Internal.SDS
import iTasks.Internal.IWorld
import iTasks.Internal.Serialization
import System.FilePath, System.Directory, System.File
import Text, Text.JSON
import Text, Text.GenJSON
import StdFile, StdTuple, StdArray, StdBool, StdList, StdString
import qualified Data.Map as DM
......
......@@ -4,7 +4,7 @@ definition module iTasks.SDS.Sources.Store
* itasks applications store their data by default
*/
from iTasks.SDS.Definition import :: SDS
from Text.JSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from Text.GenJSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from System.FilePath import :: FilePath
from Data.Maybe import :: Maybe
......
......@@ -8,7 +8,7 @@ definition module iTasks.UI.Definition
* This representation seeks a middle ground between being fine grained enough
* to describe rich user interfaces and being abstract enough to leave rendering details to the client framework.
*/
from Text.JSON import :: JSONNode
from Text.GenJSON import :: JSONNode
from Data.Maybe import :: Maybe
from Data.Functor import class Functor
from iTasks.Internal.Task import :: TaskId
......@@ -22,8 +22,8 @@ from iTasks.Internal.Generic.Defaults import generic gDefault
from iTasks.UI.Editor import :: Editor, :: EditMask, :: Masked
from iTasks.UI.Editor.Generic import generic gEditor
from Text.JSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from Data.Generics.GenEq import generic gEq
from Text.GenJSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from Data.GenEq import generic gEq
//Provide generic instances for all UI definitions
derive class iTask UI, UIType
......
implementation module iTasks.UI.Definition
import Text.JSON, StdList, StdOrdList, StdBool, StdTuple, Data.Generics.GenEq, StdFunc, Text.HTML, Text
import Text.GenJSON, StdList, StdOrdList, StdBool, StdTuple, Data.GenEq, StdFunc, Text.HTML, Text
from Data.Map import :: Map (..)
from Data.Functor import class Functor(..)
import qualified Data.Map as DM
......@@ -11,7 +11,7 @@ from iTasks.Internal.Generic.Visualization import generic gText, :: TextFormat(.
from iTasks.Internal.Generic.Defaults import generic gDefault
from iTasks.UI.Editor import :: Editor, :: EditMask, :: Masked
from iTasks.UI.Editor.Generic import generic gEditor
from Text.JSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from Text.GenJSON import generic JSONEncode, generic JSONDecode, :: JSONNode
import Text.HTML
import StdMisc
......@@ -20,7 +20,7 @@ derive class iTask UI, UIType
derive class iTask UISize, UIBound, UISideSizes, UIDirection, UIVAlign, UIHAlign, UISide, UIWindowType
derive class iTask UITreeNode
//SHOULD BE IN Text.JSON
//SHOULD BE IN Text.GenJSON
jsonObjectPut :: String JSONNode JSONNode -> JSONNode
jsonObjectPut k v (JSONObject fields) = JSONObject (put k v fields)
where
......
......@@ -13,8 +13,8 @@ from Data.Maybe import :: Maybe
from Data.Either import :: Either
from Data.Map import :: Map
from Data.Error import :: MaybeError, :: MaybeErrorString
from Text.JSON import :: JSONNode, generic JSONEncode, generic JSONDecode
from Data.Generics.GenEq import generic gEq
from Text.GenJSON import :: JSONNode, generic JSONEncode, generic JSONDecode
from Data.GenEq import generic gEq
from StdOverloaded import class toString
/*
......
......@@ -5,8 +5,8 @@ import iTasks.Internal.Client.LinkerSupport, Data.Maybe, Data.Functor
import iTasks.Internal.IWorld
import iTasks.UI.Definition
import qualified Data.Map as DM
import Text, Text.JSON
import Data.Generics.GenEq
import Text, Text.GenJSON
import Data.GenEq
derive JSONEncode EditMask, FieldMask
derive JSONDecode EditMask, FieldMask
......
......@@ -5,9 +5,9 @@ definition module iTasks.UI.Editor.Common
from iTasks.UI.Editor import :: Editor
from iTasks.UI.Definition import :: UI, :: UIChildChange
from Data.Maybe import :: Maybe
from Text.JSON import generic JSONEncode, :: JSONNode
from Text.GenJSON import generic JSONEncode, :: JSONNode
import iTasks.Internal.Generic.Defaults
from Data.Generics.GenEq import generic gEq
from Data.GenEq import generic gEq
/**
* Editor that does nothing
......
implementation module iTasks.UI.Editor.Common
import StdBool, StdEnum, StdOrdList, StdList, Data.Maybe, StdList, StdString
import Text.JSON, Data.Generics.GenEq, Data.List
import Text.GenJSON, Data.GenEq, Data.List
import iTasks.UI.Definition, iTasks.UI.Editor, iTasks.UI.Editor.Containers, iTasks.UI.Editor.Controls, iTasks.UI.Editor.Modifiers
import Data.Tuple, Data.Error, Text, Text.JSON
import Data.Tuple, Data.Error, Text, Text.GenJSON
import qualified Data.Map as DM
emptyEditor :: Editor a
......
......@@ -8,7 +8,7 @@ definition module iTasks.UI.Editor.Containers
from iTasks.UI.Definition import :: UIAttributes
from iTasks.UI.Editor import :: Editor