Commit 6a95ef8d authored by Jurriën Stutterheim's avatar Jurriën Stutterheim

First stab at making GiN work in the latest iTasks. Still doesn't compile and

contains several TODOs and undefs


git-svn-id: https://svn.cs.ru.nl/repos/iTask-system/trunk@2402 63da3aa8-80fd-4f01-9db8-e6ea747a3da2
parent 6cdd3036
Version: 1.4
Global
ProjectRoot: .
Built: True
Target: OSXEnv
Exec: {Project}/ginexamples
CodeGen
CheckStacks: False
CheckIndexes: True
Application
HeapSize: 2097152
StackSize: 512000
ExtraMemory: 8192
IntialHeapSize: 204800
HeapSizeMultiplier: 4096
ShowExecutionTime: False
ShowGC: False
ShowStackSize: False
MarkingCollector: False
StandardRuntimeEnv: True
Profile
Memory: False
MemoryMinimumHeapSize: 0
Time: False
Stack: False
Output
Output: ShowConstructors
Font: Monaco
FontSize: 9
WriteStdErr: False
Link
LinkMethod: Static
GenerateRelocations: False
GenerateLinkMap: False
LinkResources: False
ResourceSource:
GenerateDLL: False
ExportedNames:
Paths
Path: {Project}
Path: {Project}/Workflows
Path: {Application}/iTasks-SDK/Patches/Platform/OS-Independent/Data
Path: {Application}/iTasks-SDK/Patches/Platform/OS-Independent/Text
Path: {Application}/iTasks-SDK/Server
Path: {Application}/iTasks-SDK/Server/lib/Http
Path: {Application}/iTasks-SDK/Server/lib/Platform/OS-Independent/Internet
Path: {Application}/iTasks-SDK/Server/lib/Platform/OS-Independent/Math
Path: {Application}/iTasks-SDK/Server/lib/Platform/OS-Independent/System
Path: {Application}/iTasks-SDK/Server/lib/Platform/OS-Independent/Text/Encodings
Path: {Application}/iTasks-SDK/Server/lib/Platform/OS-Mac/System
Path: {Application}/iTasks-SDK/Server/lib/Platform/OS-Posix/System
Path: {Application}/iTasks-SDK/Server/Gin
Path: {Application}/iTasks-SDK/Server/Framework
Path: {Application}/iTasks-SDK/Server/API
Path: {Application}/iTasks-SDK/Server/API/Common
Path: {Application}/iTasks-SDK/Server/API/Core
Path: {Application}/iTasks-SDK/Server/API/Domains
Path: {Application}/iTasks-SDK/Server/API/Extensions
Path: {Application}/iTasks-SDK/Server/API/Extensions/Admin
Path: {Application}/clean-platform-flat/OS-Independent
Path: {Application}/clean-platform-flat/OS-Independent/Data
Path: {Application}/clean-platform-flat/OS-Independent/Text
Path: {Application}/clean-platform-flat/OS-Independent/Deprecated/StdLib
Path: {Application}/clean-platform-flat/OS-Posix
Path: {Application}/clean-platform-flat/OS-Mac
Path: {Application}/lib/Generics
Path: {Application}/lib/TCPIP
Path: {Application}/lib/Dynamics
Precompile:
Postlink:
MainModule
Name: GinExamples
Dir: {Project}
Compiler
NeverMemoryProfile: False
NeverTimeProfile: False
StrictnessAnalysis: True
ListTypes: StrictExportTypes
ListAttributes: True
Warnings: True
Verbose: True
ReadableABC: False
ReuseUniqueNodes: True
Fusion: False
......@@ -5,10 +5,10 @@ import GinORYX
derive gEq ORYXEditor
derive gVisualizeText ORYXEditor
derive gVisualizeHtml ORYXEditor
//derive gVisualizeHtml ORYXEditor TODO
derive gVisualizeEditor ORYXEditor
derive gUpdate ORYXEditor
derive gDefaultMask ORYXEditor
//derive gDefaultMask ORYXEditor
derive gVerify ORYXEditor
derive JSONEncode ORYXEditor
derive JSONDecode ORYXEditor
implementation module GinDomain
from StdEnv import id
from StdEnv import id, undef
import iTasks, Text, HtmlUtil
import GinSyntax, GinFlowLibrary
......@@ -9,8 +9,8 @@ import GinCompiler, GinParser
import GinORYX
gVisualizeText{|ORYXEditor|} _ _ = ["(ORYX editor: No textual representation available)"]
gVisualizeHtml{|ORYXEditor|} _ _ = [Text "(ORYX editor: No html representation available)"]
gVisualizeEditor{|ORYXEditor|} val vst = visualizeControlSimple (TUIORYXControl oryx.ORYXEditor.stencilset.ORYXStencilSetReference.url) val vst
//gVisualizeHtml{|ORYXEditor|} _ _ = [Text "(ORYX editor: No html representation available)"] TODO
gVisualizeEditor{|ORYXEditor|} val vst = undef // visualizeControlSimple (UIORYXControl oryx.ORYXEditor.stencilset.ORYXStencilSetReference.url) val vst TODO
where
oryx = fromMaybe emptyORYXEditor val
......@@ -18,12 +18,12 @@ instance toString ORYXEditor
where
toString {diagram} = toString (toJSON diagram)
gUpdate{|ORYXEditor|} mode ust = basicUpdate mode parseUpdate emptyORYXEditor ust
gUpdate{|ORYXEditor|} mode ust _ = undef // basicUpdate mode parseUpdate emptyORYXEditor ust // TODO
where
parseUpdate diagram orig = { ORYXEditor | orig & diagram = diagram }
gDefaultMask{|ORYXEditor|} _ = [Touched []]
gVerify{|ORYXEditor|} _ vst = alwaysValid vst
//gDefaultMask{|ORYXEditor|} _ = [Touched []] TODO
gVerify{|ORYXEditor|} _ _ vst = undef // alwaysValid vst // TODO
derive JSONEncode ORYXEditor
derive JSONDecode ORYXEditor
derive gEq ORYXEditor
\ No newline at end of file
derive gEq ORYXEditor
......@@ -3,10 +3,12 @@ definition module GinAbstractSyntax
import StdOverloaded
import GinTypes
from iTaskClass import class iTask, gVisualizeText, gVisualizeHtml, gVisualizeEditor, gUpdate, gDefaultMask, gVerify, JSONEncode, JSONDecode, gEq
from iTaskClass import class iTask
from GinParser import :: GPath, :: GPathNode
from GinPrinter import :: LineMap, :: Map
import GenVisualize
from GinParser import ::GPath, ::GPathNode, ::GParseState
from GinPrinter import ::LineMap, ::Map
import Void
:: AModule = { name :: AIdentifier
......
......@@ -2,8 +2,8 @@ definition module GinConfig
import Maybe, HTML, UIDefinition
from iTasks import ::JSONNode, ::VerSt, ::UpdateMask, ::USt, ::UpdateMode, ::VSt, :: StaticVisualizationMode
from iTasks import class iTask, generic gVisualizeText, generic gVisualizeHtml, generic gVisualizeEditor, generic gUpdate, generic gDefaultMask, generic gVerify, generic JSONEncode, generic JSONDecode, generic gEq
import iTasks
from iTasks import class iTask, generic gVisualizeText, generic gVisualizeEditor, generic gUpdate, generic gVerify, generic JSONEncode, generic JSONDecode, generic gEq
:: GinConfig =
{ cleanPath :: !String
......@@ -14,10 +14,10 @@ from iTasks import class iTask, generic gVisualizeText, generic gVisualizeHtml,
derive gEq GinConfig
derive gVisualizeText GinConfig
derive gVisualizeHtml GinConfig
//derive gVisualizeHtml GinConfig TODO
derive gVisualizeEditor GinConfig
derive gUpdate GinConfig
derive gDefaultMask GinConfig
//derive gDefaultMask GinConfig TODO
derive gVerify GinConfig
derive JSONEncode GinConfig
derive JSONDecode GinConfig
......
......@@ -3,11 +3,11 @@ definition module GinORYX
import GenEq
import JSON, HTML, UIDefinition
from iTasks import ::JSONNode, ::VerSt, ::UpdateMask, ::USt, ::UpdateMode, ::VSt, :: StaticVisualizationMode
from iTasks import class iTask, generic gVisualizeText, generic gVisualizeHtml, generic gVisualizeEditor, generic gUpdate, generic gDefaultMask, generic gVerify, generic JSONEncode, generic JSONDecode, generic gEq
from iTasks import :: JSONNode
from GinSyntax import ::GDeclaration, ::GModule, ::GGraph, ::GImport, ::Binding, ::Bindings
from GinParser import ::GPath, ::GPathNode
from GinSyntax import :: GModule, :: GGraph, :: Bindings, :: Binding
from GinParser import :: GPath, :: GPathNode
import GenVerify
:: ORYXEditor = { diagram :: ORYXDiagram
, stencilset :: ORYXStencilSetReference
......@@ -90,10 +90,10 @@ derive gEq ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, O
derive JSONEncode ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError
derive JSONDecode ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError
derive gVisualizeText ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXProperty, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError
derive gVisualizeHtml ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXProperty, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError
//derive gVisualizeHtml ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXProperty, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError TODO
derive gVisualizeEditor ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXProperty, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError
derive gUpdate ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXProperty, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError
derive gDefaultMask ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXProperty, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError
//derive gDefaultMask ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXProperty, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError TODO
derive gVerify ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXProperty, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError
oryxDiagramToGraph :: !Bindings !ORYXDiagram -> GGraph
......
......@@ -13,16 +13,16 @@ import Text
import iTasks
import GinAbstractSyntax
import GinFlowLibrary
import GinParser
import GinSyntax
//import GinAbstractSyntax
//import GinFlowLibrary
//import GinParser
//import GinSyntax
derive gEq ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXProperty, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError
derive JSONEncode ORYXBound, ORYXBounds, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError
derive JSONDecode ORYXBound, ORYXBounds, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError
derive gVisualizeText ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXProperty, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError, JSONNode
derive gVisualizeHtml ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXProperty, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError, JSONNode
//derive gVisualizeHtml ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXProperty, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError, JSONNode TODO
derive gVisualizeEditor ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXProperty, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError, JSONNode
derive gUpdate ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXProperty, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError, JSONNode
derive gDefaultMask ORYXBound, ORYXBounds, ORYXChildShape, ORYXDiagram, ORYXDocker, ORYXOutgoing, ORYXProperties, ORYXProperty, ORYXStencilReference, ORYXStencilSetReference, ORYXTarget, ORYXError, JSONNode
......
......@@ -9,8 +9,7 @@ import GinConfig
import GinSyntax
import GinAbstractSyntax
from iTasks import ::JSONNode, ::VerSt, ::UpdateMask, ::USt, ::UpdateMode, ::VSt, :: StaticVisualizationMode
from iTasks import class iTask, generic gVisualizeText, generic gVisualizeHtml, generic gVisualizeEditor, generic gUpdate, generic gDefaultMask, generic gVerify, generic JSONEncode, generic JSONDecode, generic gEq
from iTasks import class iTask
:: GPath :== [GPathNode]
......
......@@ -3,8 +3,8 @@ definition module GinSVG
import Maybe
import XML, HTML, UIDefinition
from iTasks import ::JSONNode, ::VerSt, ::UpdateMask, ::USt, ::UpdateMode, ::VSt, :: StaticVisualizationMode
from iTasks import class iTask, generic gVisualizeText, generic gVisualizeHtml, generic gVisualizeEditor, generic gUpdate, generic gDefaultMask, generic gVerify, generic JSONEncode, generic JSONDecode, generic gEq
from iTasks import class iTask
import GenVisualize
:: SVGPosX = XLeft
| XRight
......
......@@ -8,8 +8,7 @@ import StdString
import Maybe
import XML, HTML, UIDefinition
from iTasks import ::JSONNode, ::VerSt, ::UpdateMask, ::USt, ::UpdateMode, ::VSt, :: StaticVisualizationMode
from iTasks import class iTask, generic gVisualizeText, generic gVisualizeHtml, generic gVisualizeEditor, generic gUpdate, generic gDefaultMask, generic gVerify, generic JSONEncode, generic JSONDecode, generic gEq
from iTasks import class iTask
derive class iTask SVGPosX, SVGPosY, SVGElement, SVGStyle, SVGShape
derive class iTask XMLDoc, XMLNode, XMLAttr, XMLQName
......
......@@ -3,13 +3,14 @@ definition module GinSyntax
import Graph
import Maybe, HTML, UIDefinition
from iTasks import ::JSONNode, ::VerSt, ::UpdateMask, ::USt, ::UpdateMode, ::VSt, :: StaticVisualizationMode
from iTasks import class iTask, generic gVisualizeText, generic gVisualizeHtml, generic gVisualizeEditor, generic gUpdate, generic gDefaultMask, generic gVerify, generic JSONEncode, generic JSONDecode, generic gEq
from iTasks import class iTask
from GenVisualize import generic gVisualizeEditor, generic gVisualizeText, generic gHeaders, generic gGridRows, generic gDefault, generic gUpdate, generic gVerify
import GinAbstractSyntax
from GinORYX import ::ORYXDiagram
from GinSVG import ::SVGShape
import GinTypes
import GinParser
// Graph definition
:: GModule = { name :: GIdentifier
......
......@@ -3,10 +3,10 @@ definition module GinTypes
import GenEq
import Maybe, HTML, UIDefinition
from iTasks import ::JSONNode, ::VerSt, ::UpdateMask, ::USt, ::UpdateMode, ::VSt, :: StaticVisualizationMode
from iTasks import class iTask, generic gVisualizeText, generic gVisualizeHtml, generic gVisualizeEditor, generic gUpdate, generic gDefaultMask, generic gVerify, generic JSONEncode, generic JSONDecode, generic gEq
from iTasks import class iTask
from GinPrinter import class Printer
import GenVisualize
:: GTypeExpression = GConstructor GIdentifier
| GList GTypeExpression
......
......@@ -5,8 +5,7 @@ import StdList
import GenEq
import Maybe, HTML, UIDefinition
from iTasks import ::JSONNode, ::VerSt, ::UpdateMask, ::USt, ::UpdateMode, ::VSt, :: StaticVisualizationMode
from iTasks import class iTask, generic gVisualizeText, generic gVisualizeHtml, generic gVisualizeEditor, generic gUpdate, generic gDefaultMask, generic gVerify, generic JSONEncode, generic JSONDecode, generic gEq
from iTasks import class iTask
import GinPrinter
......
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