X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=mTaskInterpret.icl;h=fff57e430884b23d727fbebfc3994d1b5ad80bbe;hb=73d6866bdbab8f393b53c9951b05b62005a5423a;hp=9a51e0c8eaa9ced1bf095004f3f358357e46cc53;hpb=affe94d7d6708fa81a70cae47277cea2a45ee790;p=mTask.git

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index 9a51e0c..fff57e4 100644
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -16,18 +16,44 @@ import StdList
 from Data.Func import $
 from Text import class Text(concat,join,toUpperCase), instance Text String
 
-toByteVal :: BC -> String
-toByteVal a = toString $ toChar $ consIndex{|*|} a
-
-derive gPrint BC, AnalogPin
-derive consIndex BC
-derive consName BC
+toByteVal :: BC -> [Char]
+toByteVal b
+# bt = toByteCode b
+= [bt:case b of
+		(BCPush i) = [toChar i]
+		(BCAnalogRead i) = [toChar i]
+		(BCAnalogWrite i) = [toChar i]
+		(BCDigitalRead i) = [toChar i]
+		(BCDigitalWrite i) = [toChar i]
+		(BCJmp i) = [toChar i]
+		(BCJmpT i) = [toChar i]
+		(BCJmpF i) = [toChar i]
+		_ = []]
+	where
+		toByteCode b = toChar $ consIndex{|*|} b + 1
+
+instance toByteCode Bool where
+	toByteCode True = [toChar 1]
+	toByteCode False = [toChar 0]
+instance toByteCode Int where toByteCode n = map toChar [n/(2<<7),n rem 265]
+instance toByteCode Long where toByteCode (L n) = toByteCode n
+instance toByteCode Char where toByteCode c = [c]
+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
+
+derive gPrint BC, AnalogPin, Pin, DigitalPin
+derive consIndex BC, Pin, Button
+derive consName BC, Pin, Button
 
 toReadableByteVal :: BC -> String
 toReadableByteVal a = printToString a
 
 instance arith ByteCode where
-	lit x = BC [BCPush $ toCode x]
+	lit x = BC [BCPush 1]
 	(+.) x y = x <++> y <+-> [BCAdd]
 	(-.) x y = x <++> y <+-> [BCSub]
 	(*.) x y = x <++> y <+-> [BCMul]
@@ -45,12 +71,12 @@ instance boolExpr ByteCode where
 	(>=.) x y = x <++> y <+-> [BCGeq]
 
 instance analogIO ByteCode where
-	analogRead p = BC [BCAnalogRead $ toCode p]
-	analogWrite p b = b <+-> [BCAnalogWrite $ toCode p]
+	analogRead p = BC [BCAnalogRead $ pin p]
+	analogWrite p b = b <+-> [BCAnalogWrite $ pin p]
 
 instance digitalIO ByteCode where
-	digitalRead p = BC [BCDigitalRead $ toCode p]
-	digitalWrite p b = b <+-> [BCDigitalWrite $ toCode p]
+	digitalRead p = BC [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
@@ -64,6 +90,14 @@ BCIfStmt b t e = b <+-> [BCJmpF $ length <$> t + 1] <++> t
 
 instance noOp ByteCode where noOp = BC []
 
+instance sds ByteCode where
+	sds f = undef/*{main = 
+			let var = 42
+			    (v In body) = f var
+			in unMain body
+		}*/
+	con f = undef
+
 instance serial ByteCode where
 	serialAvailable = BC [BCSerialAvail]
 	serialPrint s = BC [BCSerialPrint]
@@ -85,13 +119,22 @@ instance zero BCState where
 	zero = {a=()}
 
 toRealByteCode :: (ByteCode a Expr) -> String
-toRealByteCode (BC x) = concat $ map toByteVal x
+toRealByteCode (BC x) = concat $ map (toString o toByteVal) x
 
 //Start :: ByteCode Int Expr
 //Start = (lit 36 +. lit 42) +. lit 84
 
+to16bit :: Int -> String
+to16bit i = toString (toChar (i/265)) +++ toString (toChar (i rem 265))
+
 //Run test programma en pretty print
-Start = toRealByteCode $ If (lit True) (analogRead A1) (analogRead A0)
+//Start :: String
+//Start = "t" +++ to16bit (size b) +++ b
+Start :: Main (ByteCode Int Expr)
+Start = bc
+	where
+		bc = sds \x=43 In {main = If (x ==. lit 42) (analogRead A1) (analogRead A0)}
+		b = toRealByteCode bc
 //Start :: ByteCode Int Expr
 //Start = If (lit True) (analogRead A1) (analogRead A0)
 //Start = If ((lit 36) ==. (lit 42)) (noOp) (noOp)