Commit df4509e2 authored by Rinus Plasmeijer's avatar Rinus Plasmeijer
Browse files

*** empty log message ***

parent 2375f81c
...@@ -14,10 +14,10 @@ import Gerda, StdEnv ...@@ -14,10 +14,10 @@ import Gerda, StdEnv
Start world Start world
# (g, world) = openGerda "Clean Data Structures" world # (g, world) = openGerda "Clean Data Structures" world
// x = 42 // x = 42
// x = C2 // x = [[1]]
// x = (1, 3.1415927, 'a', [C2, C1, C3]) // x = (1, 3.1415927, 'a', [C2, C1, C3])
// x = [3, 5, 7] // x = [3, 5, 7]
// x = [C3, C1, C2] // x = [C3, C1, C2, C1, C3, C2]
// x = [[[[[[[1]]]]]]] // x = [[[[[[[1]]]]]]]
// x = ["test"] // x = ["test"]
// x = ['aapnoot'] // x = ['aapnoot']
...@@ -26,33 +26,51 @@ Start world ...@@ -26,33 +26,51 @@ Start world
// x = Rose 1 [Rose 2 [], Rose 3 []] // x = Rose 1 [Rose 2 [], Rose 3 []]
// x = [[C1, C2], [C3, C2, C1]] // x = [[C1, C2], [C3, C2, C1]]
// x = {naam = ['aap'], leeftijd = 13.5, rec = Nothing} // x = {naam = ['aap'], leeftijd = 13.5, rec = Nothing}
// x = ["Hello", "world"] x = ["Hello", "world"]
// x = Rose 1 [Rose 2 [], Rose 3 []] // x = Rose 1 [Rose 2 [], Rose 3 []]
// x = "a" +++ {'b' \\ _ <- [1..1000]} // x = "a" +++ {'b' \\ _ <- [1..1000]}
// x = GRose (1, 'a', 0.5, "bud") [GRose (2, 'b', 0.75, "another bud") [], GRose (3, 'c', 0.875, "yet another bud") []] // x = GRose (1, 'a', 0.5, "bud") [GRose (2, 'b', 0.75, "another bud") [], GRose (3, 'c', 0.875, "yet another bud") []]
// x = [1..10000] // x = [1..10000]
// x = array {strictArray {1, 2, 3}, strictArray {1 .. 100}} // x = array {strictArray {1, 2, 3}, strictArray {1 .. 100}}
// x = Constr` 42 // x = Constr` 42
x = gerdaObject 42
g = writeGerda "test" x g g = writeGerda "test" x g
g = writeGerda "test2" x2 g
(y, g) = readGerda "test" g (y, g) = readGerda "test" g
f = case y of Just {gerdaWrite} -> gerdaWrite; _ -> const id (y2, g) = readGerda "test2" g
h = case y of Just {gerdaRead} -> gerdaRead; _ -> (\g -> (undef, g)) /* = case y `typeOf` x of
g = f 123 g Just x`
(w, g) = h g # g = writeGerda "test2" x` g
(z, g) = readGerda "test" g (z, g) = readGerda "test" g
= (y `typeOf` x, Just w `typeOf` x.gerdaValue, z `typeOf` x, closeGerda g world) -> (z `typeOf` x, closeGerda g world)*/
= (y `typeOf` x, y2 `typeOf` x2, closeGerda g world)
// x = gerdaObject 42
// g = writeGerda "test" x g
// (y, g) = readGerda "test" g
// f = case y of Just {gerdaWrite} -> gerdaWrite; _ -> const id
// h = case y of Just {gerdaRead} -> gerdaRead; _ -> (\g -> (undef, g))
// g = f 123 g
// (w, g) = h g
// (z, g) = readGerda "test" g
// = (y `typeOf` x, Just w `typeOf` x.gerdaValue, z `typeOf` x, closeGerda g world)
where where
(`typeOf`) :: !(Maybe a) a -> Maybe a (`typeOf`) :: !(Maybe a) a -> Maybe a
(`typeOf`) x _ = x (`typeOf`) x _ = x
x :: Phantom [Int]
x = Opera
x2 :: Phantom Char
x2 = Opera
array :: !{a} -> {a} array :: !{a} -> {a}
array x = x array x = x
strictArray :: !{!a} -> {!a} strictArray :: !{!a} -> {!a}
strictArray x = x strictArray x = x
derive gerda Tree, Rose, R, N, (,), (,,), (,,,), GRose, Test` derive gerda Tree, Rose, R, N, (,), (,,), (,,,), GRose, Test`, Phantom
:: Phantom a = Opera
/* /*
:: T3 a b c = C3 a b c | D3 | E3 :: T3 a b c = C3 a b c | D3 | E3
......
...@@ -18,7 +18,7 @@ Global ...@@ -18,7 +18,7 @@ Global
MarkingCollector: False MarkingCollector: False
StandardRuntimeEnv: True StandardRuntimeEnv: True
Profile Profile
Memory: False Memory: True
MemoryMinimumHeapSize: 0 MemoryMinimumHeapSize: 0
Time: True Time: True
Stack: False Stack: False
...@@ -66,7 +66,7 @@ MainModule ...@@ -66,7 +66,7 @@ MainModule
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
OtherModules OtherModules
Module Module
Name: Gerda Name: odbccp
Dir: {Project} Dir: {Project}
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -81,22 +81,24 @@ OtherModules ...@@ -81,22 +81,24 @@ OtherModules
Fusion: False Fusion: False
Dcl Dcl
WindowPosition WindowPosition
X: 88 X: 224
Y: 44 Y: 74
SizeX: 751 SizeX: 800
SizeY: 477 SizeY: 632
DclOpen: True DclOpen: False
Icl Icl
WindowPosition WindowPosition
X: 26 X: 10
Y: 41 Y: 10
SizeX: 795 SizeX: 800
SizeY: 497 SizeY: 640
IclOpen: True IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
NeededLibraries
Library: odbccp_library
Module Module
Name: StdGeneric Name: odbc
Dir: {Application}\Libraries\StdEnv Dir: {Project}
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
NeverTimeProfile: False NeverTimeProfile: False
...@@ -108,6 +110,12 @@ OtherModules ...@@ -108,6 +110,12 @@ OtherModules
ReadableABC: False ReadableABC: False
ReuseUniqueNodes: True ReuseUniqueNodes: True
Fusion: False Fusion: False
Dcl
WindowPosition
X: 211
Y: 44
SizeX: 800
SizeY: 646
DclOpen: False DclOpen: False
Icl Icl
WindowPosition WindowPosition
...@@ -117,8 +125,10 @@ OtherModules ...@@ -117,8 +125,10 @@ OtherModules
SizeY: 640 SizeY: 640
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
NeededLibraries
Library: odbc_library
Module Module
Name: StdInt Name: StdDebug
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -135,7 +145,7 @@ OtherModules ...@@ -135,7 +145,7 @@ OtherModules
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdOverloaded Name: StdCharList
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -148,17 +158,11 @@ OtherModules ...@@ -148,17 +158,11 @@ OtherModules
ReadableABC: False ReadableABC: False
ReuseUniqueNodes: True ReuseUniqueNodes: True
Fusion: False Fusion: False
Dcl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 640
DclOpen: False DclOpen: False
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdMisc Name: StdTuple
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -175,7 +179,7 @@ OtherModules ...@@ -175,7 +179,7 @@ OtherModules
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdClass Name: StdOrdList
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -198,7 +202,7 @@ OtherModules ...@@ -198,7 +202,7 @@ OtherModules
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdBool Name: _SystemEnum
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -215,8 +219,8 @@ OtherModules ...@@ -215,8 +219,8 @@ OtherModules
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdMaybe Name: StdEnum
Dir: {Application}\Libraries\StdLib Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
NeverTimeProfile: False NeverTimeProfile: False
...@@ -228,17 +232,11 @@ OtherModules ...@@ -228,17 +232,11 @@ OtherModules
ReadableABC: False ReadableABC: False
ReuseUniqueNodes: True ReuseUniqueNodes: True
Fusion: False Fusion: False
Dcl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 640
DclOpen: False DclOpen: False
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdFunc Name: StdList
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -251,17 +249,11 @@ OtherModules ...@@ -251,17 +249,11 @@ OtherModules
ReadableABC: False ReadableABC: False
ReuseUniqueNodes: True ReuseUniqueNodes: True
Fusion: False Fusion: False
Dcl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 640
DclOpen: False DclOpen: False
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdEnv Name: StdFile
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -278,7 +270,7 @@ OtherModules ...@@ -278,7 +270,7 @@ OtherModules
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdReal Name: StdString
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -291,11 +283,17 @@ OtherModules ...@@ -291,11 +283,17 @@ OtherModules
ReadableABC: False ReadableABC: False
ReuseUniqueNodes: True ReuseUniqueNodes: True
Fusion: False Fusion: False
Dcl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 640
DclOpen: False DclOpen: False
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdChar Name: _SystemArray
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -308,7 +306,19 @@ OtherModules ...@@ -308,7 +306,19 @@ OtherModules
ReadableABC: False ReadableABC: False
ReuseUniqueNodes: True ReuseUniqueNodes: True
Fusion: False Fusion: False
Dcl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 640
DclOpen: False DclOpen: False
Icl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 640
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
...@@ -335,7 +345,7 @@ OtherModules ...@@ -335,7 +345,7 @@ OtherModules
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: _SystemArray Name: StdChar
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -348,23 +358,11 @@ OtherModules ...@@ -348,23 +358,11 @@ OtherModules
ReadableABC: False ReadableABC: False
ReuseUniqueNodes: True ReuseUniqueNodes: True
Fusion: False Fusion: False
Dcl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 640
DclOpen: False DclOpen: False
Icl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 640
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdString Name: StdReal
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -377,17 +375,11 @@ OtherModules ...@@ -377,17 +375,11 @@ OtherModules
ReadableABC: False ReadableABC: False
ReuseUniqueNodes: True ReuseUniqueNodes: True
Fusion: False Fusion: False
Dcl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 640
DclOpen: False DclOpen: False
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdFile Name: StdEnv
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -404,7 +396,7 @@ OtherModules ...@@ -404,7 +396,7 @@ OtherModules
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdList Name: StdFunc
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -417,12 +409,18 @@ OtherModules ...@@ -417,12 +409,18 @@ OtherModules
ReadableABC: False ReadableABC: False
ReuseUniqueNodes: True ReuseUniqueNodes: True
Fusion: False Fusion: False
Dcl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 640
DclOpen: False DclOpen: False
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdEnum Name: StdMaybe
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdLib
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
NeverTimeProfile: False NeverTimeProfile: False
...@@ -434,11 +432,17 @@ OtherModules ...@@ -434,11 +432,17 @@ OtherModules
ReadableABC: False ReadableABC: False
ReuseUniqueNodes: True ReuseUniqueNodes: True
Fusion: False Fusion: False
Dcl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 640
DclOpen: False DclOpen: False
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: _SystemEnum Name: StdBool
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -455,7 +459,7 @@ OtherModules ...@@ -455,7 +459,7 @@ OtherModules
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdOrdList Name: StdClass
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -478,7 +482,7 @@ OtherModules ...@@ -478,7 +482,7 @@ OtherModules
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdTuple Name: StdMisc
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -495,7 +499,7 @@ OtherModules ...@@ -495,7 +499,7 @@ OtherModules
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdCharList Name: StdOverloaded
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -508,11 +512,17 @@ OtherModules ...@@ -508,11 +512,17 @@ OtherModules
ReadableABC: False ReadableABC: False
ReuseUniqueNodes: True ReuseUniqueNodes: True
Fusion: False Fusion: False
Dcl
WindowPosition
X: 10
Y: 10
SizeX: 800
SizeY: 640
DclOpen: False DclOpen: False
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: StdDebug Name: StdInt
Dir: {Application}\Libraries\StdEnv Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
...@@ -529,8 +539,8 @@ OtherModules ...@@ -529,8 +539,8 @@ OtherModules
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
Module Module
Name: odbc Name: StdGeneric
Dir: {Project} Dir: {Application}\Libraries\StdEnv
Compiler Compiler
NeverMemoryProfile: False NeverMemoryProfile: False
NeverTimeProfile: False NeverTimeProfile: False
...@@ -542,12 +552,6 @@ OtherModules ...@@ -542,12 +552,6 @@ OtherModules
ReadableABC: False ReadableABC: False
ReuseUniqueNodes: True ReuseUniqueNodes: True
Fusion: False Fusion: False
Dcl
WindowPosition
X: 211
Y: 44
SizeX: 800
SizeY: 646
DclOpen: False DclOpen: False
Icl Icl
WindowPosition WindowPosition
...@@ -557,10 +561,8 @@ OtherModules ...@@ -557,10 +561,8 @@ OtherModules
SizeY: 640 SizeY: 640
IclOpen: False IclOpen: False
LastModified: No 0 0 0 0 0 0 LastModified: No 0 0 0 0 0 0
NeededLibraries
Library: odbc_library
Module Module
Name: odbccp