X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.icl;h=164db5e60ab64688df2e2ddf1136ae959d3a7511;hb=6d956995e169ae8fd44d62e26e35d499a9660225;hp=aeceb925b39336180882bb8905111a6d90c79aeb;hpb=feacd1b50fca9624284f8b8c22c26d7a8071515d;p=mTask.git

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index aeceb92..164db5e 100644
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -40,11 +40,15 @@ import Text.Encodings.Base64
 
 import Tasks.Examples
 
+instance == BCValue where (==) a b = toByteCode a == toByteCode b
+
 encode :: MTaskMSGSend -> String
 encode (MTTask to data) = "t" +++ toByteCode to +++ to16bit (size data) +++ data +++ "\n"
 encode (MTTaskDel i) = "d" +++ to16bit i +++ "\n"
-encode (MTSds i v) = "s" +++ to16bit i +++ v +++ "\n"
-encode (MTUpd i v) = "u" +++ to16bit i +++ v +++ "\n"
+encode (MTSds i v) = "s" +++ to16bit i +++ toByteCode v +++ "\n"
+encode (MTUpd i v) = "u" +++ to16bit i +++ toByteCode v +++ "\n"
+encode (MTSpec) = "c\n"
+encode (MTShutdown) = "h\n"
 
 import StdDebug
 decode :: String -> MTaskMSGRecv
@@ -52,7 +56,7 @@ decode x
 | not (trace_tn ("decoding: " +++ toString (toJSON x))) = undef
 | size x == 0 = MTEmpty
 = case x.[0] of
-	't' = MTTaskAck $ fromByteCode x
+	't' = MTTaskAck (fromByteCode x) (fromByteCode (x % (2, size x)))
 	'd' = MTTaskDelAck $ fromByteCode x
 	'm' = MTMessage x
 	's' = MTSDSAck $ fromByteCode x
@@ -78,9 +82,12 @@ instance toString MTaskMSGSend where
 	toString (MTTaskDel i) = "Task delete request: " +++ toString i
 	toString (MTUpd i v) = "Update id: " +++ toString i
 		+++ " value " +++ safePrint v
+	toString (MTSpec) = "Spec request"
+	toString (MTShutdown) = "Shutdown request"
 
 instance toString MTaskMSGRecv where
-	toString (MTTaskAck i) = "Task added with id: " +++ toString i
+	toString (MTTaskAck i mem) = "Task added with id: " +++ toString i
+		+++ " free memory: " +++ toString mem
 	toString (MTTaskDelAck i) = "Task deleted with id: " +++ toString i
 	toString (MTSDSAck i) = "SDS added with id: " +++ toString i
 	toString (MTSDSDelAck i) = "SDS deleted with id: " +++ toString i
@@ -95,9 +102,9 @@ toByteVal b = {toChar $ consIndex{|*|} b} +++
 	case b of
 		(BCPush (BCValue i)) = toByteCode i
 		(BCLab i) = {toChar i}
-		(BCSdsStore i) = to16bit i
-		(BCSdsFetch i) = to16bit i
-		(BCSdsPublish i) = to16bit i
+		(BCSdsStore i) = to16bit i.sdsi
+		(BCSdsFetch i) = to16bit i.sdsi
+		(BCSdsPublish i) = to16bit i.sdsi
 		(BCAnalogRead i) = {toChar $ consIndex{|*|} i}
 		(BCAnalogWrite i) = {toChar $ consIndex{|*|} i}
 		(BCDigitalRead i) = {toChar $ consIndex{|*|} i}
@@ -119,7 +126,7 @@ parseBCValue c s = case c of
 castfbc :: a -> (String -> a) | mTaskType a
 castfbc _ = fromByteCode
 
