X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.icl;h=21b53c901927d632134b09e60a53d76293c2589b;hb=3cac8340c7c822ecda3783286196c6bc4cdec66a;hp=760281ce93c6dcc66369677ff35334e1f9683a2f;hpb=4dff4046c87727f8b09558969f7c655b9e4de3c1;p=mTask.git

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index 760281c..21b53c9 100644
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -19,40 +19,60 @@ import StdList
 from Data.Func import $
 from Text import class Text(concat,join,toUpperCase), instance Text String
 
+import qualified Data.Map as DM
 import Text.Encodings.Base64
 
-encode :: MTaskMessage -> String
-encode (MTSds i v) = "s" +++ to16bit i +++ v
-encode (MTTask to data) = "t" +++ to16bit to +++ toString (size data) +++ data
-encode (MTPub i v) = "u" +++ to16bit i +++ v
-encode (MTUpd i v) = "u" +++ to16bit i +++ v
+encode :: MTaskMSGSend -> String
+encode (MTSds i v) = "s" +++ to16bit i +++ v +++ "\n"
+encode (MTTask to data) = "t" +++ to16bit to +++ to16bit (size data) +++ data +++ "\n"
+encode (MTUpd i v) = "u" +++ to16bit i +++ v +++ "\n"
 
-decode :: String -> MTaskMessage
-decode x = case x.[0] of
-	'u' = MTUpd (toInt x.[1]) (x % (2,4))
-	_ = abort ("Didn't understand message: " +++ x)
+decode :: String -> MTaskMSGRecv
+decode x
+| size x == 0 = MTEmpty
+= case x.[0] of
+	'\0' = MTEmpty
+	'\n' = MTEmpty
+	'm' = MTMessage x
+	'u' = MTPub (from16bit (x % (1,3))) (x % (3,5))
+	_ = MTMessage x//abort ("Didn't understand message: " +++ join " " [toString (toInt c)\\c<-: x] +++ "\n")
 
-safePrint :: String -> String
-safePrint s = join " " [saf c\\c<-:s]
-	where
-		saf c = "\x" +++ toString (toInt c)
+safePrint :== toString o toJSON
 
-derive gPrint MTaskMessage
-instance toString MTaskMessage where
+instance toString MTaskMSGSend where
 	toString (MTSds i v) = "Sds id: " +++ toString i
 		+++ " value " +++ safePrint v
 	toString (MTTask to data) = "Task timeout: " +++ toString to
 		+++ " data " +++ safePrint data
-	toString (MTPub i v) = "Publish id: " +++ toString i
-		+++ " value " +++ safePrint v
 	toString (MTUpd i v) = "Update id: " +++ toString i
 		+++ " value " +++ safePrint v
 
+instance toString MTaskMSGRecv where
+	toString (MTPub i v) = "Publish id: " +++ toString i
+		+++ " value " +++ safePrint v
+	toString MTEmpty = "Empty message"
+
+bclength :: BC -> Int
+bclength (BCPush _) = 3
+bclength (BCLab _) = 2
+bclength (BCSdsStore _) = 2
+bclength (BCSdsFetch _) = 2
+bclength (BCSdsPublish _) = 2
+bclength (BCAnalogRead _) = 2
+bclength (BCAnalogWrite _) = 2
+bclength (BCDigitalRead _) = 2
+bclength (BCDigitalWrite _) = 2
+bclength (BCJmp i) = 2
+bclength (BCJmpT i) = 2
+bclength (BCJmpF i) = 2
+bclength _ = 1
+
 toByteVal :: BC -> [Char]
 toByteVal b
 # bt = toChar $ consIndex{|*|} b + 1
 = [bt:case b of
 		(BCPush i) = i
+		(BCLab i) = [toChar i]
 		(BCSdsStore i) = [toChar i]
 		(BCSdsFetch i) = [toChar i]
 		(BCSdsPublish i) = [toChar i]
@@ -81,12 +101,12 @@ runBC (BC m) = m
 
 retrn :: ([BC] -> ByteCode a p)
 retrn = BC o tuple
-fmp :: ([BC] -> [BC]) (ByteCode a p) -> ByteCode a p
+fmp :: ([BC] -> [BC]) (ByteCode a p) -> ByteCode a q
 fmp f b = BC \s->let (bc, s`) = runBC b s in (f bc, s`)
 
 instance toByteCode Bool where
-	toByteCode True = [toChar 1]
-	toByteCode False = [toChar 0]
+	toByteCode True = [toChar 0, toChar 1]
+	toByteCode False = [toChar 0, toChar 0]
 instance toByteCode Int where toByteCode n = map toChar [n/256,n rem 256]
 instance toByteCode Long where toByteCode (L n) = toByteCode n
 instance toByteCode Char where toByteCode c = [c]
@@ -94,8 +114,8 @@ instance toByteCode String where toByteCode s = undef
 instance toByteCode Button where toByteCode s = [toChar $ consIndex{|*|} s]
 
 instance toChar Pin where
-	toChar (Digital p) = toChar $ consIndex{|*|} p + 1
-	toChar (Analog p) = toChar $ consIndex{|*|} p + 1
+	toChar (Digital p) = toChar $ consIndex{|*|} p
+	toChar (Analog p) = toChar $ consIndex{|*|} p
 
 derive gPrint BC, AnalogPin, Pin, DigitalPin
 derive consIndex BC, Pin, Button
@@ -127,15 +147,17 @@ instance digitalIO ByteCode where
 	digitalRead p = retrn [BCDigitalRead $ pin p]
 	digitalWrite p b = b <+-> [BCDigitalWrite $ pin p]
 
-instance If ByteCode Stmt 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
-instance If ByteCode Stmt Stmt e where If b t e = BCIfStmt b t e
-instance If ByteCode x y Expr where If b t e = BCIfStmt b t e
+//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
+instance If ByteCode x y Stmt where If b t e = BCIfStmt b t e
 instance IF ByteCode where
 	IF b t e = BCIfStmt b t e
 	(?) b t = BCIfStmt b t $ retrn []
-BCIfStmt b t e = withLabel \else->withLabel \endif->retrn [BCJmpF else] <++> t
-	<++> retrn [BCJmp endif] <++> e <++> retrn [BCLab endif]
+BCIfStmt b t e = 
+	withLabel \else->withLabel \endif->
+	b <++> retrn [BCJmpF else] <++> t
+	<++> retrn [BCJmp endif,BCLab else] <++> e <++> retrn [BCLab endif]
 
 instance noOp ByteCode where noOp = mempty
 
@@ -156,6 +178,7 @@ instance sds ByteCode where
 			in setSDS sds v <++> unMain body
 		}
 	con f = undef
