X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=FlattenTypes.hs;h=ecad1badaa754382bc9c51b16b08f2532004d7a0;hb=ee868ded42dccf7679190420e8d348aa8d727b98;hp=c7e0c1e79e6eca5c771c455052b2860b467ca870;hpb=1e30fe04f4c285970ad2d5e23930dd935b4214fa;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/FlattenTypes.hs b/FlattenTypes.hs
index c7e0c1e..ecad1ba 100644
--- a/FlattenTypes.hs
+++ b/FlattenTypes.hs
@@ -96,11 +96,32 @@ data SigDef =
     defDst :: SignalId
   } deriving (Show, Eq)
 
+-- | Is the given SigDef a FApp?
+is_FApp :: SigDef -> Bool
+is_FApp d = case d of  
+  (FApp _ _ _) -> True
+  _ -> False
+
+-- | Which signals are used by the given SigDef?
+sigDefUses :: SigDef -> [SignalId]
+sigDefUses (UncondDef (Left id) _) = [id]
+sigDefUses (UncondDef (Right expr) _) = sigExprUses expr
+sigDefUses (CondDef cond true false _) = [cond, true, false]
+sigDefUses (FApp _ args _) = concat $ map Foldable.toList args
+
 -- | An expression on signals
 data SignalExpr = 
   EqLit SignalId String -- ^ Is the given signal equal to the given (VHDL) literal
+  | Literal String -- ^ A literal value
+  | Eq SignalId SignalId -- ^ A comparison between to signals
   deriving (Show, Eq)
 
+-- | Which signals are used by the given SignalExpr?
+sigExprUses :: SignalExpr -> [SignalId]
+sigExprUses (EqLit id _) = [id]
+sigExprUses (Literal _) = []
+sigExprUses (Eq a b) = [a, b]
+
 -- Returns the function used by the given SigDef, if any
 usedHsFunc :: SigDef -> Maybe HsFunction
 usedHsFunc (FApp hsfunc _ _) = Just hsfunc
@@ -132,11 +153,20 @@ isInternalSigUse :: SigUse -> Bool
 isInternalSigUse SigInternal = True
 isInternalSigUse _ = False
 
+oldStateId :: SigUse -> Maybe StateId
+oldStateId (SigStateOld id) = Just id
+oldStateId _ = Nothing
+
+newStateId :: SigUse -> Maybe StateId
+newStateId (SigStateNew id) = Just id
+newStateId _ = Nothing
+
 -- | Information on a signal definition
 data SignalInfo = SignalInfo {
   sigName :: Maybe String,
   sigUse  :: SigUse,
-  sigTy   :: Type.Type
+  sigTy   :: Type.Type,
+  nameHints :: [String]
 }
 
 -- | A flattened function
@@ -181,10 +211,22 @@ genSignalId :: SigUse -> Type.Type -> FlattenState SignalId
 genSignalId use ty = do
   (defs, sigs, n) <- State.get
   -- Generate a new numbered but unnamed signal
-  let s = (n, SignalInfo Nothing use ty)
+  let s = (n, SignalInfo Nothing use ty [])
   State.put (defs, s:sigs, n+1)
   return n
 
+-- | Add a name hint to the given signal
+addNameHint :: String -> SignalId -> FlattenState ()
+addNameHint hint id = do
+  info <- getSignalInfo id
+  let hints = nameHints info
+  if hint `elem` hints
+    then do
+      return ()
+    else do
+      let hints' = (hint:hints)
+      setSignalInfo id (info {nameHints = hints'})
+
 -- | Returns the SignalInfo for the given signal. Errors if the signal is not
 --   known in the session.
 getSignalInfo :: SignalId -> FlattenState SignalInfo
@@ -197,3 +239,5 @@ setSignalInfo id' info' = do
   (defs, sigs, n) <- State.get
   let sigs' = map (\(id, info) -> (id, if id == id' then info' else info)) sigs
   State.put (defs, sigs', n)
+
+-- vim: set ts=8 sw=2 sts=2 expandtab: