added sds operators, timing and task deletion

[mTask.git] / mTaskInterpret.icl

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index 80286f2..fff57e4 100644 (file)
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -1,33 +1,59 @@
 implementation module mTaskInterpret
 
 //import iTasks
-import gdynamic, gCons, GenEq, StdMisc, StdArray
+import gdynamic, gCons, GenEq, StdMisc, StdArray, GenBimap
 import GenPrint
 import mTask
 
+import StdFile
+import StdString
+
 from StdFunc import o
+import StdBool
 import StdTuple
 import Data.Tuple
-import Data.Functor
 import StdList
-import Control.Applicative
-import Control.Monad
-import Data.Monoid
-import Control.Monad.State
-import Control.Monad.Identity
 from Data.Func import $
-
-
-toByteVal :: BC -> String
-toByteVal a = undef
-
-derive gPrint BC
+from Text import class Text(concat,join,toUpperCase), instance Text String
+
+toByteVal :: BC -> [Char]
+toByteVal b
+# bt = toByteCode b
+= [bt:case b of
+               (BCPush i) = [toChar i]
+               (BCAnalogRead i) = [toChar i]
+               (BCAnalogWrite i) = [toChar i]
+               (BCDigitalRead i) = [toChar i]
+               (BCDigitalWrite i) = [toChar i]
+               (BCJmp i) = [toChar i]
+               (BCJmpT i) = [toChar i]
+               (BCJmpF i) = [toChar i]
+               _ = []]
+       where
+               toByteCode b = toChar $ consIndex{|*|} b + 1
+
+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 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 toChar Pin where
+       toChar (Digital p) = toChar $ consIndex{|*|} p + 1
+       toChar (Analog p) = toChar $ consIndex{|*|} p + 1
+
+derive gPrint BC, AnalogPin, Pin, DigitalPin
+derive consIndex BC, Pin, Button
+derive consName BC, Pin, Button
 
 toReadableByteVal :: BC -> String
 toReadableByteVal a = printToString a
 
 instance arith ByteCode where
-       lit x = BC [BCPush $ toCode x]
+       lit x = BC [BCPush 1]
        (+.) x y = x <++> y <+-> [BCAdd]
        (-.) x y = x <++> y <+-> [BCSub]
        (*.) x y = x <++> y <+-> [BCMul]
@@ -44,15 +70,40 @@ instance boolExpr ByteCode where
        (<=.) x y = x <++> y <+-> [BCLeq]
        (>=.) x y = x <++> y <+-> [BCGeq]
 
+instance analogIO ByteCode where
+       analogRead p = BC [BCAnalogRead $ pin p]
+       analogWrite p b = b <+-> [BCAnalogWrite $ pin p]
+
+instance digitalIO ByteCode where
+       digitalRead p = BC [BCDigitalRead $ pin p]
+       digitalWrite p b = b <+-> [BCDigitalWrite $ pin p]
+
 instance If ByteCode Stmt 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
 instance If ByteCode Stmt Stmt e where If b t e = BCIfStmt b t e
-instance If ByteCode Stmt x y where If b t e = BCIfStmt b t e 
-instance IF ByteCode where 
+instance If ByteCode x y Expr where If b t e = BCIfStmt b t e
+instance IF ByteCode where
        IF b t e = BCIfStmt b t e
        (?) b t = BCIfStmt b t $ BC []
-BCIfStmt b t e = b <+-> [BCJmpF $ length <$> t + 1] <++> t <+-> [BCJmp $ length <$> e] <++> e 
+BCIfStmt b t e = b <+-> [BCJmpF $ length <$> t + 1] <++> t
+       <+-> [BCJmp $ length <$> e] <++> e
 
+instance noOp ByteCode where noOp = BC []
+
+instance sds ByteCode where
+       sds f = undef/*{main = 
+                       let var = 42
+                           (v In body) = f var
+                       in unMain body
+               }*/
+       con f = undef
+
+instance serial ByteCode where
+       serialAvailable = BC [BCSerialAvail]
+       serialPrint s = BC [BCSerialPrint]
+       serialPrintln s = BC [BCSerialPrintln]
+       serialRead = BC [BCSerialRead]
+       serialParseInt = BC [BCSerialParseInt]
 
 (<++>) infixl 7
 (<++>) (BC x) (BC y) = BC $ x ++ y
@@ -64,21 +115,26 @@ BCIfStmt b t e = b <+-> [BCJmpF $ length <$> t + 1] <++> t <+-> [BCJmp $ length
 (<$>) infixl 9
 (<$>) f (BC x) = f x
 
-instance serial ByteCode where
-       serialAvailable = undef
-       serialPrint _ = undef
-       serialPrintln _ = undef
-       serialRead = undef
-       serialParseInt = undef
-
 instance zero BCState where
        zero = {a=()}
 
-//runByteCode :: (ByteCode Int Expr) BCState -> [BC]
-//runByteCode (BC f) s = evalState f s
-//runByteCode (BC f) s = fst (f Rd s)
-
-//Start :: Main (ByteCode Int Expr)
-//Start :: [BC]
-Start :: ByteCode Int Expr
-Start = (lit 36 +. lit 42) +. lit 84
+toRealByteCode :: (ByteCode a Expr) -> String
+toRealByteCode (BC x) = concat $ map (toString o toByteVal) x
+
+//Start :: ByteCode Int Expr
+//Start = (lit 36 +. lit 42) +. lit 84
+
+to16bit :: Int -> String
+to16bit i = toString (toChar (i/265)) +++ toString (toChar (i rem 265))
+
+//Run test programma en pretty print
+//Start :: String
+//Start = "t" +++ to16bit (size b) +++ b
+Start :: Main (ByteCode Int Expr)
+Start = bc
+       where
+               bc = sds \x=43 In {main = If (x ==. lit 42) (analogRead A1) (analogRead A0)}
+               b = toRealByteCode bc
+//Start :: ByteCode Int Expr
+//Start = If (lit True) (analogRead A1) (analogRead A0)
+//Start = If ((lit 36) ==. (lit 42)) (noOp) (noOp)