+	pub x = fmp makePub x
 //	pub _ = undef
 
 instance assign ByteCode where
@@ -185,13 +208,22 @@ instance serial ByteCode where
 instance zero BCState where
 	zero = {freshl=[1..], freshs=[1..], sdss=[]}
 
-makeSafe :: Char -> Char
-makeSafe c = c//toChar $ toInt c + 31
 
 toRealByteCode :: (ByteCode a b) -> (String, BCState)
 toRealByteCode x
 # (bc, st) = runBC x zero
-= (concat $ map (toString o map makeSafe o toByteVal) bc, st)
+# (bc, gtmap) = computeGotos bc 1
+= (concat $ map (toString o toByteVal) (map (implGotos gtmap) bc), st)
+
+implGotos map (BCJmp t) = BCJmp $ fromJust ('DM'.get t map)
+implGotos map (BCJmpT t) = BCJmpT $ fromJust ('DM'.get t map)
+implGotos map (BCJmpF t) = BCJmpF $ fromJust ('DM'.get t map)
+implGotos _ i = i
+
+computeGotos :: [BC] Int -> ([BC], 'DM'.Map Int Int)
+computeGotos [] _ = ([], 'DM'.newMap)
+computeGotos [BCLab l:xs] i = appSnd ('DM'.put l i) (computeGotos xs i)
+computeGotos [x:xs] i = appFst (\bc->[x:bc]) (computeGotos xs (i+(bclength x)))
 
 readable :: BC -> String
 readable (BCPush d) = "BCPush " +++ concat (map safe d)
@@ -204,15 +236,19 @@ readable b = printToString b
 toReadableByteCode :: (ByteCode a b) -> (String, BCState)
 toReadableByteCode x
 # (bc, st) = runBC x zero
-= (join "\n" $ map readable bc, st)
+# (bc, gtmap) = computeGotos bc 0
+= (join "\n" $ map readable (map (implGotos gtmap) bc), st)
 
 //Start :: String
 //Start = toReadableByteCode bc
 //	where
 //		bc :: ByteCode Int Expr
 //		bc = (lit 36 +. lit 42) +. lit 44
-toMessages :: Int (String, BCState) -> [MTaskMessage]
-toMessages interval (bytes, {sdss}) = [MTSds i (toString b)\\(i,b)<-sdss] ++ [MTTask interval bytes]
+toMessages :: Int (String, BCState) -> ([MTaskMSGSend], BCState)
+toMessages interval (bytes, st=:{sdss}) = ([MTSds i (toString b)\\(i,b)<-sdss] ++ [MTTask interval bytes], st)
+
+toSDSUpdate :: Int Int -> [MTaskMSGSend]
+toSDSUpdate i v = [MTUpd i (to16bit v)]
 
 Start = toMessages 500 $ toRealByteCode (unMain bc)
 //Start = fst $ toReadableByteCode $ unMain bc
@@ -221,11 +257,11 @@ Start = toMessages 500 $ toRealByteCode (unMain bc)
 			sds \y=4 In
 			{main = If (y ==. lit 0) (pub x) (x =. x *. y :. y =. y -. lit 1)}
 
-pub :: (ByteCode a b) -> ByteCode a b
-pub x = fmp makePub x
+//pub :: (ByteCode a b) -> ByteCode a b
+//pub x = fmp makePub x
 
 to16bit :: Int -> String
-to16bit i = toString (toChar (i/265)) +++ toString (toChar (i rem 265))
+to16bit i = toString (toChar (i/256)) +++ toString (toChar (i rem 256))
 
 from16bit :: String -> Int
-from16bit s = toInt s.[0] * 265 + toInt s.[1]
+from16bit s = toInt s.[0] * 256 + toInt s.[1]