X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.dcl;h=3e7513fde7354c920e5656ecfc3e9351695d21db;hb=HEAD;hp=29e1fb95b6e98a089fedd10317b105aa9894383b;hpb=a2df77cbda43d5a24eeb8ac7db7452baae9f18aa;p=mTask.git

diff --git a/mTaskInterpret.dcl b/mTaskInterpret.dcl
index 29e1fb9..3e7513f 100644
--- a/mTaskInterpret.dcl
+++ b/mTaskInterpret.dcl
@@ -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
@@ -33,13 +34,18 @@ from Generics.gCons import class gCons, generic conses, generic consName, generi
 	| OnInterrupt Int
 
 :: MTaskDeviceSpec =
-		{haveLed :: Bool
-		,haveAio :: Bool
-		,haveDio :: Bool
+		{haveLed     :: Bool
+		,haveAio     :: Bool
+		,haveDio     :: Bool
+		,aPins       :: Int
+		,dPins       :: Int
+		,stackSize   :: Int
 		,bytesMemory :: Int
 	}
 
-:: BCValue = E.e: BCValue e & mTaskType e
+:: BCValue = E.e: BCValue e & mTaskType, TC e
+
+instance == BCValue
 
 instance toString MTaskInterval
 instance toString MTaskMSGRecv
@@ -54,9 +60,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
@@ -112,15 +118,15 @@ derive gEq BCValue
 
 :: ByteCode a p = BC (RWS () [BC] BCState ())
 
-:: BCShare = {
-		sdsi :: Int,
-		sdspub :: Bool,
-		sdsval :: BCValue
+:: BCShare =
+	{ sdsi :: Int
+	, sdsval :: BCValue
+	, sdsname :: String
 	}
 
 :: BCState = {
-		freshl :: [Int],
-		freshs :: [Int],
+		freshl :: Int,
+		freshs :: Int,
 		sdss :: [BCShare]
 	}
 instance zero BCState
@@ -138,6 +144,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
@@ -148,6 +156,7 @@ instance noOp ByteCode
 instance retrn ByteCode
 
 instance sds ByteCode
+instance sdspub ByteCode
 instance assign ByteCode
 instance seq ByteCode
 instance serial ByteCode