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

diff --git a/FlattenTypes.hs b/FlattenTypes.hs
index f75b0d5..ecad1ba 100644
--- a/FlattenTypes.hs
+++ b/FlattenTypes.hs
@@ -96,6 +96,19 @@ 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
@@ -103,6 +116,12 @@ data SignalExpr =
   | 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
@@ -134,6 +153,14 @@ 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,
@@ -193,8 +220,12 @@ addNameHint :: String -> SignalId -> FlattenState ()
 addNameHint hint id = do
   info <- getSignalInfo id
   let hints = nameHints info
-  let hints' = (hint:hints)
-  setSignalInfo id (info {nameHints = hints'})
+  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.
@@ -208,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: