X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=FlattenTypes.hs;h=092baff4911fdcb6789399ec613c09293fe30f02;hb=9b7d00ad53acfc821840051ef693d87470b4462b;hp=af6289e6588371855c1dc0ef6ef8be838c73fc5a;hpb=d23c70f3fee490d865aae9c5bfcad1bf1e1f565f;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/FlattenTypes.hs b/FlattenTypes.hs
index af6289e..092baff 100644
--- a/FlattenTypes.hs
+++ b/FlattenTypes.hs
@@ -20,7 +20,7 @@ type SignalMap = HsValueMap SignalId
 type StateId = Int
 
 -- | How is a given (single) value in a function's type (ie, argument or
--- return value) used?
+--   return value) used?
 data HsValueUse = 
   Port           -- ^ Use it as a port (input or output)
   | State StateId -- ^ Use it as state (input or output). The int is used to
@@ -92,10 +92,17 @@ data SigDef =
   }
   -- | Unconditional signal definition
   | UncondDef {
-    defSrc :: SignalId,
+    defSrc :: Either SignalId SignalExpr,
     defDst :: SignalId
   } deriving (Show, Eq)
 
+-- | 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)
+
 -- Returns the function used by the given SigDef, if any
 usedHsFunc :: SigDef -> Maybe HsFunction
 usedHsFunc (FApp hsfunc _ _) = Just hsfunc
@@ -150,6 +157,10 @@ signalInfo sigs id = Maybe.fromJust $ lookup id sigs
 -- | A list of binds in effect at a particular point of evaluation
 type BindMap = [(
   CoreBndr,            -- ^ The bind name
+  BindValue            -- ^ The value bound to it
+  )]
+
+type BindValue =
   Either               -- ^ The bind value which is either
     (SignalMap)
                        -- ^ a signal
@@ -157,7 +168,6 @@ type BindMap = [(
       HsValueUse,      -- ^ or a HighOrder function
       [SignalId]       -- ^ With these signals already applied to it
     )
-  )]
 
 -- | The state during the flattening of a single function
 type FlattenState = State.State ([SigDef], [(SignalId, SignalInfo)], SignalId)
@@ -176,3 +186,16 @@ genSignalId use ty = do
   let s = (n, SignalInfo Nothing use ty)
   State.put (defs, s:sigs, n+1)
   return n
+
+-- | Returns the SignalInfo for the given signal. Errors if the signal is not
+--   known in the session.
+getSignalInfo :: SignalId -> FlattenState SignalInfo
+getSignalInfo id = do
+  (defs, sigs, n) <- State.get
+  return $ signalInfo sigs id
+
+setSignalInfo :: SignalId -> SignalInfo -> FlattenState ()
+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)