revert back to old itasks, add sds support in bytecode

[mTask.git] / mTaskInterpret.icl

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index ab86aed..4c8e43e 100644 (file)
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -19,11 +19,16 @@ import StdList
 from Data.Func import $
 from Text import class Text(concat,join,toUpperCase), instance Text String
 
+import Text.Encodings.Base64
+
 toByteVal :: BC -> [Char]
 toByteVal b
 # bt = toChar $ consIndex{|*|} b + 1
 = [bt:case b of
                (BCPush i) = i
+               (BCSdsStore i) = [toChar i]
+               (BCSdsFetch i) = [toChar i]
+               (BCSdsPublish i) = [toChar i]
                (BCAnalogRead i) = [toChar i]
                (BCAnalogWrite i) = [toChar i]
                (BCDigitalRead i) = [toChar i]
@@ -49,11 +54,13 @@ runBC (BC m) = m
 
 retrn :: ([BC] -> ByteCode a p)
 retrn = BC o tuple
+fmp :: ([BC] -> [BC]) (ByteCode a p) -> ByteCode a p
+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]
-instance toByteCode Int where toByteCode n = map toChar [n/(2<<7),n rem 265]
+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
@@ -63,7 +70,7 @@ instance toChar Pin where
        toChar (Digital p) = toChar $ consIndex{|*|} p + 1
        toChar (Analog p) = toChar $ consIndex{|*|} p + 1
 
-derive gPrint BC, AnalogPin, Pin, DigitalPin, BCState
+derive gPrint BC, AnalogPin, Pin, DigitalPin
 derive consIndex BC, Pin, Button
 derive consName BC, Pin, Button
 
@@ -105,7 +112,6 @@ BCIfStmt b t e = withLabel \else->withLabel \endif->retrn [BCJmpF else] <++> t
 
 instance noOp ByteCode where noOp = mempty
 
-
 withLabel :: (Int -> (ByteCode b q)) -> ByteCode b q
 withLabel f = BC \s->let [fresh:fs] = s.freshl
        in runBC (f fresh) {s & freshl=fs}
@@ -114,15 +120,29 @@ withSDS :: (Int -> (ByteCode b q)) -> ByteCode b q
 withSDS f = BC \s->let [fresh:fs] = s.freshs
        in runBC (f fresh) {s & freshs=fs}
 
+setSDS :: Int v -> ByteCode b q | toByteCode v
+setSDS ident val = BC \s->([], {s & sdss = [(ident, toByteCode val):s.sdss]})
+
 instance sds ByteCode where
        sds f = {main = withSDS \sds->
-                       let (v In body) = f $ retrn [BCSdsStore sds]
-                       in unMain body <++> retrn [BCSdsStore sds]
+                       let (v In body) = f $ retrn [BCSdsFetch sds]
+                       in setSDS sds v <++> unMain body
                }
        con f = undef
+//     pub _ = undef
 
 instance assign ByteCode where
-       (=.) v e = e <++> abort (printToString $ fst $ runBC v zero)
+       (=.) v e = e <++> fmp makeStore v
+
+makePub [] = []
+makePub [x:xs] = case x of
+       BCSdsFetch i = [BCSdsPublish i:xs]
+       y = [y:xs]
+
+makeStore [] = []
+makeStore [x:xs] = case x of
+       BCSdsFetch i = [BCSdsStore i:xs]
+       y = [y:xs]
 
 instance seq ByteCode where
        (>>=.) _ _ = abort "undef on >>=."
@@ -136,38 +156,54 @@ instance serial ByteCode where
        serialParseInt = retrn [BCSerialParseInt]
 
 instance zero BCState where
-       zero = {freshl=[1..], freshs=[1..]}
+       zero = {freshl=[1..], freshs=[1..], sdss=[]}
+
+makeSafe :: Char -> Char
+makeSafe c = c//toChar $ toInt c + 31
 
-toRealByteCode :: (ByteCode a Expr) -> String
+toRealByteCode :: (ByteCode a b) -> (String, BCState)
 toRealByteCode x
 # (bc, st) = runBC x zero
-= concat $ map (toString o toByteVal) bc
+= (concat $ map (toString o map makeSafe o toByteVal) bc, st)
 
-toReadableByteCode :: (ByteCode a Expr) -> String
+readable :: BC -> String
+readable (BCPush d) = "BCPush " +++ concat (map safe d)
+       where
+               safe c
+               | isControl c = "\\d" +++ toString (toInt c)
+               = toString c
+readable b = printToString b
+
+toReadableByteCode :: (ByteCode a b) -> (String, BCState)
 toReadableByteCode x
 # (bc, st) = runBC x zero
-= join "\n" $ map printToString bc
-
-toReadableByteVal :: BC -> String
-toReadableByteVal a = printToString a
-
+= (join "\n" $ map readable bc, st)
 
 //Start :: String
 //Start = toReadableByteCode bc
 //     where
 //             bc :: ByteCode Int Expr
 //             bc = (lit 36 +. lit 42) +. lit 44
+getSDSBytes :: BCState -> String
+getSDSBytes {sdss} = concat $ map sd sdss
+       where sd (i, v) = "s" +++ toString (toChar i) +++ toString v +++ "\n"
 
-Start :: String
-Start = toReadableByteCode $ unMain bc
+getTaskBytes :: Int String -> String
+getTaskBytes i b = "t" +++ to16bit i +++ to16bit (size b) +++ b 
+//
+Start = getSDSBytes (snd bc`) +++ getTaskBytes 400 (fst bc`)
+//Start = fst $ toReadableByteCode $ unMain bc
        where
-               bc :: Main (ByteCode Int Expr)
-               bc = sds \x=46 In 
-                       sds \y=46 In 
-                       {main = y =. x +. y}
+               bc` = toRealByteCode (unMain bc)
+               bc :: Main (ByteCode Int Stmt)
+               bc = sds \x=41 In 
+                       {main = x =. x +. lit 1 :. pub x}
+
+pub :: (ByteCode a b) -> ByteCode a b
+pub x = fmp makePub x
 
-//to16bit :: Int -> String
-//to16bit i = toString (toChar (i/265)) +++ toString (toChar (i rem 265))
+to16bit :: Int -> String
+to16bit i = toString (toChar (i/265)) +++ toString (toChar (i rem 265))
 //
 ////Run test programma en pretty print
 ////Start :: String