Merge branch 'master' of git.martlubbers.net:clean-tests

[clean-tests.git] / test.icl

diff --git a/test.icl b/test.icl
index 609d79e..2076421 100644 (file)
--- a/test.icl
+++ b/test.icl
@@ -1,4 +1,23 @@
 module test
+<<<<<<< HEAD
+
+import StdEnv
+from Data.Func import $
+import System.Directory
+import System.Time
+
+:: S s a = S .(s -> *(a, s))
+runS (S s) = s
+
+(>>=) infixl 1 :: u:(S .a .b) v:(.b -> .(S .a .c)) -> w:(S .a .c), [w <= u,w <= v]
+(>>=) ma a2mb = S \s
+       # (a, s) = runS ma s
+       = runS (a2mb a) s
+
+Start world = flip runS world
+       $   (S time)
+       >>= \_->S (readDirectory "/home/mrl")
+=======
 import qualified Data.Map as DM
 import iTasks
 import Data.Func
@@ -23,3 +42,4 @@ Start w = doTasksWithOptions (\a o->Ok $ flip tuple {o & autoLayout=True} $
 tab title _ = tune (Title title)
        $   viewInformation [] ()
        >>* [OnAction (Action "Close") (always (treturn ()))]
+>>>>>>> 49f7dcc4c088dc816398a0c7854d75d7c2628f15