repositories
/
mTask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed communication
[mTask.git]
/
mTaskInterpret.icl
diff --git
a/mTaskInterpret.icl
b/mTaskInterpret.icl
index
9685913
..
0f68ed2
100644
(file)
--- a/
mTaskInterpret.icl
+++ b/
mTaskInterpret.icl
@@
-27,14
+27,15
@@
encode (MTSds i v) = "s" +++ to16bit i +++ v +++ "\n"
encode (MTTask to data) = "t" +++ to16bit to +++ to16bit (size data) +++ data +++ "\n"
encode (MTUpd i v) = "u" +++ to16bit i +++ v +++ "\n"
encode (MTTask to data) = "t" +++ to16bit to +++ to16bit (size data) +++ data +++ "\n"
encode (MTUpd i v) = "u" +++ to16bit i +++ v +++ "\n"
-
decode :: String -> MTaskMSGRecv
decode x
| size x == 0 = MTEmpty
= case x.[0] of
'\0' = MTEmpty
decode :: String -> MTaskMSGRecv
decode x
| size x == 0 = MTEmpty
= case x.[0] of
'\0' = MTEmpty
+ '\n' = MTEmpty
+ 'm' = MTMessage x
'u' = MTPub (from16bit (x % (1,3))) (x % (3,5))
'u' = MTPub (from16bit (x % (1,3))) (x % (3,5))
- _ = abort ("Didn't understand message: " +++ join " " [toString (toInt c)\\c<-: x] +++ "\n")
+ _ =
MTMessage x//
abort ("Didn't understand message: " +++ join " " [toString (toInt c)\\c<-: x] +++ "\n")
safePrint :== toString o toJSON
safePrint :== toString o toJSON
@@
-54,9
+55,9
@@
instance toString MTaskMSGRecv where
bclength :: BC -> Int
bclength (BCPush _) = 3
bclength (BCLab _) = 2
bclength :: BC -> Int
bclength (BCPush _) = 3
bclength (BCLab _) = 2
-bclength (BCSdsStore _) =
2
-bclength (BCSdsFetch _) =
2
-bclength (BCSdsPublish _) =
2
+bclength (BCSdsStore _) =
3
+bclength (BCSdsFetch _) =
3
+bclength (BCSdsPublish _) =
3
bclength (BCAnalogRead _) = 2
bclength (BCAnalogWrite _) = 2
bclength (BCDigitalRead _) = 2
bclength (BCAnalogRead _) = 2
bclength (BCAnalogWrite _) = 2
bclength (BCDigitalRead _) = 2
@@
-68,13
+69,13
@@
bclength _ = 1
toByteVal :: BC -> [Char]
toByteVal b
toByteVal :: BC -> [Char]
toByteVal b
-# bt = toChar $ consIndex{|*|} b
+ 1
+# bt = toChar $ consIndex{|*|} b
= [bt:case b of
(BCPush i) = i
(BCLab i) = [toChar i]
= [bt:case b of
(BCPush i) = i
(BCLab i) = [toChar i]
- (BCSdsStore i) = [
toChar
i]
- (BCSdsFetch i) = [
toChar
i]
- (BCSdsPublish i) = [
toChar
i]
+ (BCSdsStore i) = [
c\\c<-:to16bit
i]
+ (BCSdsFetch i) = [
c\\c<-:to16bit
i]
+ (BCSdsPublish i) = [
c\\c<-:to16bit
i]
(BCAnalogRead i) = [toChar i]
(BCAnalogWrite i) = [toChar i]
(BCDigitalRead i) = [toChar i]
(BCAnalogRead i) = [toChar i]
(BCAnalogWrite i) = [toChar i]
(BCDigitalRead i) = [toChar i]
@@
-104,8
+105,8
@@
fmp :: ([BC] -> [BC]) (ByteCode a p) -> ByteCode a q
fmp f b = BC \s->let (bc, s`) = runBC b s in (f bc, s`)
instance toByteCode Bool where
fmp f b = BC \s->let (bc, s`) = runBC b s in (f bc, s`)
instance toByteCode Bool where
- toByteCode True = [toChar 1]
- toByteCode False = [toChar 0]
+ toByteCode True = [toChar
0, toChar
1]
+ toByteCode False = [toChar 0
, toChar 0
]
instance toByteCode Int where toByteCode n = map toChar [n/256,n rem 256]
instance toByteCode Long where toByteCode (L n) = toByteCode n
instance toByteCode Char where toByteCode c = [c]
instance toByteCode Int where toByteCode n = map toChar [n/256,n rem 256]
instance toByteCode Long where toByteCode (L n) = toByteCode n
instance toByteCode Char where toByteCode c = [c]
@@
-113,8
+114,8
@@
instance toByteCode String where toByteCode s = undef
instance toByteCode Button where toByteCode s = [toChar $ consIndex{|*|} s]
instance toChar Pin where
instance toByteCode Button where toByteCode s = [toChar $ consIndex{|*|} s]
instance toChar Pin where
- toChar (Digital p) = toChar $ consIndex{|*|} p
+ 1
- toChar (Analog p) = toChar $ consIndex{|*|} p
+ 1
+ toChar (Digital p) = toChar $ consIndex{|*|} p
+ toChar (Analog p) = toChar $ consIndex{|*|} p
derive gPrint BC, AnalogPin, Pin, DigitalPin
derive consIndex BC, Pin, Button
derive gPrint BC, AnalogPin, Pin, DigitalPin
derive consIndex BC, Pin, Button
@@
-158,7
+159,7
@@
BCIfStmt b t e =
b <++> retrn [BCJmpF else] <++> t
<++> retrn [BCJmp endif,BCLab else] <++> e <++> retrn [BCLab endif]
b <++> retrn [BCJmpF else] <++> t
<++> retrn [BCJmp endif,BCLab else] <++> e <++> retrn [BCLab endif]
-instance noOp ByteCode where noOp =
mempty
+instance noOp ByteCode where noOp =
retrn [BCNop]
withLabel :: (Int -> (ByteCode b q)) -> ByteCode b q
withLabel f = BC \s->let [fresh:fs] = s.freshl
withLabel :: (Int -> (ByteCode b q)) -> ByteCode b q
withLabel f = BC \s->let [fresh:fs] = s.freshl