X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.icl;h=c81476a1d118b405f07fe3976492d12a9ebdd9c5;hb=a2df77cbda43d5a24eeb8ac7db7452baae9f18aa;hp=71555a524026a4c715d18449e653caacbcea2172;hpb=e37402e7672352aa3642df4c1183417a72f59641;p=mTask.git diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl index 71555a5..c81476a 100644 --- a/mTaskInterpret.icl +++ b/mTaskInterpret.icl @@ -2,6 +2,9 @@ implementation module mTaskInterpret import Generics.gCons +import iTasks.UI.Editor.Common +import iTasks.UI.Editor + import GenEq, StdMisc, StdArray, GenBimap import GenPrint import StdEnum @@ -19,7 +22,7 @@ import Data.Monoid import Data.Functor import StdList from Data.Func import $ -from Text import class Text(lpad,concat,toUpperCase), instance Text String +from Text import class Text(subString,lpad,concat,toUpperCase), instance Text String import qualified Text import Text.JSON @@ -38,26 +41,25 @@ import Text.Encodings.Base64 import Tasks.Examples 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" +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") @@ -79,53 +81,70 @@ instance toString MTaskMSGSend where +++ " value " +++ safePrint v 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} + (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} _ = "" -instance toByteCode Bool where toByteCode b = toByteCode $ if b 1 0 -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 c = toByteCode $ toInt c +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 = toByteCode $ consIndex{|*|} s -instance toByteCode UserLED where toByteCode s = toByteCode $ 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 = fromByteCode s == 1 -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 = fromInt $ fromByteCode s -instance fromByteCode String where fromByteCode s = abort $ "Undef on fromBytecode String" +++ s -instance fromByteCode Button where fromByteCode s = conses{|*|} !! fromByteCode s -instance fromByteCode UserLED where fromByteCode s = conses{|*|} !! fromByteCode s instance fromByteCode MTaskInterval where fromByteCode s @@ -134,13 +153,45 @@ instance fromByteCode MTaskInterval 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) + } + +derive gPrint Long, UserLED, Button, AnalogPin, DigitalPin, PinMode, Pin, BC, MTaskDeviceSpec +derive class gCons BC -instance toChar Pin where - toChar (Digital p) = toChar $ consIndex{|*|} p - toChar (Analog p) = toChar $ consIndex{|*|} p +consIndex{|BCValue|} _ = 0 +consName{|BCValue|} _ = "BCValue" +conses{|BCValue|} = [BCValue 0] +consNum{|BCValue|} _ = 1 +gPrint{|BCValue|} v ps = gPrint{|*|} (readable $ BCPush v) ps -derive gPrint BC -derive class gCons BC +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 + + castEditor :: a -> (Editor a) | mTaskType a + castEditor _ = gEditor{|*|} + +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 (BC x) (BC y) bc = BC $ x >>| y >>| tell [bc] @@ -150,10 +201,8 @@ op (BC x) bc = BC $ x >>| tell [bc] 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 @@ -204,7 +253,7 @@ instance sds ByteCode where >>= \(v In bdy)->modify (addSDS sds v) >>| unBC (unMain bdy)} // >>= \(v In bdy)->modify (addSDS sds (toByteCode v)) >>| unBC (unMain bdy)} where - addSDS i v s = {s & sdss=[{sdsi=i,sdspub=False,sdsval=(dynamic v),sdsbc=toByteCode v}:s.sdss]} + addSDS i v s = {s & sdss=[{sdsi=i,sdspub=False,sdsval=(BCValue v)}:s.sdss]} con f = undef pub (BC x) = BC $ censor (\[BCSdsFetch s]->[BCSdsPublish s]) @@ -233,8 +282,8 @@ instance userLed ByteCode where ledOn (BC l) = BC $ l >>| tell [BCLedOn] ledOff (BC l) = BC $ l >>| tell [BCLedOff] -func :: (a -> BC) [BC] -> [BC] | mTaskType a -func f b = abort ('Text'.join "\n" (map printToString b)) +instance retrn ByteCode where + retrn (BC l) = BC $ tell [BCReturn] instance zero BCState where zero = {freshl=[1..], freshs=[1..], sdss=[]} @@ -250,9 +299,8 @@ implGotos map (BCJmpT t) = BCJmpT $ fromJust ('DM'.get t map) implGotos map (BCJmpF t) = BCJmpF $ fromJust ('DM'.get t map) implGotos _ i = i -import StdDebug bclength :: BC -> Int -bclength (BCPush s) = 1 + size s +bclength (BCPush s) = 1 + size (toByteCode s) bclength (BCSdsStore _) = 3 bclength (BCSdsFetch _) = 3 bclength (BCSdsPublish _) = 3 @@ -264,7 +312,7 @@ computeGotos [BCLab l:xs] i = appSnd ('DM'.put l i) (computeGotos xs i) 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 @@ -275,7 +323,6 @@ runBC (BC x) = execRWS x () toReadableByteCode :: (ByteCode a b) BCState -> (String, BCState) toReadableByteCode x s # (s, bc) = runBC x s -| not (trace_tn $ ('Text'.join "\n" $ lineNumbers numbers bc) +++ "\n") = undef # (bc, gtmap) = computeGotos bc 0 = ('Text'.join "\n" $ lineNumbers numbers (map (implGotos gtmap) bc), s) where @@ -285,16 +332,23 @@ toReadableByteCode x s where (ex, newls) = splitAt (bclength b - 1) ls -toMessages :: MTaskInterval (String, BCState) -> ([MTaskMSGSend], BCState) -toMessages interval (bytes, st=:{sdss}) = ( - [MTSds s.sdsi s.sdsbc\\s<-sdss] ++ - [MTTask interval bytes], st) +derive gPrint BCShare -toSDSUpdate :: Int Int -> [MTaskMSGSend] -toSDSUpdate i v = [MTUpd i (to16bit v)] +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 = fst $ toReadableByteCode (unMain $ blink LED1) zero +Start = fst $ toReadableByteCode (unMain $ countAndLed) zero +//Start = fst $ toReadableByteCode (unMain $ blink LED1) zero //Start = let (bcs, st) = toReadableByteCode (unMain bc) zero // in (bcs, st.sdss) where @@ -308,3 +362,5 @@ 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