repositories
/
mTask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make lib compilable
[mTask.git]
/
mTaskInterpret.icl
diff --git
a/mTaskInterpret.icl
b/mTaskInterpret.icl
index
c63c95d
..
2c44484
100644
(file)
--- a/
mTaskInterpret.icl
+++ b/
mTaskInterpret.icl
@@
-1,7
+1,9
@@
implementation module mTaskInterpret
//import iTasks
implementation module mTaskInterpret
//import iTasks
-import gdynamic, gCons, GenEq, StdMisc, StdArray, GenBimap
+import Generics.gCons
+
+import GenEq, StdMisc, StdArray, GenBimap
import GenPrint
import StdEnum
import mTask
import GenPrint
import StdEnum
import mTask
@@
-24,6
+26,7
@@
import Text.Encodings.Base64
encode :: MTaskMSGSend -> String
encode (MTTask to data) = "t" +++ to16bit to +++ to16bit (size data) +++ data +++ "\n"
encode :: MTaskMSGSend -> String
encode (MTTask to data) = "t" +++ to16bit to +++ to16bit (size data) +++ data +++ "\n"
+encode (MTTaskDel i) = "d" +++ to16bit i +++ "\n"
encode (MTSds i v) = "s" +++ to16bit i +++ v +++ "\n"
encode (MTUpd i v) = "u" +++ to16bit i +++ v +++ "\n"
encode (MTSds i v) = "s" +++ to16bit i +++ v +++ "\n"
encode (MTUpd i v) = "u" +++ to16bit i +++ v +++ "\n"
@@
-48,6
+51,7
@@
instance toString MTaskMSGSend where
+++ " value " +++ safePrint v
toString (MTTask to data) = "Task timeout: " +++ toString to
+++ " data " +++ safePrint data
+++ " value " +++ safePrint v
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
+++ " value " +++ safePrint v
toString (MTUpd i v) = "Update id: " +++ toString i
+++ " value " +++ safePrint v
@@
-227,9
+231,9
@@
instance zero BCState where
zero = {freshl=[1..], freshs=[1..], sdss=[]}
zero = {freshl=[1..], freshs=[1..], sdss=[]}
-toRealByteCode :: (ByteCode a b) -> (String, BCState)
-toRealByteCode x
-# (bc, st) = runBC x
zero
+toRealByteCode :: (ByteCode a b)
BCState
-> (String, BCState)
+toRealByteCode x
s
+# (bc, st) = runBC x
s
# (bc, gtmap) = computeGotos bc 1
= (concat $ map (toString o toByteVal) (map (implGotos gtmap) bc), st)
# (bc, gtmap) = computeGotos bc 1
= (concat $ map (toString o toByteVal) (map (implGotos gtmap) bc), st)
@@
-263,7
+267,7
@@
toMessages interval (bytes, st=:{sdss}) = ([MTSds i (toString b)\\(i,b)<-sdss] +
toSDSUpdate :: Int Int -> [MTaskMSGSend]
toSDSUpdate i v = [MTUpd i (to16bit v)]
toSDSUpdate :: Int Int -> [MTaskMSGSend]
toSDSUpdate i v = [MTUpd i (to16bit v)]
-Start = toMessages 500 $ toRealByteCode (unMain bc)
+Start = toMessages 500 $ toRealByteCode (unMain bc)
zero
where
bc = sds \x=5 In
sds \y=4 In
where
bc = sds \x=5 In
sds \y=4 In