import Generics.gCons
+import iTasks.UI.Editor.Common
+import iTasks.UI.Editor
+
import GenEq, StdMisc, StdArray, GenBimap
import GenPrint
import StdEnum
import Data.Functor
import StdList
from Data.Func import $
-from Text import class Text(concat,toUpperCase), instance Text String
+from Text import class Text(subString,lpad,concat,toUpperCase), instance Text String
import qualified Text
import Text.JSON
import qualified Data.List as DL
import Text.Encodings.Base64
+import Tasks.Examples
+
+instance == BCValue where (==) a b = toByteCode a == toByteCode b
+
encode :: MTaskMSGSend -> String
-encode (MTTask to data) = "t" +++ tob +++ to16bit (size data) +++ data +++ "\n"
- where
- tob = case to of
- OneShot = to16bit 0
- OnInterval i = to16bit i
- OnInterrupt _ = abort "Interrupts not implemented yet"
+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 +++ v +++ "\n"
-encode (MTUpd i v) = "u" +++ to16bit i +++ v +++ "\n"
+encode (MTSds i v) = "s" +++ to16bit i +++ toByteCode v +++ "\n"
+encode (MTUpd i v) = "u" +++ to16bit i +++ toByteCode v +++ "\n"
+encode (MTSpec) = "c\n"
+encode (MTShutdown) = "h\n"
+import StdDebug
decode :: String -> MTaskMSGRecv
decode x
+| not (trace_tn ("decoding: " +++ toString (toJSON x))) = undef
| size x == 0 = MTEmpty
= case x.[0] of
- 't' = MTTaskAck (from16bit (x % (1,3)))
- 'd' = MTTaskDelAck (from16bit (x % (1,3)))
+ 't' = MTTaskAck (fromByteCode x) (fromByteCode (x % (2, size x)))
+ 'd' = MTTaskDelAck $ fromByteCode x
'm' = MTMessage x
- 's' = MTSDSAck (from16bit (x % (1,3)))
- 'a' = MTSDSDelAck (from16bit (x % (1,3)))
- 'p' = MTPub (from16bit (x % (1,3))) (x % (3,5))
+ 's' = MTSDSAck $ fromByteCode x
+ 'a' = MTSDSDelAck $ fromByteCode x
+ 'p' = MTPub (fromByteCode x) $ fromByteCode $ x % (3,size x)
+ 'c' = MTDevSpec $ fromByteCode (x % (1, size x))
'\0' = MTEmpty
'\n' = MTEmpty
_ = MTMessage x//abort ("Didn't understand message: " +++ join " " [toString (toInt c)\\c<-: x] +++ "\n")
toString (MTTaskDel i) = "Task delete request: " +++ toString i
toString (MTUpd i v) = "Update id: " +++ toString i
+++ " value " +++ safePrint v
+ toString (MTSpec) = "Spec request"
+ toString (MTShutdown) = "Shutdown request"
instance toString MTaskMSGRecv where
- toString (MTTaskAck i) = "Task added with id: " +++ toString i
+ toString (MTTaskAck i mem) = "Task added with id: " +++ toString i
+ +++ " free memory: " +++ toString mem
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 (MTDevSpec mt) = "Specification: " +++ printToString mt
toString (MTMessage m) = m
toString MTEmpty = "Empty message"
toByteVal :: BC -> String
toByteVal b = {toChar $ consIndex{|*|} b} +++
case b of
- (BCPush i) = i
+ (BCPush (BCValue i)) = toByteCode i
(BCLab i) = {toChar i}
- (BCSdsStore i) = to16bit i
- (BCSdsFetch i) = to16bit i
- (BCSdsPublish i) = to16bit i
- (BCAnalogRead i) = {toChar i}
- (BCAnalogWrite i) = {toChar i}
- (BCDigitalRead i) = {toChar i}
- (BCDigitalWrite i) = {toChar i}
+ (BCSdsStore i) = to16bit i.sdsi
+ (BCSdsFetch i) = to16bit i.sdsi
+ (BCSdsPublish i) = to16bit i.sdsi
+ (BCAnalogRead i) = {toChar $ consIndex{|*|} i}
+ (BCAnalogWrite i) = {toChar $ consIndex{|*|} i}
+ (BCDigitalRead i) = {toChar $ consIndex{|*|} i}
+ (BCDigitalWrite i) = {toChar $ consIndex{|*|} i}
(BCJmp i) = {toChar i}
(BCJmpT i) = {toChar i}
(BCJmpF i) = {toChar i}
_ = ""
-//(>>) infixl 2 :: (ByteCode a p) (ByteCode b q) -> ByteCode b q
-//(>>) m n = BC \s->(let (_, s1) = runBC m s in
-// let (a, s2) = runBC n s1
-// in (a, {s2 & bytecode=(s2.BCState.bytecode ++ s1.BCState.bytecode)}))
-//
-//(<+->) infixr 1
-//(<+->) m n :== m >> tell n
-//
-//runBC (BC m) = m
-//
-//tell :: [BC] -> ByteCode a p | mTaskType a
-//tell b = BC \s->(zero, {s & bytecode=b++s.bytecode})
-//
-//fmp :: (a -> BC) (ByteCode a p) -> ByteCode a q
-//fmp f b = BC \s->let (a, s`) = runBC b s in (a, {s` & code=[f a:s`.code]})
-
-instance toByteCode Bool where toByteCode b = if b "\x01" "\x00"
-instance toByteCode Int where toByteCode n = {toChar $ n/256,toChar $ n rem 256}
-instance toByteCode Long where toByteCode (L n) = toByteCode n
-instance toByteCode Char where toByteCode s = toString s
+parseBCValue :: Char String -> BCValue
+parseBCValue c s = case c of
+ 'b' = BCValue $ castfbc True s
+ 'i' = BCValue $ castfbc 0 s
+ 'l' = BCValue $ castfbc (L 0) s
+ 'c' = BCValue $ castfbc ('0') s
+ 'B' = BCValue $ castfbc (NoButton) s
+ 'L' = BCValue $ castfbc (LED1) s
+
+castfbc :: a -> (String -> a) | mTaskType a
+castfbc _ = fromByteCode
+
+instance toByteCode Bool where toByteCode b = {'b',if b '\x01' '\0'}
+instance toByteCode Int where toByteCode n = {'i',toChar $ n/256,toChar $ n rem 256}
+instance toByteCode Long where toByteCode (L n) = {'l',toChar $ n/256,toChar $ n rem 256}
+instance toByteCode Char where toByteCode c = {'c',c}
instance toByteCode String where toByteCode s = abort $ "Undef on toBytecode String" +++ s
-instance toByteCode Button where toByteCode s = {toChar $ consIndex{|*|} s}
-instance toByteCode UserLED where toByteCode s = {toChar $ consIndex{|*|} s}
+instance toByteCode Button where toByteCode s = {'B',toChar $ consIndex{|*|} s}
+instance toByteCode UserLED where toByteCode s = {'L',toChar $ consIndex{|*|} s}
+instance toByteCode BCValue where toByteCode (BCValue v) = toByteCode v
+
+instance fromByteCode Bool where fromByteCode s = s.[1] == '\x01'
+instance fromByteCode Int where fromByteCode s = (toInt s.[1])*256 + toInt s.[2]
+instance fromByteCode Long where fromByteCode s = L $ fromByteCode s
+instance fromByteCode Char where fromByteCode s = s.[1]
+instance fromByteCode String where fromByteCode s = abort $ "Undef on fromBytecode String" +++ s
+instance fromByteCode Button where fromByteCode s = conses{|*|} !! toInt s.[1]
+instance fromByteCode UserLED where fromByteCode s = conses{|*|} !! toInt s.[1]
+instance fromByteCode BCValue where fromByteCode s = parseBCValue s.[0] s
+
instance toByteCode MTaskInterval where
- toByteCode OneShot = toByteCode 0
+ toByteCode OneShot = toByteCode (OnInterval 0)
//Intervals have the first bit 0 and the rest is a 15 bit unsigned int
toByteCode (OnInterval i) = {toChar $ i/256 bitand 127, toChar $ i rem 256}
//Intervals have the first bit 1 and the rest is a 15 bit unsigned int
toByteCode (OnInterrupt i) = {toChar $ i/256 bitor 127, toChar $ i rem 256}
-
-instance fromByteCode Bool where fromByteCode s = s == "\x01"
-instance fromByteCode Int where fromByteCode s = (toInt s.[0])*256 + toInt s.[1]
-instance fromByteCode Long where fromByteCode s = L $ fromByteCode s
-instance fromByteCode Char where fromByteCode s = toChar s.[0]
-instance fromByteCode String where fromByteCode s = abort $ "Undef on fromBytecode String" +++ s
-instance fromByteCode Button where fromByteCode s = conses{|*|} !! toInt s.[0]
-instance fromByteCode UserLED where fromByteCode s = conses{|*|} !! toInt s.[0]
instance fromByteCode MTaskInterval
where
fromByteCode s
0 = OneShot
i = OnInterval i
= OnInterrupt $ fromByteCode s bitand 127
+instance fromByteCode MTaskDeviceSpec where
+ fromByteCode s = let c = toInt s.[0] in
+ { MTaskDeviceSpec
+ | haveLed = (c bitand 1) > 0
+ , haveAio = (c bitand 2) > 0
+ , haveDio = (c bitand 4) > 0
+ , bytesMemory = from16bit $ s % (1,3)
+ , stackSize = from16bit $ s % (3,5)
+ , aPins = toInt s.[5]
+ , dPins = toInt s.[6]
+ }
+
+derive gPrint Long, UserLED, Button, AnalogPin, DigitalPin, PinMode, Pin, BC, MTaskDeviceSpec
+derive class gCons BC, BCShare
+
+consIndex{|BCValue|} _ = 0
+consName{|BCValue|} _ = "BCValue"
+conses{|BCValue|} = [BCValue 0]
+consNum{|BCValue|} _ = 1
+gPrint{|BCValue|} v ps = gPrint{|*|} (readable $ BCPush v) ps
+
+gEditor{|BCValue|} = {Editor|genUI=genUI`,onEdit=onEdit`,onRefresh=onRefresh`}
+ where
+ genUI` dp (BCValue a) vst = (castEditor a).Editor.genUI dp a vst
+ onEdit` dp jsn (BCValue a) em vst = appSnd3 BCValue $ (castEditor a).Editor.onEdit dp jsn a em vst
+ onRefresh` dp (BCValue a) (BCValue a`) em vst = appSnd3 BCValue $ (castEditor a).Editor.onRefresh dp a (fromByteCode $ toByteCode a`) em vst
-instance toChar Pin where
- toChar (Digital p) = toChar $ consIndex{|*|} p
- toChar (Analog p) = toChar $ consIndex{|*|} p
+ castEditor :: a -> (Editor a) | mTaskType a
+ castEditor _ = gEditor{|*|}
-derive gPrint BC
-derive class gCons BC
+gText{|BCValue|} fm Nothing = []
+gText{|BCValue|} fm (Just (BCValue e)) = gText{|*|} fm (Just e)
+JSONEncode{|BCValue|} b (BCValue e) = JSONEncode{|*|} b (toByteCode e)
+JSONDecode{|BCValue|} b n = appFst (fmap fromByteCode) $ JSS b n
+ where
+ JSS :: (Bool [JSONNode] -> (Maybe String, [JSONNode]))
+ JSS = JSONDecode{|*|}
+gDefault{|BCValue|} = BCValue 0
+gEq{|BCValue|} (BCValue e) (BCValue f) = toByteCode e == toByteCode f
+
+derive class gCons Long, UserLED, Button, AnalogPin, DigitalPin, PinMode, Pin
+derive class iTask UserLED, Long, Pin, Button, AnalogPin, DigitalPin, PinMode, MTaskDeviceSpec
-op2 :: (ByteCode a p1) (ByteCode a p2) BC -> ByteCode b Expr
+op2 :: (ByteCode a p1) (ByteCode a p2) BC -> ByteCode b p3
op2 (BC x) (BC y) bc = BC $ x >>| y >>| tell [bc]
-op :: (ByteCode a p) BC -> ByteCode a Expr
+op :: (ByteCode a p) BC -> ByteCode b c
op (BC x) bc = BC $ x >>| tell [bc]
+tell` :: [BC] -> (ByteCode a p)
tell` x = BC $ tell x
-instance zero Bool where zero = False
-
instance arith ByteCode where
- lit x = tell` [BCPush $ toByteCode x]
+ lit x = tell` [BCPush $ BCValue x]
(+.) x y = op2 x y BCAdd
(-.) x y = op2 x y BCSub
(*.) x y = op2 x y BCMul
digitalRead p = tell` [BCDigitalRead $ pin p]
digitalWrite p b = op b (BCDigitalWrite $ pin p)
+instance aIO ByteCode where
+ aIO p = tell` [BCAnalogRead $ pin p]
+
+instance dIO ByteCode where
+ dIO p = tell` [BCDigitalRead $ pin p]
+
instance If ByteCode Stmt Stmt Stmt where If b t e = BCIfStmt b t e
instance If ByteCode e Stmt Stmt where If b t e = BCIfStmt b t e
instance If ByteCode Stmt e Stmt where If b t e = BCIfStmt b t e
t >>| tell [BCJmp endif, BCLab else] >>|
e >>| tell [BCLab endif]
-freshl = get >>= \st=:{freshl=[fr:frs]}->put {st & freshl=frs} >>| pure fr
-freshs = get >>= \st=:{freshs=[fr:frs]}->put {st & freshs=frs} >>| pure fr
+freshl = get >>= \st=:{freshl}->put ({st & freshl=freshl+1}) >>| pure freshl
+freshs = get >>= \st=:{freshs}->put ({st & freshs=freshs+1}) >>| pure freshs
instance noOp ByteCode where noOp = tell` [BCNop]
+unBC :: (ByteCode a p) -> RWS () [BC] BCState ()
unBC (BC x) = x
instance sds ByteCode where
- sds f = {main = BC $ freshs
- >>= \sds->pure (f (tell` [BCSdsFetch sds]))
- >>= \(v In bdy)->modify (addSDS sds (toByteCode v)) >>| unBC (unMain bdy)}
- where
- addSDS i v s = {s & sdss=[{sdsi=i,sdspub=False,sdsval=v}:s.sdss]}
-
+ sds f = {main = BC $ freshs
+ >>= \sdsi->pure {BCShare | sdsname="", sdsi=sdsi, sdsval=BCValue 0}
+ >>= \sds ->pure (f $ tell` [BCSdsFetch sds])
+ >>= \(v In bdy)->modify (addSDS sds v)
+ >>| unBC (unMain bdy)}
+ where
+ addSDS sds v s = {s & sdss=[{sds & sdsval=BCValue v}:s.sdss]}
con f = undef
- pub (BC x) = BC $ censor (\[BCSdsFetch s]->[BCSdsPublish s])
- (listen x >>= \(_, [BCSdsFetch s])->modify (publish s)) >>| tell mempty
- where
- publish i st = {st & sdss=[if (i == s.sdsi) {s & sdspub=True} s \\s<-st.sdss]}
+
+instance namedsds ByteCode where
+ namedsds f = {main = BC $ freshs
+ >>= \sdsi->pure {BCShare | sdsname="", sdsi=sdsi, sdsval=BCValue 0}
+ >>= \sds ->pure (f $ tell` [BCSdsFetch sds])
+ >>= \(v Named n In bdy)->modify (addSDS sds n v)
+ >>| unBC (unMain bdy)}
+ where
+ addSDS sds n v s = {s & sdss=[{sds & sdsname=n, sdsval=BCValue v}:s.sdss]}
+
+instance sdspub ByteCode where
+ pub (BC x) = BC $ censor (\[BCSdsFetch s]->[BCSdsPublish s]) x
instance assign ByteCode where
(=.) (BC v) (BC e) = BC $ e >>| censor makeStore v
where
//This is going to include pins as well, as variables
makeStore [BCSdsFetch i] = [BCSdsStore i]
+ makeStore [BCDigitalRead i] = [BCDigitalWrite i]
+ makeStore [BCAnalogRead i] = [BCAnalogWrite i]
instance seq ByteCode where
(>>=.) _ _ = abort "undef on >>=."
serialParseInt = tell` [BCSerialParseInt]
instance userLed ByteCode where
- ledOn (BC l) = BC $ l >>| tell [BCLedOn]
- ledOff (BC l) = BC $ l >>| tell [BCLedOff]
+ ledOn l = op l BCLedOn
+ ledOff l = op l BCLedOff
-func :: (a -> BC) [BC] -> [BC] | mTaskType a
-func f b = abort ('Text'.join "\n" (map printToString b))
+instance retrn ByteCode where
+ retrn = tell` [BCReturn]
instance zero BCState where
- zero = {freshl=[1..], freshs=[1..], sdss=[]}
+ zero = {freshl=1, freshs=1, sdss=[]}
toRealByteCode :: (ByteCode a b) BCState -> (String, BCState)
toRealByteCode x s
implGotos map (BCJmpF t) = BCJmpF $ fromJust ('DM'.get t map)
implGotos _ i = i
+bclength :: BC -> Int
+bclength (BCPush s) = 1 + size (toByteCode s)
+bclength (BCSdsStore _) = 3
+bclength (BCSdsFetch _) = 3
+bclength (BCSdsPublish _) = 3
+bclength x = 1 + consNum{|*|} x
+
computeGotos :: [BC] Int -> ([BC], 'DM'.Map Int Int)
computeGotos [] _ = ([], 'DM'.newMap)
computeGotos [BCLab l:xs] i = appSnd ('DM'.put l i) (computeGotos xs i)
-computeGotos [x:xs] i = appFst (\bc->[x:bc])
- (computeGotos xs $ i + 1 + consNum{|*|} x)
+computeGotos [x:xs] i = appFst (\bc->[x:bc]) (computeGotos xs $ i + bclength x)
readable :: BC -> String
-readable (BCPush d) = "BCPush " +++ concat [safe c\\c<-:d]
+readable (BCPush d) = "BCPush " +++ concat [safe c\\c<-:toByteCode d]
where
safe c = if (isControl c) ("\\d" +++ toString (toInt c)) (toString c)
readable b = printToString b
toReadableByteCode x s
# (s, bc) = runBC x s
# (bc, gtmap) = computeGotos bc 0
-= ('Text'.join "\n" $ map readable (map (implGotos gtmap) bc), s)
-
-toMessages :: MTaskInterval (String, BCState) -> ([MTaskMSGSend], BCState)
-toMessages interval (bytes, st=:{sdss}) = (
- [MTSds s.sdsi (toByteCode s.sdsval)\\s<-sdss] ++
- [MTTask interval bytes], st)
-
-toSDSUpdate :: Int Int -> [MTaskMSGSend]
-toSDSUpdate i v = [MTUpd i (to16bit v)]
+= ('Text'.join "\n" $ lineNumbers numbers (map (implGotos gtmap) bc), s)
+ where
+ numbers = map (\n->lpad (toString n) 3 ' ' +++ ". ") [0..]
+ lineNumbers ls [] = []
+ lineNumbers [l:ls] [b:bc] = [l +++ readable b:ex ++ lineNumbers newls bc]
+ where
+ (ex, newls) = splitAt (bclength b - 1) ls
+
+derive gPrint BCShare
+
+toMessages :: MTaskInterval (Main (ByteCode a b)) BCState -> ([MTaskMSGSend], BCState)
+toMessages interval x s
+# (bc, newstate) = toRealByteCode (unMain x) s
+# newsdss = 'DL'.difference newstate.sdss s.sdss
+| not (trace_tn $ printToString s.sdss) = undef
+| not (trace_tn $ printToString newstate.sdss) = undef
+| not (trace_tn $ printToString newsdss) = undef
+= ([MTSds sdsi e\\{sdsi,sdsval=e}<-newsdss] ++
+ [MTTask interval bc], newstate)
+
+instance == BCShare where (==) a b = a.sdsi == b.sdsi
//Start = toMessages (OnInterval 500) $ toRealByteCode (unMain bc) zero
-Start = let (bcs, st) = toReadableByteCode (unMain bc) zero
- in (bcs, st.sdss)
+//Start = [fst $ toReadableByteCode (unMain $ p0) zero
+// ,'Text'.concat $ compile p0
+// ]
+Start = toReadableByteCode (unMain $ p0) zero
where
-// bc = {main = ledOn (lit LED1)}
- bc = sds \x=5 In
- sds \y=4 In
- {main = If (y ==. lit 0) (pub x) (x =. x *. y :. y =. y -. lit 1)}
+ p0 :: (Main (a Int Expr)) | assign, namedsds, sds, arith a
+// p0 = sds \x = 6 In {main = x =. x *. lit 7}
+ p0 = namedsds \x = 6 Named "x" In {main = x =. x *. lit 7}
+
+ bc = {main =
+ IF (analogRead A0 >. lit 50)
+ ( digitalWrite D0 (lit True) )
+ ( digitalWrite D0 (lit False) )
+ }
+
to16bit :: Int -> String
to16bit i = toString (toChar (i/256)) +++ toString (toChar (i rem 256))
from16bit :: String -> Int
from16bit s = toInt s.[0] * 256 + toInt s.[1]
+
+//derive class gCons UserLED, Long, Pin, Button, UserLED, AnalogPin, DigitalPin, PinMode
repositories / mTask.git / blobdiff