X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=f8fa8bae4785cae9628977b3617d402a509b0229;hb=4dff4046c87727f8b09558969f7c655b9e4de3c1;hp=1fc0b2f53405afe30ebd8ea7e56b3c7254452fce;hpb=790a710d277a608f47bf92f7edb6ef18935a7954;p=mTask.git

diff --git a/miTask.icl b/miTask.icl
index 1fc0b2f..f8fa8ba 100644
--- a/miTask.icl
+++ b/miTask.icl
@@ -7,18 +7,25 @@ from Text import class Text(concat,join,split), instance Text String
 import iTasks
 import mTask
 
+derive class iTask MTaskMessage
+
 Start :: *World -> *World
 Start world = startEngine (withShared ([], False, [], False) mTaskTask) world
 //Start world = startEngine mTaskTask world
 
-mTaskTask :: (Shared ([String],Bool,[String],Bool)) -> Task ()
+mTaskTask :: (Shared ([MTaskMessage],Bool,[MTaskMessage],Bool)) -> Task ()
 mTaskTask ch =
-	syncNetworkChannel "localhost" 8124 "\n" id id ch ||- 
-	viewSharedInformation "channels" [ViewWith lens] ch ||-
-	sendString (makemTask 500 bc) ch @! ()
+	syncNetworkChannel "localhost" 8124 "\n" decode encode ch ||-
+	(
+		sendMsg (hd msgs) ch >>= \_->
+		sendMsg (hd (tl msgs)) ch >>= \_->
+		viewSharedInformation "channels" [ViewWith lens] ch @! ()
+	)
 	where
-		lens :: ([String],Bool,[String],Bool) -> String
-		lens (r,_,s,_) = "channels"
+		lens :: ([MTaskMessage],Bool,[MTaskMessage],Bool) -> ([String], [String])
+		lens (r,_,s,_) = (map toString r, map toString s)
+
+		msgs = toMessages 500 (toRealByteCode (unMain bc))
 
 		bc :: Main (ByteCode Int Expr)
 		bc = sds \x=0 In {main = x =. x +. lit 1}
@@ -29,8 +36,10 @@ makemTask to bc
 = "t" +++ toString (toChar (to / 265))
 	+++ toString (toChar (to rem 265)) +++ toString bc +++ "\n"
 
-sendString :: String (Shared ([String],Bool,[String],Bool)) -> Task ()
-sendString m ch = upd (\(r,rs,s,ss)->(r,rs,s ++ [m],ss)) ch @! ()
+sendMsg :: MTaskMessage (Shared ([MTaskMessage],Bool,[MTaskMessage],Bool)) -> Task ()
+sendMsg m ch
+| not (trace_tn ("\'" +++ toString m +++ "\'")) = undef
+= upd (\(r,rs,s,ss)->(r,rs,s ++ [m],ss)) ch @! ()
 
 syncNetworkChannel :: String Int String (String -> m) (m -> String) (Shared ([m],Bool,[m],Bool)) -> Task () | iTask m
 syncNetworkChannel server port msgSeparator decodeFun encodeFun channel