Rename fields of SignalInfo.

[matthijs/master-project/cλash.git] / FlattenTypes.hs

diff --git a/FlattenTypes.hs b/FlattenTypes.hs
index c5546eadb9043003981e2c0b1a8b363f8978a9ce..4e2640a8ee7d18520ea0f72333ce0b63bb248385 100644 (file)
--- a/FlattenTypes.hs
+++ b/FlattenTypes.hs
@@ -4,34 +4,15 @@ import Data.Traversable
 import qualified Control.Monad.State as State
 
 import CoreSyn
+import qualified Type
 
 import HsValueMap
 
 -- | A signal identifier
 type UnnamedSignal = Int
 
--- | A use of a signal
-data SignalUse sigid = SignalUse {
-  sigUseId :: sigid
-} deriving (Show, Eq)
-
--- | A def of a signal
-data SignalDef sigid = SignalDef {
-  sigDefId :: sigid
-} deriving (Show, Eq)
-
--- | A map of a Haskell value to signal uses
-type SignalUseMap sigid = HsValueMap (SignalUse sigid)
--- | A map of a Haskell value to signal defs
-type SignalDefMap sigid = HsValueMap (SignalDef sigid)
-
--- | Translate a SignalUseMap to an equivalent SignalDefMap
-useMapToDefMap :: SignalUseMap sigid -> SignalDefMap sigid
-useMapToDefMap = fmap (\(SignalUse u) -> SignalDef u)
-
--- | Translate a SignalDefMap to an equivalent SignalUseMap 
-defMapToUseMap :: SignalDefMap sigid -> SignalUseMap sigid
-defMapToUseMap = fmap (\(SignalDef u) -> SignalUse u)
+-- | A map of a Haskell value to signal ids
+type SignalMap sigid = HsValueMap sigid
 
 -- | How is a given (single) value in a function's type (ie, argument or
 -- return value) used?
@@ -82,26 +63,32 @@ data HsFunction = HsFunction {
 -- | A flattened function application
 data FApp sigid = FApp {
   appFunc :: HsFunction,
-  appArgs :: [SignalUseMap sigid],
-  appRes  :: SignalDefMap sigid
+  appArgs :: [SignalMap sigid],
+  appRes  :: SignalMap sigid
 } deriving (Show, Eq)
 
 -- | A conditional signal definition
 data CondDef sigid = CondDef {
-  cond    :: SignalUse sigid,
-  high    :: SignalUse sigid,
-  low     :: SignalUse sigid,
-  condRes :: SignalDef sigid
+  cond    :: sigid,
+  high    :: sigid,
+  low     :: sigid,
+  condRes :: sigid
 } deriving (Show, Eq)
 
+-- | Information on a signal definition
+data SignalInfo = SignalInfo {
+  sigName :: Maybe String,
+  sigTy   :: Type.Type
+}
+
 -- | A flattened function
 data FlatFunction' sigid = FlatFunction {
-  args   :: [SignalDefMap sigid],
-  res    :: SignalUseMap sigid,
-  --sigs   :: [SignalDef],
+  args   :: [SignalMap sigid],
+  res    :: SignalMap sigid,
   apps   :: [FApp sigid],
-  conds  :: [CondDef sigid]
-} deriving (Show, Eq)
+  conds  :: [CondDef sigid],
+  sigs   :: [(sigid, SignalInfo)]
+}
 
 -- | A flat function that does not have its signals named
 type FlatFunction = FlatFunction' UnnamedSignal
@@ -110,33 +97,34 @@ type FlatFunction = FlatFunction' UnnamedSignal
 type BindMap = [(
   CoreBndr,            -- ^ The bind name
   Either               -- ^ The bind value which is either
-    (SignalUseMap UnnamedSignal)
+    (SignalMap UnnamedSignal)
                        -- ^ a signal
     (
       HsValueUse,      -- ^ or a HighOrder function
-      [SignalUse UnnamedSignal] -- ^ With these signals already applied to it
+      [UnnamedSignal]  -- ^ With these signals already applied to it
     )
   )]
 
 -- | The state during the flattening of a single function
-type FlattenState = State.State ([FApp UnnamedSignal], [CondDef UnnamedSignal], UnnamedSignal)
+type FlattenState = State.State ([FApp UnnamedSignal], [CondDef UnnamedSignal], [(UnnamedSignal, SignalInfo)], UnnamedSignal)
 
 -- | Add an application to the current FlattenState
 addApp :: (FApp UnnamedSignal) -> FlattenState ()
 addApp a = do
-  (apps, conds, n) <- State.get
-  State.put (a:apps, conds, n)
+  (apps, conds, sigs, n) <- State.get
+  State.put (a:apps, conds, sigs, n)
 
 -- | Add a conditional definition to the current FlattenState
 addCondDef :: (CondDef UnnamedSignal) -> FlattenState ()
 addCondDef c = do
-  (apps, conds, n) <- State.get
-  State.put (apps, c:conds, n)
+  (apps, conds, sigs, n) <- State.get
+  State.put (apps, c:conds, sigs, n)
 
 -- | Generates a new signal id, which is unique within the current flattening.
-genSignalId :: FlattenState UnnamedSignal 
-genSignalId = do
-  (apps, conds, n) <- State.get
-  State.put (apps, conds, n+1)
+genSignalId :: Type.Type -> FlattenState UnnamedSignal 
+genSignalId ty = do
+  (apps, conds, sigs, n) <- State.get
+  -- Generate a new numbered but unnamed signal
+  let s = (n, SignalInfo Nothing ty)
+  State.put (apps, conds, s:sigs, n+1)
   return n
-