X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=ab37901f54abd219f453353f0c113c478792af37;hb=7edf1780ae3b91d9136db2d94b25e88d64896645;hp=a00d6f0a6f5b06ca27ccd366304b299b3134695a;hpb=a0182655c28502ffcadbe36de99d9a4e503e310e;p=mTask.git

diff --git a/miTask.icl b/miTask.icl
index a00d6f0..ab37901 100644
--- a/miTask.icl
+++ b/miTask.icl
@@ -3,29 +3,44 @@ module miTask
 import StdDebug, StdMisc
 
 from Text import class Text(concat,join,split), instance Text String
+from Control.Monad import mapM
 
 import iTasks
 import mTask
 
-Start :: *World -> *World
-Start world = startEngine mTaskTask world
+derive class iTask MTaskMessage
 
-mTaskTask :: Task ()
-mTaskTask = withShared ([],False,[],False) (\ch->
-		syncNetworkChannel "localhost" 8123 "\n" id id ch ||- 
-		sendByteCode ||-
-		updateSharedInformation "channels" [] ch @! ())
+Start :: *World -> *World
+Start world = startEngine (
+	withShared ([], False, [], False) (\ch->
+		enterInformation "Port Number?" [] >>= \port->mTaskTask port ch
+	)) world
+//Start world = startEngine mTaskTask world
 
-sendByteCode :: Task ()
-sendByteCode = viewInformation "send" [] "4" @! ()
-//	(toReadableByteCode (unMain bc)) @! ()
+mTaskTask :: Int (Shared ([MTaskMessage],Bool,[MTaskMessage],Bool)) -> Task ()
+mTaskTask port ch =
+	syncNetworkChannel "localhost" port "\n" decode encode ch ||-
+	(
+		sendMsg msgs ch >>= \_->
+		viewSharedInformation "channels" [ViewWith lens] ch @! ()
+	) >>* [OnAction ActionFinish (always shutDown)]
 	where
-		bc :: Main (ByteCode Int Expr)
-		bc = sds \x=41 In 
-			sds \y=1 In 
-			{main = x =. x +. y}
+		lens :: ([MTaskMessage],Bool,[MTaskMessage],Bool) -> ([String], [String])
+		lens (r,_,s,_) = (f r, f s)
+			where
+				f [] = []
+				f [MTEmpty:xs] = f xs
+				f [x:xs] = [toString x:f xs]
+
+		msgs = toMessages 500 (toRealByteCode (unMain bc))
+
+		bc :: Main (ByteCode Int Stmt)
+		bc = sds \x=0 In {main = x =. x +. lit 1 :. pub x}
 
-syncNetworkChannel :: String Int String (String -> m) (m -> String) (Shared ([m],Bool,[m],Bool)) -> Task () | iTask m
+sendMsg :: [MTaskMessage] (Shared ([MTaskMessage],Bool,[MTaskMessage],Bool)) -> Task ()
+sendMsg m ch = upd (\(r,rs,s,ss)->(r,rs,s ++ m,ss)) ch @! ()
+
+syncNetworkChannel :: String Int String (String -> m) (n -> String) (Shared ([m],Bool,[n],Bool)) -> Task () | iTask m & iTask n
 syncNetworkChannel server port msgSeparator decodeFun encodeFun channel
 	= tcpconnect server port channel {ConnectionHandlers|onConnect=onConnect,whileConnected=whileConnected,onDisconnect=onDisconnect} @! ()
 	where
@@ -43,17 +58,17 @@ syncNetworkChannel server port msgSeparator decodeFun encodeFun channel
 		onDisconnect l (received,receiveStopped,send,sendStopped)
 			= (Ok l,Just (received,True,send,sendStopped))
 
-consumeNetworkStream :: ([m] -> Task ()) (Shared ([m],Bool,[m],Bool)) -> Task () | iTask m
-consumeNetworkStream processTask channel
-	= ((watch channel >>* [OnValue (ifValue ifProcess process)]) <! id) @! ()
-	where
-		ifProcess (received,receiveStopped,_,_)
-			= receiveStopped || (not (isEmpty received))
-
-		process (received,receiveStopped,_,_)
-			=   upd empty channel
-			>>| if (isEmpty received) (return ()) (processTask received)
-			@!  receiveStopped
-		
-		empty :: ([m],Bool,[m],Bool) -> ([m],Bool,[m],Bool)
-		empty (_,rs,s,ss) = ([],rs,s,ss)
+//consumeNetworkStream :: ([m] -> Task ()) (Shared ([m],Bool,[n],Bool)) -> Task () | iTask m & iTask n
+//consumeNetworkStream processTask channel
+//	= ((watch channel >>* [OnValue (ifValue ifProcess process)]) <! id) @! ()
+//	where
+//		ifProcess (received,receiveStopped,_,_)
+//			= receiveStopped || (not (isEmpty received))
+//
+//		process (received,receiveStopped,_,_)
+//			=   upd empty channel
+//			>>| if (isEmpty received) (return ()) (processTask received)
+//			@!  receiveStopped
+//		
+//		empty :: ([m],Bool,[m],Bool) -> ([m],Bool,[m],Bool)
+//		empty (_,rs,s,ss) = ([],rs,s,ss)