projects
/
matthijs
/
master-project
/
cλash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Store the Haskell Type in SignalInfo.
[matthijs/master-project/cλash.git]
/
FlattenTypes.hs
diff --git
a/FlattenTypes.hs
b/FlattenTypes.hs
index 7838dcdcbc28563fa7f77d54063e21183b9a3cd6..c8cd306d077a9eefe48e1cfed5c4ef7a01570b73 100644
(file)
--- a/
FlattenTypes.hs
+++ b/
FlattenTypes.hs
@@
-4,6
+4,7
@@
import Data.Traversable
import qualified Control.Monad.State as State
import CoreSyn
import qualified Control.Monad.State as State
import CoreSyn
+import qualified Type
import HsValueMap
import HsValueMap
@@
-76,8
+77,9
@@
data CondDef sigid = CondDef {
-- | Information on a signal definition
data SignalInfo = SignalInfo {
-- | Information on a signal definition
data SignalInfo = SignalInfo {
- name :: Maybe String
-} deriving (Eq, Show)
+ name :: Maybe String,
+ ty :: Type.Type
+}
-- | A flattened function
data FlatFunction' sigid = FlatFunction {
-- | A flattened function
data FlatFunction' sigid = FlatFunction {
@@
-86,7
+88,7
@@
data FlatFunction' sigid = FlatFunction {
apps :: [FApp sigid],
conds :: [CondDef sigid],
sigs :: [(sigid, SignalInfo)]
apps :: [FApp sigid],
conds :: [CondDef sigid],
sigs :: [(sigid, SignalInfo)]
-}
deriving (Show, Eq)
+}
-- | A flat function that does not have its signals named
type FlatFunction = FlatFunction' UnnamedSignal
-- | A flat function that does not have its signals named
type FlatFunction = FlatFunction' UnnamedSignal
@@
-119,10
+121,10
@@
addCondDef c = do
State.put (apps, c:conds, sigs, n)
-- | Generates a new signal id, which is unique within the current flattening.
State.put (apps, c:conds, sigs, n)
-- | Generates a new signal id, which is unique within the current flattening.
-genSignalId :: FlattenState UnnamedSignal
-genSignalId = do
+genSignalId ::
Type.Type ->
FlattenState UnnamedSignal
+genSignalId
ty
= do
(apps, conds, sigs, n) <- State.get
-- Generate a new numbered but unnamed signal
(apps, conds, sigs, n) <- State.get
-- Generate a new numbered but unnamed signal
- let s = (n, SignalInfo Nothing)
+ let s = (n, SignalInfo Nothing
ty
)
State.put (apps, conds, s:sigs, n+1)
return n
State.put (apps, conds, s:sigs, n+1)
return n