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 signals in a map.
[matthijs/master-project/cλash.git]
/
FlattenTypes.hs
diff --git
a/FlattenTypes.hs
b/FlattenTypes.hs
index b14ef387dc6f1300a0742a9ea2001f5f17ff4416..7838dcdcbc28563fa7f77d54063e21183b9a3cd6 100644
(file)
--- a/
FlattenTypes.hs
+++ b/
FlattenTypes.hs
@@
-75,8
+75,7
@@
data CondDef sigid = CondDef {
} deriving (Show, Eq)
-- | Information on a signal definition
} deriving (Show, Eq)
-- | Information on a signal definition
-data Signal sigid = Signal {
- id :: sigid,
+data SignalInfo = SignalInfo {
name :: Maybe String
} deriving (Eq, Show)
name :: Maybe String
} deriving (Eq, Show)
@@
-86,7
+85,7
@@
data FlatFunction' sigid = FlatFunction {
res :: SignalMap sigid,
apps :: [FApp sigid],
conds :: [CondDef sigid],
res :: SignalMap sigid,
apps :: [FApp sigid],
conds :: [CondDef sigid],
- sigs :: [
Signal sigid
]
+ sigs :: [
(sigid, SignalInfo)
]
} deriving (Show, Eq)
-- | A flat function that does not have its signals named
} deriving (Show, Eq)
-- | A flat function that does not have its signals named
@@
-105,7
+104,7
@@
type BindMap = [(
)]
-- | The state during the flattening of a single function
)]
-- | The state during the flattening of a single function
-type FlattenState = State.State ([FApp UnnamedSignal], [CondDef UnnamedSignal], [
Signal UnnamedSignal
], UnnamedSignal)
+type FlattenState = State.State ([FApp UnnamedSignal], [CondDef UnnamedSignal], [
(UnnamedSignal, SignalInfo)
], UnnamedSignal)
-- | Add an application to the current FlattenState
addApp :: (FApp UnnamedSignal) -> FlattenState ()
-- | Add an application to the current FlattenState
addApp :: (FApp UnnamedSignal) -> FlattenState ()
@@
-124,6
+123,6
@@
genSignalId :: FlattenState UnnamedSignal
genSignalId = do
(apps, conds, sigs, n) <- State.get
-- Generate a new numbered but unnamed signal
genSignalId = do
(apps, conds, sigs, n) <- State.get
-- Generate a new numbered but unnamed signal
- let s =
Signal n Nothing
+ let s =
(n, SignalInfo Nothing)
State.put (apps, conds, s:sigs, n+1)
return n
State.put (apps, conds, s:sigs, n+1)
return n