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

diff --git a/mTaskInterpret.dcl b/mTaskInterpret.dcl
index 922b445..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,6 +23,7 @@ from Generics.gCons import class gCons, generic conses, generic consName, generi
 :: MTaskMSGSend
 	= MTTask MTaskInterval String
 	| MTTaskDel Int
+	| MTShutdown
 	| MTSds Int BCValue
 	| MTUpd Int BCValue
 	| MTSpec
@@ -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,6 +147,7 @@ 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