.

[clean-tests.git] / test.icl

diff --git a/test.icl b/test.icl
index 2076421..0093bb4 100644 (file)
--- a/test.icl
+++ b/test.icl
@@ -1,45 +1,18 @@
 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 Data.Func
 import iTasks
-import Data.Func
-import Data.Tuple
-import StdEnv
-
-Start w = doTasksWithOptions (\a o->Ok $ flip tuple {o & autoLayout=True} $
-       (parallel
-               [(Embedded, tab "tab1")
-               ,(Embedded, tab "tab2")
-               ]
-               [ OnAction (Action "New") (always (Embedded, tab "New tab"))
-               , OnAction (Action " ") (always (Embedded, tab "New tab"))
-               , OnAction (Action "Close") (never (Embedded, \_->treturn ()))
-               , OnAction (Action "Dis no icon") (never (Embedded, \_->treturn ()))
-               , OnAction (Action "+") (always (Embedded, tab "New tab"))
-               ]
-       <<@ ArrangeWithTabs True
-       <<@ ApplyLayout (setActionIcon ('DM'.put " " "new" 'DM'.newMap))
-       )) w
 
-tab title _ = tune (Title title)
-       $   viewInformation [] ()
-       >>* [OnAction (Action "Close") (always (treturn ()))]
->>>>>>> 49f7dcc4c088dc816398a0c7854d75d7c2628f15
+Start w = doTasks (onStartup par) w
+where
+       par :: Task [(Int, TaskValue ())]
+       par = parallel [] []
+//Start w = doTasks (onStartup $ m >>- traceValue) w
+//
+//m = parallel
+//     [(Embedded, \stl->return 42)]
+//     []
+//     [OnValue $ \tv->case tv of
+//             NoValue = ?None
+//             _ = ?None
+//     ]