repositories
/
mTask.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
started with itasks integration
[mTask.git]
/
mTaskInterpret.icl
diff --git
a/mTaskInterpret.icl
b/mTaskInterpret.icl
index
993fa74
..
789c58a
100644
(file)
--- a/
mTaskInterpret.icl
+++ b/
mTaskInterpret.icl
@@
-21,7
+21,7
@@
from Text import class Text(concat,join,toUpperCase), instance Text String
toByteVal :: BC -> [Char]
toByteVal b
toByteVal :: BC -> [Char]
toByteVal b
-# bt = to
BC b
+# bt = to
Char $ consIndex{|*|} b + 1
= [bt:case b of
(BCPush i) = i
(BCAnalogRead i) = [toChar i]
= [bt:case b of
(BCPush i) = i
(BCAnalogRead i) = [toChar i]
@@
-32,8
+32,6
@@
toByteVal b
(BCJmpT i) = [toChar i]
(BCJmpF i) = [toChar i]
_ = []]
(BCJmpT i) = [toChar i]
(BCJmpF i) = [toChar i]
_ = []]
- where
- toBC b = toChar $ consIndex{|*|} b + 1
instance Semigroup (ByteCode a p) where
mappend m n = BC \s->let (b1, (b2, t)) = runBC m <$> runBC m s in (b1 ++ b2, t)
instance Semigroup (ByteCode a p) where
mappend m n = BC \s->let (b1, (b2, t)) = runBC m <$> runBC m s in (b1 ++ b2, t)
@@
-51,11
+49,13
@@
runBC (BC m) = m
retrn :: ([BC] -> ByteCode a p)
retrn = BC o tuple
retrn :: ([BC] -> ByteCode a p)
retrn = BC o tuple
+fmp :: ([BC] -> [BC]) (ByteCode a p) -> ByteCode a p
+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]
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 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]
instance toByteCode String where toByteCode s = undef
instance toByteCode Long where toByteCode (L n) = toByteCode n
instance toByteCode Char where toByteCode c = [c]
instance toByteCode String where toByteCode s = undef
@@
-65,7
+65,7
@@
instance toChar Pin where
toChar (Digital p) = toChar $ consIndex{|*|} p + 1
toChar (Analog p) = toChar $ consIndex{|*|} p + 1
toChar (Digital p) = toChar $ consIndex{|*|} p + 1
toChar (Analog p) = toChar $ consIndex{|*|} p + 1
-derive gPrint BC, AnalogPin, Pin, DigitalPin
+derive gPrint BC, AnalogPin, Pin, DigitalPin
, BCState
derive consIndex BC, Pin, Button
derive consName BC, Pin, Button
derive consIndex BC, Pin, Button
derive consName BC, Pin, Button
@@
-107,7
+107,6
@@
BCIfStmt b t e = withLabel \else->withLabel \endif->retrn [BCJmpF else] <++> t
instance noOp ByteCode where noOp = mempty
instance noOp ByteCode where noOp = mempty
-
withLabel :: (Int -> (ByteCode b q)) -> ByteCode b q
withLabel f = BC \s->let [fresh:fs] = s.freshl
in runBC (f fresh) {s & freshl=fs}
withLabel :: (Int -> (ByteCode b q)) -> ByteCode b q
withLabel f = BC \s->let [fresh:fs] = s.freshl
in runBC (f fresh) {s & freshl=fs}
@@
-117,15
+116,23
@@
withSDS f = BC \s->let [fresh:fs] = s.freshs
in runBC (f fresh) {s & freshs=fs}
instance sds ByteCode where
in runBC (f fresh) {s & freshs=fs}
instance sds ByteCode where
-// sds f = {main = withSDS \sds->
-// let (v In body) = f sds
-// in retrn [BCSdsStore sds]
-// }
- sds f = abort "undef on sds"
+ sds f = {main = withSDS \sds->
+ let (v In body) = f $ retrn [BCSdsFetch sds]
+ in retrn [BCPush $ toByteCode v,BCSdsStore sds] <++> unMain body
+ }
con f = undef
instance assign ByteCode where
con f = undef
instance assign ByteCode where
- (=.) v e = e <++> v
+ (=.) v e = e <++> fmp makeStore v
+
+makeStore [] = []
+makeStore [x:xs] = case x of
+ BCSdsFetch i = [BCSdsStore i:xs]
+ y = [y:xs]
+
+instance seq ByteCode where
+ (>>=.) _ _ = abort "undef on >>=."
+ (:.) x y = x <++> y
instance serial ByteCode where
serialAvailable = retrn [BCSerialAvail]
instance serial ByteCode where
serialAvailable = retrn [BCSerialAvail]
@@
-147,10
+154,6
@@
toReadableByteCode x
# (bc, st) = runBC x zero
= join "\n" $ map printToString bc
# (bc, st) = runBC x zero
= join "\n" $ map printToString bc
-toReadableByteVal :: BC -> String
-toReadableByteVal a = printToString a
-
-
//Start :: String
//Start = toReadableByteCode bc
// where
//Start :: String
//Start = toReadableByteCode bc
// where
@@
-159,9
+162,12
@@
toReadableByteVal a = printToString a
Start :: String
Start = toReadableByteCode $ unMain bc
Start :: String
Start = toReadableByteCode $ unMain bc
+//Start = toRealByteCode $ unMain bc
where
bc :: Main (ByteCode Int Expr)
where
bc :: Main (ByteCode Int Expr)
- bc = sds \x=46 In {main = x =. x +. lit 31}
+ bc = sds \x=41 In
+ sds \y=1 In
+ {main = x =. x +. y}
//to16bit :: Int -> String
//to16bit i = toString (toChar (i/265)) +++ toString (toChar (i rem 265))
//to16bit :: Int -> String
//to16bit i = toString (toChar (i/265)) +++ toString (toChar (i rem 265))