X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.dcl;h=f853c651649678d14f91c491d56593f68fa4f046;hb=ff7049a99f7fdd701d49222019df65a9aee8f05a;hp=01059445763fe23c110829eba163e53af4d050a3;hpb=f90517d738696125a067f113edf93f404873115b;p=mTask.git

diff --git a/mTaskInterpret.dcl b/mTaskInterpret.dcl
index 0105944..f853c65 100644
--- a/mTaskInterpret.dcl
+++ b/mTaskInterpret.dcl
@@ -6,16 +6,26 @@ from Data.Monoid import class Semigroup, class Monoid
 import mTask
 
 :: MTaskMSGRecv
-	= MTPub Int String
+	= MTTaskAck Int
+	| MTTaskDelAck Int
+	| MTSDSAck Int
+	| MTSDSDelAck Int
+	| MTPub Int String
 	| MTMessage String
-	| MTTaskAdded Int
 	| MTEmpty
 
 :: MTaskMSGSend
-	= MTSds Int String
-	| MTTask Int String
+	= MTTask MTaskInterval String
+	| MTTaskDel Int
+	| MTSds Int String
 	| MTUpd Int String
 
+:: MTaskInterval
+	= OneShot
+	| OnInterval Int
+	| OnInterrupt Int
+
+instance toString MTaskInterval
 instance toString MTaskMSGRecv
 instance toString MTaskMSGSend
 encode :: MTaskMSGSend -> String
@@ -24,7 +34,8 @@ decode :: String -> MTaskMSGRecv
 :: BC
 	= BCNop
 	| BCLab Int
-	| BCPush [Char]
+//	| E.e: BCPush e & toByteCode e
+	| BCPush String
 	| BCPop
 	//SDS functions
 	| BCSdsStore Int
@@ -51,8 +62,8 @@ decode :: String -> MTaskMSGRecv
 	| BCJmpT Int
 	| BCJmpF Int
 	//UserLED
-	| BCLedOn [Char]
-	| BCLedOff [Char]
+	| BCLedOn UserLED
+	| BCLedOff UserLED
 	//Serial
 	| BCSerialAvail
 	| BCSerialPrint
@@ -66,25 +77,34 @@ decode :: String -> MTaskMSGRecv
 	| BCDigitalWrite Pin
 	| BCTest AnalogPin
 
+derive gPrint BC
+derive class gCons BC
+
 :: ByteCode a p = BC (BCState -> ([BC], BCState))
 instance Semigroup (ByteCode a p)
 instance Monoid (ByteCode a p)
 
+:: BCShare = {
+		sdsi :: Int,
+		sdspub :: Bool,
+		sdsval :: String
+	}
+
 :: BCState = {
 		freshl :: [Int],
 		freshs :: [Int],
-		sdss :: [(Int, [Char])]
+		sdss :: [BCShare]
 	}
 instance zero BCState
 
-class toByteCode a :: a -> [Char]
-instance toByteCode Int
-instance toByteCode Bool
-instance toByteCode Char
-instance toByteCode String
-instance toByteCode Long
-instance toByteCode Button
-instance toByteCode UserLED
+class toByteCode a :: a -> String
+class fromByteCode a :: String -> a
+class mTaskType a | toByteCode, fromByteCode, zero a
+
+instance toByteCode Int, Bool, Char, Long, String, Button, UserLED
+instance fromByteCode Int, Bool, Char, Long, String, Button, UserLED
+instance toByteCode MTaskInterval
+instance fromByteCode MTaskInterval
 
 instance toChar Pin
 instance arith ByteCode
@@ -92,9 +112,9 @@ instance boolExpr ByteCode
 instance analogIO ByteCode
 instance digitalIO ByteCode
 instance userLed ByteCode
-//instance If ByteCode Stmt Stmt Stmt
-//instance If ByteCode e Stmt Stmt
-//instance If ByteCode Stmt e Stmt
+instance If ByteCode Stmt Stmt Stmt
+instance If ByteCode e Stmt Stmt
+instance If ByteCode Stmt e Stmt
 instance If ByteCode x y Stmt
 instance IF ByteCode
 instance noOp ByteCode
@@ -104,11 +124,9 @@ instance assign ByteCode
 instance seq ByteCode
 instance serial ByteCode
 
-//pub :: (ByteCode a b) -> ByteCode a b
-
-toMessages :: Int (String, BCState) -> ([MTaskMSGSend], BCState)
+toMessages :: MTaskInterval (String, BCState) -> ([MTaskMSGSend], BCState)
 toSDSUpdate :: Int Int -> [MTaskMSGSend]
 
-toByteVal :: BC -> [Char]
+toByteVal :: BC -> String
 toReadableByteCode :: (ByteCode a b) -> (String, BCState)
-toRealByteCode :: (ByteCode a b) -> (String, BCState)
+toRealByteCode :: (ByteCode a b) BCState -> (String, BCState)