X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=mTaskInterpret.icl;h=886f463529f73821d8fbec6f3c2f138a061df72b;hb=c884100c832f235445d6a004c39db17ef83bb286;hp=d689b5fbd3690d5049a686b76afaf5e0f0b96851;hpb=8316870cacd21b19badf032f3b8189bdd54eb1e3;p=mTask.git

diff --git a/mTaskInterpret.icl b/mTaskInterpret.icl
index d689b5f..886f463 100644
--- a/mTaskInterpret.icl
+++ b/mTaskInterpret.icl
@@ -14,21 +14,38 @@ import StdTuple
 import Data.Tuple
 import StdList
 from Data.Func import $
-from Text import class Text(join,toUpperCase), instance Text String
-
-toByteVal :: BC -> String
-toByteVal a = undef
-
-derive gPrint BC, AnalogPin
-derive consIndex BC
-derive consName BC
-derive conses BC, AnalogPin
+from Text import class Text(concat,join,toUpperCase), instance Text String
+
+toByteVal :: BC -> [Char]
+toByteVal b
+# bt = toByteCode 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]
+		(BCJmp i) = [toChar i]
+		(BCJmpT i) = [toChar i]
+		(BCJmpF i) = [toChar i]
+		_ = []]
+	where
+		toByteCode b = toChar $ consIndex{|*|} b + 1
+
+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
 
 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]
@@ -46,12 +63,16 @@ instance boolExpr ByteCode where
 	(>=.) x y = x <++> y <+-> [BCGeq]
 
 instance analogIO ByteCode where
-	analogRead p = BC [BCAnalogRead p]
-	analogWrite p b = b <+-> [BCAnalogWrite p]
+	analogRead p = BC [BCAnalogRead $ pin p]
+	analogWrite p b = b <+-> [BCAnalogWrite $ pin p]
+
+instance digitalIO ByteCode where
+	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
-//instance If ByteCode Stmt Stmt e 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 where
 	IF b t e = BCIfStmt b t e
@@ -81,25 +102,23 @@ instance serial ByteCode where
 instance zero BCState where
 	zero = {a=()}
 
+toRealByteCode :: (ByteCode a Expr) -> String
+toRealByteCode (BC x) = concat $ map (toString o toByteVal) x
+
 //Start :: ByteCode Int Expr
 //Start = (lit 36 +. lit 42) +. lit 84
 
-(<+) infixr 5 :: a b -> String | toString a & toString b
-(<+) a b = toString a +++ toString b
+to16bit :: Int -> String
+to16bit i = toString (toChar (i/265)) +++ toString (toChar (i rem 265))
 
 //Run test programma en pretty print
-Start :: ByteCode Int Expr
-Start = analogRead A0
+Start :: String
+Start = "t" +++ to16bit (size b) +++ b
+//Start :: ByteCode Int Expr
+//Start = bc
+	where
+		bc = If (lit True) (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)
-
-//Generate header file
-//Start w
-//# (io, w) = stdio w
-//# io = io <<< "#ifndef MTASK_H\n#define MTASK_H\n"
-//# io = io <<< join "\n" ["#define " <+ toUpperCase (consName{|*|} x) <+ " " <+ consIndex{|*|} x\\x<-allBC]
-//	with
-//		allBC :: [BC]
-//		allBC = conses{|*|}
-//# (ok, w) = fclose (io <<< "\n#endif\n") w
-//| not ok = abort "Couldn't close stdio"
-//= w