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

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index 886f463..fff57e4 100644
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -22,7 +22,6 @@ toByteVal b
 = [bt:case b of
 		(BCPush i) = [toChar i]
 		(BCAnalogRead i) = [toChar i]
-		(BCAnalogRead i) = [toChar i]
 		(BCAnalogWrite i) = [toChar i]
 		(BCDigitalRead i) = [toChar i]
 		(BCDigitalWrite i) = [toChar i]
@@ -33,19 +32,28 @@ toByteVal b
 	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
-derive consName BC, Pin
+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 $ 1]
+	lit x = BC [BCPush 1]
 	(+.) x y = x <++> y <+-> [BCAdd]
 	(-.) x y = x <++> y <+-> [BCSub]
 	(*.) x y = x <++> y <+-> [BCMul]
@@ -82,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]
@@ -112,12 +128,12 @@ to16bit :: Int -> String
 to16bit i = toString (toChar (i/265)) +++ toString (toChar (i rem 265))
 
 //Run test programma en pretty print
-Start :: String
-Start = "t" +++ to16bit (size b) +++ b
-//Start :: ByteCode Int Expr
-//Start = bc
+//Start :: String
+//Start = "t" +++ to16bit (size b) +++ b
+Start :: Main (ByteCode Int Expr)
+Start = bc
 	where
-		bc = If (lit True) (analogRead A1) (analogRead A0)
+		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)