X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.icl;h=5e17aeb6f27157579e1a2fc42a89cb9092abee4c;hb=a408afc0974b9a122d34f42afe177b08668c075c;hp=3b877891101fe79111aa1c0a48e47c4c5f080edb;hpb=fcb4abeb34dc3302f15b10c3b916bc14e3047707;p=mTask.git diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl index 3b87789..5e17aeb 100644 --- a/mTaskInterpret.icl +++ b/mTaskInterpret.icl @@ -41,7 +41,7 @@ import Text.Encodings.Base64 import Tasks.Examples encode :: MTaskMSGSend -> String -encode (MTTask to ret data) = "t" +++ toByteCode to +++ toString ret +++ to16bit (size data) +++ data +++ "\n" +encode (MTTask to data) = "t" +++ toByteCode to +++ to16bit (size data) +++ data +++ "\n" encode (MTTaskDel i) = "d" +++ to16bit i +++ "\n" encode (MTSds i v) = "s" +++ to16bit i +++ toByteCode v +++ "\n" encode (MTUpd i v) = "u" +++ to16bit i +++ toByteCode v +++ "\n" @@ -74,8 +74,7 @@ instance toString MTaskInterval where instance toString MTaskMSGSend where toString (MTSds i v) = "Sds id: " +++ toString i +++ " value " +++ safePrint v - toString (MTTask to ret data) = "Task timeout: " +++ toString to - +++ " return type: " +++ toString ret + toString (MTTask to data) = "Task timeout: " +++ toString to +++ " data " +++ safePrint data toString (MTTaskDel i) = "Task delete request: " +++ toString i toString (MTUpd i v) = "Update id: " +++ toString i @@ -343,7 +342,7 @@ toMessages interval x s | not (trace_tn $ printToString newstate.sdss) = undef | not (trace_tn $ printToString newsdss) = undef = ([MTSds sdsi e\\{sdsi,sdsval=e}<-newsdss] ++ - [MTTask interval 'i' bc], newstate) + [MTTask interval bc], newstate) instance == BCShare where (==) a b = a.sdsi == b.sdsi