-instance toByteCode Bool where toByteCode b = {#'b',if b '\x01' '\0'}
+instance toByteCode Bool where toByteCode b = {'b',if b '\x01' '\0'}
 instance toByteCode Int where toByteCode n = {'i',toChar $ n/256,toChar $ n rem 256}
 instance toByteCode Long where toByteCode (L n) = {'l',toChar $ n/256,toChar $ n rem 256}
 instance toByteCode Char where toByteCode c = {'c',c}
@@ -138,7 +145,7 @@ instance fromByteCode UserLED where fromByteCode s = conses{|*|} !! toInt s.[1]
 instance fromByteCode BCValue where fromByteCode s = parseBCValue s.[0] s
 
 instance toByteCode MTaskInterval where
-	toByteCode OneShot = toByteCode 0
+	toByteCode OneShot = toByteCode (OnInterval 0)
 	//Intervals have the first bit 0 and the rest is a 15 bit unsigned int
 	toByteCode (OnInterval i) = {toChar $ i/256 bitand 127, toChar $ i rem 256}
 	//Intervals have the first bit 1 and the rest is a 15 bit unsigned int
@@ -153,16 +160,18 @@ instance fromByteCode MTaskInterval
 		= OnInterrupt $ fromByteCode s bitand 127
 instance fromByteCode MTaskDeviceSpec where
 	fromByteCode s = let c = toInt s.[0] in
-		{MTaskDeviceSpec
-		|haveLed=(c bitand 1) > 0
-		,haveAio=(c bitand 2) > 0
-		,haveDio=(c bitand 4) > 0
-		,maxTask=from16bit $ s % (1,3)
-		,maxSDS=from16bit $ s % (3,5)
+		{ MTaskDeviceSpec
+		| haveLed     = (c bitand 1) > 0
+		, haveAio     = (c bitand 2) > 0
+		, haveDio     = (c bitand 4) > 0
+		, bytesMemory = from16bit $ s % (1,3)
+		, stackSize  = from16bit $ s % (3,5)
+		, aPins       = toInt s.[5]
+		, dPins       = toInt s.[6]
 		}
 
 derive gPrint Long, UserLED, Button, AnalogPin, DigitalPin, PinMode, Pin, BC, MTaskDeviceSpec
-derive class gCons BC
+derive class gCons BC, BCShare
 
 consIndex{|BCValue|} _ = 0
 consName{|BCValue|} _ = "BCValue"
@@ -192,12 +201,13 @@ gEq{|BCValue|} (BCValue e) (BCValue f) = toByteCode e == toByteCode f
 derive class gCons Long, UserLED, Button, AnalogPin, DigitalPin, PinMode, Pin
 derive class iTask UserLED, Long, Pin, Button, AnalogPin, DigitalPin, PinMode, MTaskDeviceSpec
 
-op2 :: (ByteCode a p1) (ByteCode a p2) BC -> ByteCode b Expr
+op2 :: (ByteCode a p1) (ByteCode a p2) BC -> ByteCode b p3
 op2 (BC x) (BC y) bc = BC $ x >>| y >>| tell [bc]
 
-op :: (ByteCode a p) BC -> ByteCode a Expr
+op :: (ByteCode a p) BC -> ByteCode b c
 op (BC x) bc = BC $ x >>| tell [bc]
 
+tell` :: [BC] -> (ByteCode a p)
 tell` x = BC $ tell x
 
 instance arith ByteCode where
@@ -226,6 +236,12 @@ instance digitalIO ByteCode where
 	digitalRead p = tell` [BCDigitalRead $ pin p]
 	digitalWrite p b = op b (BCDigitalWrite $ pin p)
 
+instance aIO ByteCode where
+	aIO p = tell` [BCAnalogRead $ pin p]
+
+instance dIO ByteCode where
+	dIO p = tell` [BCDigitalRead $ pin p]
+
 instance If ByteCode Stmt Stmt Stmt where If b t e = BCIfStmt b t e
 instance If ByteCode e 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
@@ -239,32 +255,43 @@ BCIfStmt (BC b) (BC t) (BC e) = BC $
 	t >>| tell [BCJmp endif, BCLab else] >>|
 	e >>| tell [BCLab endif]
 
-freshl = get >>= \st=:{freshl=[fr:frs]}->put {st & freshl=frs} >>| pure fr
-freshs = get >>= \st=:{freshs=[fr:frs]}->put {st & freshs=frs} >>| pure fr
+freshl = get >>= \st=:{freshl}->put ({st & freshl=freshl+1}) >>| pure freshl
+freshs = get >>= \st=:{freshs}->put ({st & freshs=freshs+1}) >>| pure freshs
 
 instance noOp ByteCode where noOp = tell` [BCNop]
 
+unBC :: (ByteCode a p) -> RWS () [BC] BCState ()
 unBC (BC x) = x
 
 instance sds ByteCode where
-	sds f = {main = BC $ freshs 
-				>>= \sds->pure (f (tell` [BCSdsFetch sds]))
-				>>= \(v In bdy)->modify (addSDS sds v) >>| unBC (unMain bdy)}
-//				>>= \(v In bdy)->modify (addSDS sds (toByteCode v)) >>| unBC (unMain bdy)}
-		where
-			addSDS i v s = {s & sdss=[{sdsi=i,sdspub=False,sdsval=(BCValue v)}:s.sdss]}
-
+	sds f = {main = BC $ freshs
+		>>= \sdsi->pure {BCShare | sdsname="", sdsi=sdsi, sdsval=BCValue 0}
+		>>= \sds ->pure (f $ tell` [BCSdsFetch sds])
+		>>= \(v In bdy)->modify (addSDS sds v)
+		>>| unBC (unMain bdy)}
+	where
+		addSDS sds v s = {s & sdss=[{sds & sdsval=BCValue v}:s.sdss]}
 	con f = undef
-	pub (BC x) = BC $ censor (\[BCSdsFetch s]->[BCSdsPublish s])
-			(listen x >>= \(_, [BCSdsFetch s])->modify (publish s)) >>| tell mempty
-		where
-			publish i st = {st & sdss=[if (i == s.sdsi) {s & sdspub=True} s \\s<-st.sdss]}
+
+instance namedsds ByteCode where
+	namedsds f = {main = BC $ freshs
+		>>= \sdsi->pure {BCShare | sdsname="", sdsi=sdsi, sdsval=BCValue 0}
+		>>= \sds ->pure (f $ tell` [BCSdsFetch sds])
+		>>= \(v Named n In bdy)->modify (addSDS sds n v)
+		>>| unBC (unMain bdy)}
+	where
+		addSDS sds n v s = {s & sdss=[{sds & sdsname=n, sdsval=BCValue v}:s.sdss]}
+
+instance sdspub ByteCode where
+	pub (BC x) = BC $ censor (\[BCSdsFetch s]->[BCSdsPublish s]) x
 
 instance assign ByteCode where
 	(=.) (BC v) (BC e) = BC $ e >>| censor makeStore v
 		where 
 			//This is going to include pins as well, as variables
 			makeStore [BCSdsFetch i] = [BCSdsStore i]
+			makeStore [BCDigitalRead i] = [BCDigitalWrite i]
+			makeStore [BCAnalogRead i] = [BCAnalogWrite i]
 
 instance seq ByteCode where
 	(>>=.) _ _ = abort "undef on >>=."
@@ -278,11 +305,14 @@ instance serial ByteCode where
 	serialParseInt = tell` [BCSerialParseInt]
 
 instance userLed ByteCode where
-	ledOn  (BC l) = BC $ l >>| tell [BCLedOn]
-	ledOff (BC l) = BC $ l >>| tell [BCLedOff]
+	ledOn  l = op l BCLedOn
+	ledOff l = op l BCLedOff
+
+instance retrn ByteCode where
+  retrn = tell` [BCReturn]
 
 instance zero BCState where
-	zero = {freshl=[1..], freshs=[1..], sdss=[]}
+	zero = {freshl=1, freshs=1, sdss=[]}
 
 toRealByteCode :: (ByteCode a b) BCState -> (String, BCState)
 toRealByteCode x s
@@ -328,24 +358,36 @@ toReadableByteCode x s
 			where
 				(ex, newls) = splitAt (bclength b - 1) ls
 
-toMessages :: MTaskInterval (String, BCState) -> ([MTaskMSGSend], BCState)
-toMessages interval (bytes, st=:{sdss}) = (
-	[MTSds sdsi $ toByteCode e\\{sdsi,sdsval=(BCValue e)}<-sdss] ++
-	[MTTask interval bytes], st)
+derive gPrint BCShare
 
-toSDSUpdate :: Int Int -> [MTaskMSGSend]
-toSDSUpdate i v = [MTUpd i (to16bit v)]
+toMessages :: MTaskInterval (Main (ByteCode a b)) BCState -> ([MTaskMSGSend], BCState)
+toMessages interval x s
+# (bc, newstate) = toRealByteCode (unMain x) s
+# newsdss = 'DL'.difference newstate.sdss s.sdss 
+| not (trace_tn $ printToString s.sdss) = undef
+| not (trace_tn $ printToString newstate.sdss) = undef
+| not (trace_tn $ printToString newsdss) = undef
+= ([MTSds sdsi e\\{sdsi,sdsval=e}<-newsdss] ++
+	[MTTask interval bc], newstate)
+
+instance == BCShare where (==) a b = a.sdsi == b.sdsi
 
 //Start = toMessages (OnInterval 500) $ toRealByteCode (unMain bc) zero
-Start = fst $ toReadableByteCode (unMain $ countAndLed) zero
-//Start = fst $ toReadableByteCode (unMain $ blink LED1) zero
-//Start = let (bcs, st) = toReadableByteCode (unMain bc) zero
-//		in (bcs, st.sdss)
+//Start = [fst $ toReadableByteCode (unMain $ p0) zero
+//		,'Text'.concat $ compile p0
+//		]
+Start = toReadableByteCode (unMain $ p0) zero
 	where
-//		bc = {main = ledOn (lit LED1)}
-		bc = sds \x=5 In 
-			sds \y=4 In
-			{main = If (y ==. lit 0) (pub x) (x =. x *. y :. y =. y -. lit 1)}
+		p0 :: (Main (a Int Expr)) | assign, namedsds, sds, arith a
+//		p0 = sds \x = 6 In {main = x =. x *. lit 7}
+		p0 = namedsds \x = 6 Named "x" In {main = x =. x *. lit 7}
+
+		bc  = {main =
+			IF (analogRead A0 >. lit 50)
+			  ( digitalWrite D0 (lit True)  )
+			  ( digitalWrite D0 (lit False) )
+			}
+
 
 to16bit :: Int -> String
 to16bit i = toString (toChar (i/256)) +++ toString (toChar (i rem 256))