layout is working, now up to the communication

[mTask.git] / mTaskInterpret.icl

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index 1833e62..c63c95d 100644 (file)
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -23,19 +23,22 @@ import qualified Data.Map as DM
 import Text.Encodings.Base64
 
 encode :: MTaskMSGSend -> String
-encode (MTSds i v) = "s" +++ to16bit i +++ v +++ "\n"
 encode (MTTask to data) = "t" +++ to16bit to +++ to16bit (size data) +++ data +++ "\n"
+encode (MTSds i v) = "s" +++ to16bit i +++ v +++ "\n"
 encode (MTUpd i v) = "u" +++ to16bit i +++ v +++ "\n"
 
 decode :: String -> MTaskMSGRecv
 decode x
 | size x == 0 = MTEmpty
 = case x.[0] of
+       't' = MTTaskAck (from16bit (x % (1,3)))
+       'd' = MTTaskDelAck (from16bit (x % (1,3)))
+       'm' = MTMessage x
+       's' = MTSDSAck (from16bit (x % (1,3)))
+       'a' = MTSDSDelAck (from16bit (x % (1,3)))
+       'p' = MTPub (from16bit (x % (1,3))) (x % (3,5))
        '\0' = MTEmpty
        '\n' = MTEmpty
-       'm' = MTMessage x
-       't' = MTTaskAdded (from16bit (x % (1,3)))
-       'u' = MTPub (from16bit (x % (1,3))) (x % (3,5))
        _ = MTMessage x//abort ("Didn't understand message: " +++ join " " [toString (toInt c)\\c<-: x] +++ "\n")
 
 safePrint :== toString o toJSON
@@ -49,9 +52,13 @@ instance toString MTaskMSGSend where
                +++ " value " +++ safePrint v
 
 instance toString MTaskMSGRecv where
+       toString (MTTaskAck i) = "Task added with id: " +++ toString i
+       toString (MTTaskDelAck i) = "Task deleted with id: " +++ toString i
+       toString (MTSDSAck i) = "SDS added with id: " +++ toString i
+       toString (MTSDSDelAck i) = "SDS deleted with id: " +++ toString i
        toString (MTPub i v) = "Publish id: " +++ toString i
                +++ " value " +++ safePrint v
-       toString (MTTaskAdded i) = "Task added with id: " +++ toString i
+       toString (MTMessage m) = m
        toString MTEmpty = "Empty message"
 
 bclength :: BC -> Int