repositories
/
mTask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
started externalizing devices
[mTask.git]
/
mTaskInterpret.icl
diff --git
a/mTaskInterpret.icl
b/mTaskInterpret.icl
index
cbf06c0
..
4876e93
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
@@
-23,19
+25,23
@@
import qualified Data.Map as DM
import Text.Encodings.Base64
encode :: MTaskMSGSend -> String
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 (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
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
'\0' = MTEmpty
'\n' = MTEmpty
- 'm' = MTMessage x
- '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
@@
-48,20
+54,27
@@
instance toString MTaskMSGSend where
+++ " value " +++ safePrint v
instance toString MTaskMSGRecv 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 (MTPub i v) = "Publish id: " +++ toString i
+++ " value " +++ safePrint v
+ toString (MTMessage m) = m
toString MTEmpty = "Empty message"
bclength :: BC -> Int
bclength (BCPush _) = 3
bclength (BCLab _) = 2
toString MTEmpty = "Empty message"
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 (BCDigitalWrite _) = 2
bclength (BCAnalogRead _) = 2
bclength (BCAnalogWrite _) = 2
bclength (BCDigitalRead _) = 2
bclength (BCDigitalWrite _) = 2
+bclength (BCLedOn _) = 2
+bclength (BCLedOff _) = 2
bclength (BCJmp i) = 2
bclength (BCJmpT i) = 2
bclength (BCJmpF i) = 2
bclength (BCJmp i) = 2
bclength (BCJmpT i) = 2
bclength (BCJmpF i) = 2
@@
-69,17
+82,19
@@
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]
(BCDigitalWrite i) = [toChar i]
(BCAnalogRead i) = [toChar i]
(BCAnalogWrite i) = [toChar i]
(BCDigitalRead i) = [toChar i]
(BCDigitalWrite i) = [toChar i]
+ (BCLedOn i) = i
+ (BCLedOff i) = i
(BCJmp i) = [toChar i]
(BCJmpT i) = [toChar i]
(BCJmpF i) = [toChar i]
(BCJmp i) = [toChar i]
(BCJmpT i) = [toChar i]
(BCJmpF i) = [toChar i]
@@
-105,20
+120,21
@@
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 String where toByteCode s = undef
instance toByteCode Button where toByteCode s = [toChar $ consIndex{|*|} s]
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 String where toByteCode s = undef
instance toByteCode Button where toByteCode s = [toChar $ consIndex{|*|} s]
+instance toByteCode UserLED where toByteCode s = [toChar $ consIndex{|*|} s]
instance toChar Pin where
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 gPrint BC, AnalogPin, Pin, DigitalPin
-derive consIndex BC, Pin, Button
+derive consIndex BC, Pin, Button
, UserLED
derive consName BC, Pin, Button
instance arith ByteCode where
derive consName BC, Pin, Button
instance arith ByteCode where
@@
-159,7
+175,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
@@
-205,13
+221,17
@@
instance serial ByteCode where
serialRead = retrn [BCSerialRead]
serialParseInt = retrn [BCSerialParseInt]
serialRead = retrn [BCSerialRead]
serialParseInt = retrn [BCSerialParseInt]
+instance userLed ByteCode where
+ ledOn l = retrn [BCLedOn $ toByteCode l]
+ ledOff l = retrn [BCLedOff $ toByteCode l]
+
instance zero BCState where
zero = {freshl=[1..], freshs=[1..], sdss=[]}
instance zero BCState where
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)
@@
-239,27
+259,18
@@
toReadableByteCode x
# (bc, gtmap) = computeGotos bc 0
= (join "\n" $ map readable (map (implGotos gtmap) bc), st)
# (bc, gtmap) = computeGotos bc 0
= (join "\n" $ map readable (map (implGotos gtmap) bc), st)
-//Start :: String
-//Start = toReadableByteCode bc
-// where
-// bc :: ByteCode Int Expr
-// bc = (lit 36 +. lit 42) +. lit 44
toMessages :: Int (String, BCState) -> ([MTaskMSGSend], BCState)
toMessages interval (bytes, st=:{sdss}) = ([MTSds i (toString b)\\(i,b)<-sdss] ++ [MTTask interval bytes], st)
toSDSUpdate :: Int Int -> [MTaskMSGSend]
toSDSUpdate i v = [MTUpd i (to16bit v)]
toMessages :: Int (String, BCState) -> ([MTaskMSGSend], BCState)
toMessages interval (bytes, st=:{sdss}) = ([MTSds i (toString b)\\(i,b)<-sdss] ++ [MTTask interval bytes], st)
toSDSUpdate :: Int Int -> [MTaskMSGSend]
toSDSUpdate i v = [MTUpd i (to16bit v)]
-Start = toMessages 500 $ toRealByteCode (unMain bc)
-//Start = fst $ toReadableByteCode $ unMain bc
+Start = toMessages 500 $ toRealByteCode (unMain bc) zero
where
bc = sds \x=5 In
sds \y=4 In
{main = If (y ==. lit 0) (pub x) (x =. x *. y :. y =. y -. lit 1)}
where
bc = sds \x=5 In
sds \y=4 In
{main = If (y ==. lit 0) (pub x) (x =. x *. y :. y =. y -. lit 1)}
-//pub :: (ByteCode a b) -> ByteCode a b
-//pub x = fmp makePub x
-
to16bit :: Int -> String
to16bit i = toString (toChar (i/256)) +++ toString (toChar (i rem 256))
to16bit :: Int -> String
to16bit i = toString (toChar (i/256)) +++ toString (toChar (i rem 256))