Commit 99e2d178 authored by Jurriën Stutterheim's avatar Jurriën Stutterheim

Move Gin to hierarchical namespace, step 1


git-svn-id: https://svn.cs.ru.nl/repos/iTask-system/trunk@2410 63da3aa8-80fd-4f01-9db8-e6ea747a3da2
parent 37c24e88
definition module GinFlowLibrary
import GinSyntax
predefinedModule :: GModule
definition module GinAbstractSyntax
definition module iTasks.Gin.AbstractSyntax
import GinTypes
import GinParser
import GinPrinter
import iTasks.Gin.Types
import iTasks.Gin.Parser
import iTasks.Gin.Printer
from iTaskClass import class iTask
from iTasks.Framework.iTaskClass import class iTask
from Void import :: Void
......
implementation module GinAbstractSyntax
implementation module iTasks.Gin.AbstractSyntax
import StdBool
from StdFunc import o
......@@ -12,15 +12,15 @@ import Map
import Text
import Maybe
from GinParser import :: GPath(..), :: GTypeDefinition(..), :: GTypeExpression(..), :: GFormalParameter(..), :: GIdentifier(..), :: GTypeVariable(..), :: GTypeRhs(..), :: GRecordField(..), :: GDataConstructor(..)
from GinTypes import generic gEq, generic JSONDecode, generic JSONEncode, generic gVerify, generic gUpdate, generic gDefault, generic gGridRows, generic gHeaders, generic gVisualizeText, generic gVisualizeEditor
from GinTypes import :: JSONNode, :: InteractionMask, :: VerifyMask, :: VerifyOptions, :: ConsPos, :: StaticVisualizationMode, :: VSt, :: VisualizationResult
from GinTypes import printGTypeDefinition, typeIsDefined, printGTypeExpression
import GinPrinter
from iTasks.Gin.Parser import :: GPath(..), :: GTypeDefinition(..), :: GTypeExpression(..), :: GFormalParameter(..), :: GIdentifier(..), :: GTypeVariable(..), :: GTypeRhs(..), :: GRecordField(..), :: GDataConstructor(..)
from iTasks.Gin.Types import generic gEq, generic JSONDecode, generic JSONEncode, generic gVerify, generic gUpdate, generic gDefault, generic gGridRows, generic gHeaders, generic gVisualizeText, generic gVisualizeEditor
from iTasks.Gin.Types import :: JSONNode, :: InteractionMask, :: VerifyMask, :: VerifyOptions, :: ConsPos, :: StaticVisualizationMode, :: VSt, :: VisualizationResult
from iTasks.Gin.Types import printGTypeDefinition, typeIsDefined, printGTypeExpression
import iTasks.Gin.Printer
from GenEq import ===
from iTaskClass import class iTask, gEq
from iTasks.Framework.iTaskClass import class iTask, gEq
derive class iTask AModule, ADefinition, AExpression, ACaseAlt, AListComprehension, AGeneratorList, AGenerator, AFix
......
definition module GinCompiler
definition module iTasks.Gin.Compiler
from iTasks import class iTask, :: IWorld
import GinSyntax
import GinParser
import iTasks.Gin.Syntax
import iTasks.Gin.Parser
:: CompileResult a = CompileSuccess a | CompileGlobalError String | CompilePathError [(GPath,String)]
......
implementation module GinCompiler
implementation module iTasks.Gin.Compiler
import StdFile
import iTasks
import IWorld
import iTasks.Framework.IWorld
import GinSyntax
import GinAbstractSyntax
import GinParser
import iTasks.Gin.Syntax
import iTasks.Gin.AbstractSyntax
import iTasks.Gin.Parser
import GinCompilerLogParser
import GinConfig
import iTasks.Gin.CompilerLogParser
import iTasks.Gin.Config
import Text
import Error
......
definition module GinCompilerLogParser
definition module iTasks.Gin.CompilerLogParser
from Maybe import :: Maybe
import GinParser
import GinPrinter
import GinAbstractSyntax
import iTasks.Gin.Parser
import iTasks.Gin.Printer
import iTasks.Gin.AbstractSyntax
:: CompilerErrorContext :== (CompilerError, ErrorContext)
......
implementation module GinCompilerLogParser
implementation module iTasks.Gin.CompilerLogParser
import StdEnv
import Maybe
......@@ -7,9 +7,9 @@ import ParserCombinators
import Map
from GinParser import ::GPath(..), ::GPathNode(..), ::GResourceId(..)
from GinPrinter import ::LineMap, ::Map
from GinAbstractSyntax import ::FunctionMap, ::AIdentifier
from iTasks.Gin.Parser import ::GPath(..), ::GPathNode(..), ::GResourceId(..)
from iTasks.Gin.Printer import ::LineMap, ::Map
from iTasks.Gin.AbstractSyntax import ::FunctionMap, ::AIdentifier
parseCleanIDELog :: String -> [CompilerErrorContext]
parseCleanIDELog s = (snd o hd) (begin1 parser (fromString s))
......
definition module GinConfig
definition module iTasks.Gin.Config
from Maybe import :: Maybe
......@@ -6,11 +6,11 @@ from SystemTypes import :: InteractionMask, :: VerifyMask, :: VerifyOptions, ::
//from GinTypes import :: GTypeExpression, :: GTypeDefinition
from GenVisualize import generic gVisualizeText, generic gVisualizeEditor
from iTasks.Framework.GenVisualize import generic gVisualizeText, generic gVisualizeEditor
from JSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from GenEq import generic gEq
from GenUpdate import generic gUpdate, generic gDefault, generic gHeaders, generic gGridRows
from GenVerify import generic gVerify
from iTasks.Framework.GenUpdate import generic gUpdate, generic gDefault, generic gHeaders, generic gGridRows
from iTasks.Framework.GenVerify import generic gVerify
:: GinConfig =
{ cleanPath :: !String
......
implementation module GinConfig
implementation module iTasks.Gin.Config
import Maybe
import StdFile
......@@ -10,7 +10,7 @@ from FilePath import takeDirectory, </>
import OSError
import CommandLine
from Engine import determineAppName
from iTasks.Framework.Engine import determineAppName
import iTasks
......
definition module GinDCLImport
definition module iTasks.Gin.DCLImport
import GinSyntax
import GinTypes
import iTasks.Gin.Syntax
import iTasks.Gin.Types
from syntax import ::Type
from Error import :: MaybeErrorString, :: MaybeError
......
implementation module GinDCLImport
implementation module iTasks.Gin.DCLImport
import StdEnv
......@@ -11,7 +11,7 @@ import Maybe
import CleanDocParser
import GinSyntax
import iTasks.Gin.Syntax
from general import ::Optional(..)
from Heap import ::Ptr
......
definition module iTasks.Gin.FlowLibrary
import iTasks.Gin.Syntax
predefinedModule :: GModule
implementation module GinFlowLibrary
implementation module iTasks.Gin.FlowLibrary
import Maybe
......@@ -6,11 +6,11 @@ import StdEnum
from StdFunc import o
import StdTuple
import GinAbstractSyntax
import GinSyntax
import GinParser
import GinSVG
import GinTypes
import iTasks.Gin.AbstractSyntax
import iTasks.Gin.Syntax
import iTasks.Gin.Parser
import iTasks.Gin.SVG
import iTasks.Gin.Types
predefinedModule :: GModule
predefinedModule =
......
definition module GinORYX
definition module iTasks.Gin.ORYX
from iTasks import :: JSONNode
from Maybe import :: Maybe
from SystemTypes import :: InteractionMask, :: VerifyMask, :: VerifyOptions, :: ConsPos, :: StaticVisualizationMode, :: VSt, :: VisualizationResult
from JSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from GenVisualize import generic gVisualizeText, generic gVisualizeEditor
from GenUpdate import generic gUpdate, generic gDefault, generic gHeaders, generic gGridRows
from GenVerify import generic gVerify
from iTasks.Framework.GenVisualize import generic gVisualizeText, generic gVisualizeEditor
from iTasks.Framework.GenUpdate import generic gUpdate, generic gDefault, generic gHeaders, generic gGridRows
from iTasks.Framework.GenVerify import generic gVerify
from GenEq import generic gEq
import GinTypes
import GinSyntax
import GinParser
import iTasks.Gin.Types
import iTasks.Gin.Syntax
import iTasks.Gin.Parser
:: ORYXEditor = { diagram :: ORYXDiagram
, stencilset :: ORYXStencilSetReference
......
implementation module GinORYX
implementation module iTasks.Gin.ORYX
import StdBool
import StdEnum
......@@ -15,10 +15,10 @@ import Graph
//import iTasks
import GinAbstractSyntax
import GinFlowLibrary
import GinParser
import GinSyntax
import iTasks.Gin.AbstractSyntax
import iTasks.Gin.FlowLibrary
import iTasks.Gin.Parser
import iTasks.Gin.Syntax
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
......
definition module GinORYXExtensions
definition module iTasks.Gin.ORYXExtensions
//import JSON
......
implementation module GinORYXExtensions
implementation module iTasks.Gin.ORYXExtensions
import Maybe
import JSON
......
definition module GinORYXStencil
definition module iTasks.Gin.ORYXStencil
//import JSON
import GinSyntax
import GinORYX
import iTasks.Gin.Syntax
import iTasks.Gin.ORYX
::ORYXStencilSet =
{ title :: !String
......
implementation module GinORYXStencil
implementation module iTasks.Gin.ORYXStencil
import StdArray
import StdEnum
......@@ -9,11 +9,11 @@ import GenEq
import JSON
import Text
import GinSyntax
import GinORYX
import GinSVG
import GinFlowLibrary
import Util
import iTasks.Gin.Syntax
import iTasks.Gin.ORYX
import iTasks.Gin.SVG
import iTasks.Gin.FlowLibrary
import iTasks.Framework.Util
derive gEq ORYXStencilSet, ORYXStencil, ORYXRules, ORYXConnectionRule, ORYXConnect, ORYXContainmentRule, ORYXMorphingRule
derive JSONEncode ORYXStencilSet, ORYXStencil, ORYXRules, ORYXConnectionRule, ORYXContainmentRule, ORYXMorphingRule
......
definition module GinParser
definition module iTasks.Gin.Parser
//import StdList
//import GenPrint
//import JSON
//import Monad
import GinConfig
import GinSyntax
import GinAbstractSyntax
import iTasks.Gin.Config
import iTasks.Gin.Syntax
import iTasks.Gin.AbstractSyntax
from iTasks import class iTask
......
implementation module GinParser
implementation module iTasks.Gin.Parser
import StdBool
import StdArray
......@@ -14,10 +14,10 @@ import Error
import GenPrint
from iTasks import class iTask
from GinTypes import generic gEq, generic JSONDecode, generic JSONEncode, generic gVerify, generic gUpdate, generic gDefault, generic gGridRows, generic gHeaders, generic gVisualizeText, generic gVisualizeEditor
from GinTypes import :: JSONNode, :: InteractionMask, :: VerifyMask, :: VerifyOptions, :: ConsPos, :: StaticVisualizationMode, :: VSt, :: VisualizationResult, :: GTypeExpression, :: GTypeDefinition
from GinTypes import printGTypeDefinition, typeIsDefined, printGTypeExpression
from GinPrinter import class Printer
from iTasks.Gin.Types import generic gEq, generic JSONDecode, generic JSONEncode, generic gVerify, generic gUpdate, generic gDefault, generic gGridRows, generic gHeaders, generic gVisualizeText, generic gVisualizeEditor
from iTasks.Gin.Types import :: JSONNode, :: InteractionMask, :: VerifyMask, :: VerifyOptions, :: ConsPos, :: StaticVisualizationMode, :: VSt, :: VisualizationResult, :: GTypeExpression, :: GTypeDefinition
from iTasks.Gin.Types import printGTypeDefinition, typeIsDefined, printGTypeExpression
from iTasks.Gin.Printer import class Printer
//Clean-platform:
import Graph
import Map
......@@ -60,12 +60,12 @@ from syntax import
import CleanDocParser
//GiN:
import Monad
import GinSyntax
import GinAbstractSyntax
import GinFlowLibrary
import GinORYX
import GinStorage
import iTasks.Gin.Monad
import iTasks.Gin.Syntax
import iTasks.Gin.AbstractSyntax
import iTasks.Gin.FlowLibrary
import iTasks.Gin.ORYX
import iTasks.Gin.Storage
//--------------------------------------------------------------------------------------------------
//GParseState monadic combinators
......
definition module GinPrinter
definition module iTasks.Gin.Printer
from Map import ::Map
from PPrint import ::Doc
import GinParser
import iTasks.Gin.Parser
class Printer a
where
......
implementation module GinPrinter
implementation module iTasks.Gin.Printer
import StdList
import StdString
......@@ -11,7 +11,7 @@ from PPrint import qualified <$>, <+>, <->, </>, align, empty, space, comma, lin
from PPrint import qualified parens, braces, brackets, dquotes, tupled
from PPrint import qualified punctuate, hsep, vsep, vcat, fillSep, hang, indent, renderPretty, display
from GinParser import ::GPath(..), :: GPathNode(..), ::GResourceId(..)
from iTasks.Gin.Parser import ::GPath(..), :: GPathNode(..), ::GResourceId(..)
prettyPrint :: Doc -> String
prettyPrint doc = 'PPrint'.display ('PPrint'.renderPretty 0.9 120 doc)
......
definition module GinSVG
definition module iTasks.Gin.SVG
//import Maybe
//import XML, HTML, UIDefinition
......@@ -7,12 +7,12 @@ from Maybe import :: Maybe
from XML import :: XMLNode
from iTasks import class iTask
from GenVisualize import generic gVisualizeText, generic gVisualizeEditor
from GenUpdate import generic gUpdate, generic gDefault, generic gHeaders, generic gGridRows
from GenVerify import generic gVerify
from iTasks.Framework.GenVisualize import generic gVisualizeText, generic gVisualizeEditor
from iTasks.Framework.GenUpdate import generic gUpdate, generic gDefault, generic gHeaders, generic gGridRows
from iTasks.Framework.GenVerify import generic gVerify
from JSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from GenEq import generic gEq
from SystemTypes import :: InteractionMask, :: VerifyMask, :: VerifyOptions, :: ConsPos, :: StaticVisualizationMode, :: VSt, :: VisualizationResult
from iTasks.API.Core.SystemTypes import :: InteractionMask, :: VerifyMask, :: VerifyOptions, :: ConsPos, :: StaticVisualizationMode, :: VSt, :: VisualizationResult
:: SVGPosX = XLeft
| XRight
......
implementation module GinSVG
implementation module iTasks.Gin.SVG
import StdInt
import StdGeneric
......@@ -7,12 +7,13 @@ import StdString
import StdBool
import Maybe
import XML, HTML, UIDefinition
import XML, HTML
import iTasks.Framework.UIDefinition
from GinTypes import generic gEq, generic JSONDecode, generic JSONEncode, generic gVerify, generic gUpdate, generic gDefault, generic gGridRows, generic gHeaders, generic gVisualizeText, generic gVisualizeEditor
from GinTypes import :: JSONNode, :: InteractionMask, :: VerifyMask, :: VerifyOptions, :: ConsPos, :: StaticVisualizationMode, :: VSt, :: VisualizationResult, :: GTypeExpression, :: GTypeDefinition
from GinTypes import printGTypeDefinition, typeIsDefined, printGTypeExpression
from GinPrinter import class Printer
from iTasks.Gin.Types import generic gEq, generic JSONDecode, generic JSONEncode, generic gVerify, generic gUpdate, generic gDefault, generic gGridRows, generic gHeaders, generic gVisualizeText, generic gVisualizeEditor
from iTasks.Gin.Types import :: JSONNode, :: InteractionMask, :: VerifyMask, :: VerifyOptions, :: ConsPos, :: StaticVisualizationMode, :: VSt, :: VisualizationResult, :: GTypeExpression, :: GTypeDefinition
from iTasks.Gin.Types import printGTypeDefinition, typeIsDefined, printGTypeExpression
from iTasks.Gin.Printer import class Printer
from iTasks import class iTask
......
definition module GinStorage
definition module iTasks.Gin.Storage
from Error import :: MaybeErrorString, :: MaybeError
//import OSError
//import Maybe
//import Void
from Task import ::Task
from iTasks.Framework.Task import ::Task
import GinSyntax
import GinConfig
import iTasks.Gin.Syntax
import iTasks.Gin.Config
searchPathModules :: !GinConfig !*World -> ([String], *World)
......
implementation module GinStorage
implementation module iTasks.Gin.Storage
import StdFile
from StdFunc import o, seqList, ::St
......@@ -20,13 +20,13 @@ from iTasks import class descr (..), instance descr String, class OptionContaine
from iTasks import ActionNo, Always, ActionYes, :: TaskStep (..), :: Action (..), :: Hotkey (..), :: Key (..), :: ActionName (..), :: TaskValue (..), :: ChoiceType (..)
from iTasks import :: Tree, :: MultiChoiceType, :: UIControlSequence, class Functor, instance Functor []
import GinConfig
import GinSyntax
import GinParser
import GinPrinter
import GinFlowLibrary
import iTasks.Gin.Config
import iTasks.Gin.Syntax
import iTasks.Gin.Parser
import iTasks.Gin.Printer
import iTasks.Gin.FlowLibrary
import GinDCLImport
import iTasks.Gin.DCLImport
GRAPHICAL_EXTENSION :== "gcl"
DEFINITION_EXTENSION :== "dcl"
......
definition module GinSyntax
definition module iTasks.Gin.Syntax
from Graph import :: Graph
from Monad import class Monad
from iTasks import class iTask
from GenVisualize import generic gVisualizeEditor, generic gVisualizeText, generic gHeaders, generic gGridRows, generic gDefault, generic gUpdate, generic gVerify
import GinAbstractSyntax
import GinORYX
import GinSVG
import GinTypes
import GinParser
import GinTypes
from iTasks.Framework.GenVisualize import generic gVisualizeEditor, generic gVisualizeText, generic gHeaders, generic gGridRows, generic gDefault, generic gUpdate, generic gVerify
import iTasks.Gin.AbstractSyntax
import iTasks.Gin.ORYX
import iTasks.Gin.SVG
import iTasks.Gin.Types
import iTasks.Gin.Parser
import iTasks.Gin.Types
// Graph definition
:: GModule = { name :: GIdentifier
......
implementation module GinSyntax
implementation module iTasks.Gin.Syntax
from iTasks import class iTask
import StdClass, StdBool, StdList
import JSON
import Monad // TODO
import iTasks.Gin.Monad // TODO
import GinAbstractSyntax
import GinORYX
import GinParser
import GinSVG
import GinTypes
import iTasks.Gin.AbstractSyntax
import iTasks.Gin.ORYX
import iTasks.Gin.Parser
import iTasks.Gin.SVG
import iTasks.Gin.Types
// Generic functions
derive class iTask GModule, GModuleKind, Binding, NodeBinding, NBParameterMap, ParallelBinding, PBParameter, GDefinition, GDeclaration, GShape
......
definition module GinTypes
definition module iTasks.Gin.Types
//import GenEq
//import HTML, UIDefinition
......@@ -8,14 +8,14 @@ from Maybe import :: Maybe
from iTasks import class iTask
from StdGeneric import generic bimap, :: Bimap
from GenVisualize import generic gVisualizeText, generic gVisualizeEditor
from GenUpdate import generic gUpdate, generic gDefault, generic gHeaders, generic gGridRows
from GenVerify import generic gVerify
from iTasks.Framework.GenVisualize import generic gVisualizeText, generic gVisualizeEditor
from iTasks.Framework.GenUpdate import generic gUpdate, generic gDefault, generic gHeaders, generic gGridRows
from iTasks.Framework.GenVerify import generic gVerify
from JSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from GenEq import generic gEq
from SystemTypes import :: InteractionMask, :: VerifyMask, :: VerifyOptions, :: ConsPos, :: StaticVisualizationMode, :: VSt, :: VisualizationResult
from iTasks.API.Core.SystemTypes import :: InteractionMask, :: VerifyMask, :: VerifyOptions, :: ConsPos, :: StaticVisualizationMode, :: VSt, :: VisualizationResult
import GinPrinter
import iTasks.Gin.Printer
:: GTypeExpression = GConstructor GIdentifier
| GList GTypeExpression
......
implementation module GinTypes
implementation module iTasks.Gin.Types
import StdBool
import StdList
......@@ -7,12 +7,12 @@ import Maybe, HTML, UIDefinition
from iTasks import class iTask
import GinPrinter
import iTasks.Gin.Printer
from GinParser import :: GPath(..), :: GTypeDefinition(..), :: GTypeExpression(..), :: GFormalParameter(..), :: GIdentifier(..), :: GTypeVariable(..), :: GTypeRhs(..), :: GRecordField(..), :: GDataConstructor(..)
from GinTypes import generic gEq, generic JSONDecode, generic JSONEncode, generic gVerify, generic gUpdate, generic gDefault, generic gGridRows, generic gHeaders, generic gVisualizeText, generic gVisualizeEditor
from GinTypes import :: JSONNode, :: InteractionMask, :: VerifyMask, :: VerifyOptions, :: ConsPos, :: StaticVisualizationMode, :: VSt, :: VisualizationResult
from GinTypes import printGTypeDefinition, typeIsDefined, printGTypeExpression
from iTasks.Gin.Parser import :: GPath(..), :: GTypeDefinition(..), :: GTypeExpression(..), :: GFormalParameter(..), :: GIdentifier(..), :: GTypeVariable(..), :: GTypeRhs(..), :: GRecordField(..), :: GDataConstructor(..)
from iTasks.Gin.Types import generic gEq, generic JSONDecode, generic JSONEncode, generic gVerify, generic gUpdate, generic gDefault, generic gGridRows, generic gHeaders, generic gVisualizeText, generic gVisualizeEditor