suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nicer TIMERs

Browse Source
This commit is contained in:
Adam Sampson 2007-04-14 00:29:02 +00:00
parent 2ec22a5c24
commit 23f656eb2b
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fco2/GenerateC.hs
View File

@ -19,9 +19,6 @@ module GenerateC where
-- over the tree). -- over the tree).
-- And array subscripts also. -- And array subscripts also.
-- FIXME: The timer read mess can be cleaned up -- when you declare a timer,
-- that declares the temp variable...
-- FIXME: There should be a wrapper for SetErr that takes a Meta and an error -- FIXME: There should be a wrapper for SetErr that takes a Meta and an error
-- message. Ops and array references should use it. -- message. Ops and array references should use it.
@ -121,6 +118,7 @@ scalarType A.Int32 = Just "int32_t"
scalarType A.Int64 = Just "int64_t" scalarType A.Int64 = Just "int64_t"
scalarType A.Real32 = Just "float" scalarType A.Real32 = Just "float"
scalarType A.Real64 = Just "double" scalarType A.Real64 = Just "double"
scalarType A.Timer = Just "Time"
scalarType _ = Nothing scalarType _ = Nothing
genType :: A.Type -> CGen () genType :: A.Type -> CGen ()
@ -132,7 +130,6 @@ genType (A.UserDataType n) = genName n
genType (A.Chan t) = tell ["Channel *"] genType (A.Chan t) = tell ["Channel *"]
-- Counted -- not used -- Counted -- not used
-- Any -- not used -- Any -- not used
--genType A.Timer =
--genType (A.Port t) = --genType (A.Port t) =
genType t genType t
= case scalarType t of = case scalarType t of
@ -620,7 +617,6 @@ genDimensions ds
tell ["]"] tell ["]"]
genDeclaration :: A.Type -> A.Name -> CGen () genDeclaration :: A.Type -> A.Name -> CGen ()
genDeclaration A.Timer n = return ()
genDeclaration (A.Chan _) n genDeclaration (A.Chan _) n
= do tell ["Channel "] = do tell ["Channel "]
genName n genName n
@ -867,7 +863,7 @@ genInput c im
t <- checkJust $ typeOfVariable ps c t <- checkJust $ typeOfVariable ps c
case t of case t of
A.Timer -> case im of A.Timer -> case im of
A.InputSimple m [A.InVariable m' v] -> genTimerRead v A.InputSimple m [A.InVariable m' v] -> genTimerRead c v
A.InputAfter m e -> genTimerWait e A.InputAfter m e -> genTimerWait e
_ -> case im of _ -> case im of
A.InputSimple m is -> sequence_ $ map (genInputItem c) is A.InputSimple m is -> sequence_ $ map (genInputItem c) is
@ -910,15 +906,15 @@ genInputCaseBody proto c coll (A.OnlyV _ (A.Variant _ n iis p))
genInputCaseBody proto c coll (A.Several _ ss) genInputCaseBody proto c coll (A.Several _ ss)
= sequence_ $ map (genInputCaseBody proto c coll) ss = sequence_ $ map (genInputCaseBody proto c coll) ss
genTimerRead :: A.Variable -> CGen () genTimerRead :: A.Variable -> A.Variable -> CGen ()
genTimerRead v genTimerRead c v
= do n <- makeNonce "time" = do tell ["ProcTime (&"]
tell ["{\n"] genVariable c
tell ["Time ", n, ";\n"] tell [");\n"]
tell ["ProcTime (&", n, ");\n"]
genVariable v genVariable v
tell [" = ", n, ";\n"] tell [" = "]
tell ["}\n"] genVariable c
tell [";\n"]
genTimerWait :: A.Expression -> CGen () genTimerWait :: A.Expression -> CGen ()
genTimerWait e genTimerWait e