Commit 99d6fe39 authored by Bas Lijnse's avatar Bas Lijnse

Organized libraries into a hierarchy to prevent namespace conflicts

parent da52aaef
definition module ESMVizTool definition module ESMVizTool
import ESMSpec import ESMVizTool.ESMSpec
import iTasks import iTasks
class all a | iTask, render, gEq{|*|} a class all a | iTask, render, gEq{|*|} a
......
implementation module ESMVizTool implementation module ESMVizTool
import iTasks import iTasks
import ESMSpec import ESMVizTool.ESMSpec
import GenPrint import GenPrint
import Data.Graphviz import Data.Graphviz
import GraphvizVisualization import Gast.Graphviz.Visualization
derive bimap (,), Maybe derive bimap (,), Maybe
derive class iTask KnownAutomaton, State derive class iTask KnownAutomaton, State
......
definition module ESMSpec definition module ESMVizTool.ESMSpec
import StdClass, StdMaybe import StdClass, Data.Maybe
import gast //gen import Gast
:: Traces s i o :== [[SeenTrans s i o]] :: Traces s i o :== [[SeenTrans s i o]]
:: ESM s i o = { s_0 :: s // the initial state :: ESM s i o = { s_0 :: s // the initial state
......
implementation module ESMSpec implementation module ESMVizTool.ESMSpec
import StdBool, StdList, StdMaybe, StdMisc, StdString, StdTuple, StdOrdList import StdBool, StdList, StdMisc, StdString, StdTuple, StdOrdList
import GenPrint, GenEq, Data.List import GenPrint, GenEq, Data.List, Data.Maybe
import gast import Gast
tupToSpec :: (state input -> [([output],state)]) -> Spec state input output // conversion for old specificaions tupToSpec :: (state input -> [([output],state)]) -> Spec state input output // conversion for old specificaions
tupToSpec fun = \s i = [Pt o t \\ (o,t) <- fun s i] tupToSpec fun = \s i = [Pt o t \\ (o,t) <- fun s i]
......
definition module gast definition module Gast
/* /*
GAST: A Generic Automatic Software Test-system GAST: A Generic Automatic Software Test-system
...@@ -9,4 +9,5 @@ definition module gast ...@@ -9,4 +9,5 @@ definition module gast
pieter@cs.ru.nl pieter@cs.ru.nl
*/ */
import Math.Random, gen, GenEq, genLibTest, testable, confSM, stdProperty import Math.Random, GenEq
import Gast.Gen, Gast.GenLibTest, Gast.Testable, Gast.StdProperty, Gast.ConfSM
implementation module gast implementation module Gast
/* /*
GAST: A Generic Automatic Software Test-system GAST: A Generic Automatic Software Test-system
...@@ -8,4 +8,4 @@ implementation module gast ...@@ -8,4 +8,4 @@ implementation module gast
The Netherlands The Netherlands
pieter@cs.ru.nl pieter@cs.ru.nl
*/ */
\ No newline at end of file
definition module confSM definition module Gast.ConfSM
/* /*
GAST: A Generic Automatic Software Test-system GAST: A Generic Automatic Software Test-system
...@@ -12,7 +12,8 @@ definition module confSM ...@@ -12,7 +12,8 @@ definition module confSM
*/ */
import StdFile import StdFile
import Math.Random, gen,/* genLibTest,*/ testable, StdMaybe import Math.Random, Data.Maybe
import Gast.Testable, Gast.Gen
:: Spec state input output :== state input -> [Trans output state] :: Spec state input output :== state input -> [Trans output state]
:: Trans output state = Pt [output] state | Ft ([output]->[state]) :: Trans output state = Pt [output] state | Ft ([output]->[state])
......
implementation module confSM implementation module Gast.ConfSM
/* /*
GAST: A Generic Automatic Software Test-system GAST: A Generic Automatic Software Test-system
...@@ -11,9 +11,8 @@ implementation module confSM ...@@ -11,9 +11,8 @@ implementation module confSM
pieter@cs.ru.nl pieter@cs.ru.nl
*/ */
import StdEnv, Math.Random, gen, GenEq, testable //, StdLib import StdEnv, GenEq, Math.Random, Data.Maybe
import StdMaybe import Gast.Gen, Gast.Testable
//import qualified genLibTest
toSpec :: (state input -> [(state,[output])]) -> Spec state input output // conversion for old specificaions toSpec :: (state input -> [(state,[output])]) -> Spec state input output // conversion for old specificaions
toSpec fun = \s i = [Pt o t \\ (t,o) <- fun s i] toSpec fun = \s i = [Pt o t \\ (t,o) <- fun s i]
......
definition module gen definition module Gast.Gen
/* /*
GAST: A Generic Automatic Software Test-system GAST: A Generic Automatic Software Test-system
gen: generic generation of values of a type Gast.Gen: generic generation of values of a type
Pieter Koopman, 2004 Pieter Koopman, 2004
Radboud Universty, Nijmegen Radboud Universty, Nijmegen
......
implementation module gen implementation module Gast.Gen
/* /*
GAST: A Generic Automatic Software Test-system GAST: A Generic Automatic Software Test-system
gen: generic generation of values of a type Gast.Gen: generic generation of values of a type
Pieter Koopman, 2004 Pieter Koopman, 2004
Radboud Universty, Nijmegen Radboud Universty, Nijmegen
......
definition module genLibTest definition module Gast.GenLibTest
/* /*
GAST: A Generic Automatic Software Test-system GAST: A Generic Automatic Software Test-system
genLibtest: library for generic testing: showing and comparing values Gast.GenLibTest: library for generic testing: showing and comparing values
Pieter Koopman, 2004 Pieter Koopman, 2004
Radboud Universty, Nijmegen Radboud Universty, Nijmegen
......
implementation module genLibTest implementation module Gast.GenLibTest
/* /*
GAST: A Generic Automatic Software Test-system GAST: A Generic Automatic Software Test-system
genLibtest: library for generic testing: showing and comparing values Gast.GenLibTest: library for generic testing: showing and comparing values
Pieter Koopman, 2004 Pieter Koopman, 2004
Radboud Universty, Nijmegen Radboud Universty, Nijmegen
......
definition module GraphvizVisualization definition module Gast.Graphviz.Visualization
/** This module provides the iTasks class for the Graphviz library /** This module provides the iTasks class for the Graphviz library
**/ **/
import Data.Graphviz, iTasks import Data.Graphviz, iTasks
......
implementation module GraphvizVisualization implementation module Gast.Graphviz.Visualization
//import GenVisualize, GenUpdate, GenPrint, GenParse //import GenVisualize, GenUpdate, GenPrint, GenParse
//import iTasks.Framework.Generic, iTasks.Framework.UIDefinition, iTasks.Framework.IWorld, iTasks.API.Core.Types //import iTasks.Framework.Generic, iTasks.Framework.UIDefinition, iTasks.Framework.IWorld, iTasks.API.Core.Types
......
definition module stdProperty definition module Gast.StdProperty
/* /*
GAST: A Generic Automatic Software Test-system GAST: A Generic Automatic Software Test-system
stdProperty: opertors on logical properties Gast.StdProperty: opertors on logical properties
Pieter Koopman, 2004 Pieter Koopman, 2004
Radboud Universty, Nijmegen Radboud Universty, Nijmegen
...@@ -11,8 +11,7 @@ definition module stdProperty ...@@ -11,8 +11,7 @@ definition module stdProperty
pieter@cs.ru.nl pieter@cs.ru.nl
*/ */
/* import qualified genLibTest */ import Gast.Testable
import testable
class (\/) infixr 2 a b :: !a b -> Property // Conditional or of arg1 and arg2 class (\/) infixr 2 a b :: !a b -> Property // Conditional or of arg1 and arg2
class (/\) infixr 3 a b :: !a b -> Property // Conditional and of arg1 and arg2 class (/\) infixr 3 a b :: !a b -> Property // Conditional and of arg1 and arg2
......
implementation module stdProperty implementation module Gast.StdProperty
/* /*
GAST: A Generic Automatic Software Test-system GAST: A Generic Automatic Software Test-system
stdProperty: opertors on logical properties Gast.StdProperty: opertors on logical properties
Pieter Koopman, 2004..2008 Pieter Koopman, 2004..2008
Radboud Universty, Nijmegen Radboud Universty, Nijmegen
...@@ -11,7 +11,7 @@ implementation module stdProperty ...@@ -11,7 +11,7 @@ implementation module stdProperty
pieter@cs.ru.nl pieter@cs.ru.nl
*/ */
import testable, StdEnv import Gast.Testable, StdEnv
from Math.Random import genRandInt from Math.Random import genRandInt
class (==>) infixr 1 b :: b p -> Property | Testable p class (==>) infixr 1 b :: b p -> Property | Testable p
......
definition module testable definition module Gast.Testable
/* /*
GAST: A Generic Automatic Software Test-system GAST: A Generic Automatic Software Test-system
testable: the test algorithm for logical properties Gast.Testable: the test algorithm for logical properties
Pieter Koopman, 2002-2007 Pieter Koopman, 2002-2007
Radboud Universty, Nijmegen Radboud Universty, Nijmegen
...@@ -11,9 +11,9 @@ definition module testable ...@@ -11,9 +11,9 @@ definition module testable
pieter@cs.ru.nl pieter@cs.ru.nl
*/ */
import genLibTest import Gast.GenLibTest
from stdProperty import ::Property // for instance of testable from Gast.StdProperty import ::Property // for instance of testable
import gen import Gast.Gen
//--- basics --// //--- basics --//
......
implementation module testable implementation module Gast.Testable
/* /*
GAST: A Generic Automatic Software Test-system GAST: A Generic Automatic Software Test-system
testable: the test algorithm for logical properties Gast.Testable: the test algorithm for logical properties
Pieter Koopman, 2002-2008 Pieter Koopman, 2002-2008
Radboud Universty, Nijmegen Radboud Universty, Nijmegen
...@@ -11,7 +11,7 @@ implementation module testable ...@@ -11,7 +11,7 @@ implementation module testable
pieter@cs.ru.nl pieter@cs.ru.nl
*/ */
import StdEnv, Math.Random, genLibTest, /* StdTime, */ gen import StdEnv, Math.Random, Gast.GenLibTest, Gast.Gen
derive gLess Result derive gLess Result
instance == Result where (==) x y = x===y instance == Result where (==) x y = x===y
......
This diff is collapsed.
This diff is collapsed.
module test0 module test0
import gast, StdEnv import Gast, StdEnv
Start = test \x y.(x && y) == not (not x || not y) Start = test \x y.(x && y) == not (not x || not y)
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