X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.dcl;h=99a3533cd2fa0ea32b7c1ccfe0cdbf56e9f7bd67;hb=a81623aa9629a3c5c8f8bf920e494a596b30c4b7;hp=f0795e17956a182176e1509f296946fa401276fa;hpb=be3f747f775c05facb8a34cf0baba523401b88fb;p=mTask.git

diff --git a/mTaskInterpret.dcl b/mTaskInterpret.dcl
index f0795e1..99a3533 100644
--- a/mTaskInterpret.dcl
+++ b/mTaskInterpret.dcl
@@ -11,7 +11,7 @@ from GenPrint import generic gPrint
 from Generics.gCons import class gCons, generic conses, generic consName, generic consIndex, generic consNum
 
 :: MTaskMSGRecv
-	= MTTaskAck Int
+	= MTTaskAck Int Int
 	| MTTaskDelAck Int
 	| MTSDSAck Int
 	| MTSDSDelAck Int
@@ -23,8 +23,10 @@ from Generics.gCons import class gCons, generic conses, generic consName, generi
 :: MTaskMSGSend
 	= MTTask MTaskInterval String
 	| MTTaskDel Int
-	| MTSds Int String
-	| MTUpd Int String
+	| MTShutdown
+	| MTSds Int BCValue
+	| MTUpd Int BCValue
+	| MTSpec
 
 :: MTaskInterval
 	= OneShot
@@ -35,8 +37,7 @@ from Generics.gCons import class gCons, generic conses, generic consName, generi
 		{haveLed :: Bool
 		,haveAio :: Bool
 		,haveDio :: Bool
-		,maxTask :: Int //Should be number of bytes reserved in total for shares, tasks and functions
-		,maxSDS  :: Int
+		,bytesMemory :: Int
 	}
 
 :: BCValue = E.e: BCValue e & mTaskType e
@@ -54,9 +55,9 @@ decode :: String -> MTaskMSGRecv
 //	| BCPush String
 	| BCPop
 	//SDS functions
-	| BCSdsStore Int
-	| BCSdsFetch Int
-	| BCSdsPublish Int
+	| BCSdsStore BCShare
+	| BCSdsFetch BCShare
+	| BCSdsPublish BCShare
 	//Unary ops
 	| BCNot
 	//Binary Int ops
@@ -67,6 +68,7 @@ decode :: String -> MTaskMSGRecv
 	//Binary Bool ops
 	| BCAnd
 	| BCOr
+	//Binary ops
 	| BCEq
 	| BCNeq
 	| BCLes
@@ -91,7 +93,8 @@ decode :: String -> MTaskMSGRecv
 	| BCAnalogWrite Pin
 	| BCDigitalRead Pin
 	| BCDigitalWrite Pin
-	| BCTest AnalogPin
+	//Return
+	| BCReturn
 
 derive gPrint BCValue, MTaskDeviceSpec
 derive consIndex BCValue
@@ -112,7 +115,6 @@ derive gEq BCValue
 
 :: BCShare = {
 		sdsi :: Int,
-		sdspub :: Bool,
 		sdsval :: BCValue
 	}
 
@@ -136,6 +138,8 @@ instance arith ByteCode
 instance boolExpr ByteCode
 instance analogIO ByteCode
 instance digitalIO ByteCode
+instance aIO ByteCode
+instance dIO ByteCode
 instance userLed ByteCode
 instance If ByteCode Stmt Stmt Stmt
 instance If ByteCode e Stmt Stmt
@@ -143,14 +147,14 @@ instance If ByteCode Stmt e Stmt
 instance If ByteCode x y Stmt
 instance IF ByteCode
 instance noOp ByteCode
+instance retrn ByteCode
 
 instance sds ByteCode
 instance assign ByteCode
 instance seq ByteCode
 instance serial ByteCode
 
-toMessages :: MTaskInterval (String, BCState) -> ([MTaskMSGSend], BCState)
-toSDSUpdate :: Int Int -> [MTaskMSGSend]
+toMessages :: MTaskInterval (Main (ByteCode a b)) BCState -> ([MTaskMSGSend], BCState)
 
 toByteVal :: BC -> String
 toReadableByteCode :: (ByteCode a b) BCState -> (String, BCState)