further work on return values

[mTask.git] / mTaskInterpret.icl

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index 5e17aeb..3b87789 100644 (file)
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -41,7 +41,7 @@ import Text.Encodings.Base64
 import Tasks.Examples
 
 encode :: MTaskMSGSend -> String
-encode (MTTask to data) = "t" +++ toByteCode to +++ to16bit (size data) +++ data +++ "\n"
+encode (MTTask to ret data) = "t" +++ toByteCode to +++ toString ret +++ 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,7 +74,8 @@ instance toString MTaskInterval where
 instance toString MTaskMSGSend where
        toString (MTSds i v) = "Sds id: " +++ toString i
                +++ " value " +++ safePrint v
-       toString (MTTask to data) = "Task timeout: " +++ toString to
+       toString (MTTask to ret data) = "Task timeout: " +++ toString to
+               +++ " return type: " +++ toString ret
                +++ " data " +++ safePrint data
        toString (MTTaskDel i) = "Task delete request: " +++ toString i
        toString (MTUpd i v) = "Update id: " +++ toString i
@@ -342,7 +343,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 bc], newstate)
+       [MTTask interval 'i' bc], newstate)
 
 instance == BCShare where (==) a b = a.sdsi == b.sdsi