X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=FlattenTypes.hs;h=e77a8aaf3c5e01841f91fa169a5ab205585f322b;hb=4e69cb591dcca330d8f2a8c2e09fa2026c8fc7f2;hp=024db9b5332c6f4d94a22b356ed697d966ab70b8;hpb=668cd4041980db707d6afb0cfb5aed4036b0b46b;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/FlattenTypes.hs b/FlattenTypes.hs
index 024db9b..e77a8aa 100644
--- a/FlattenTypes.hs
+++ b/FlattenTypes.hs
@@ -4,6 +4,7 @@ import Data.Traversable
 import qualified Control.Monad.State as State
 
 import CoreSyn
+import qualified Type
 
 import HsValueMap
 
@@ -75,18 +76,19 @@ data CondDef sigid = CondDef {
 } deriving (Show, Eq)
 
 -- | Information on a signal definition
-data Signal sigid = Signal {
-  id :: sigid
-} deriving (Eq, Show)
+data SignalInfo = SignalInfo {
+  sigName :: Maybe String,
+  sigTy   :: Type.Type
+}
 
 -- | A flattened function
 data FlatFunction' sigid = FlatFunction {
-  args   :: [SignalMap sigid],
-  res    :: SignalMap sigid,
-  apps   :: [FApp sigid],
-  conds  :: [CondDef sigid],
-  sigs   :: [Signal sigid]
-} deriving (Show, Eq)
+  flat_args   :: [SignalMap sigid],
+  flat_res    :: SignalMap sigid,
+  flat_apps   :: [FApp sigid],
+  flat_conds  :: [CondDef sigid],
+  flat_sigs   :: [(sigid, SignalInfo)]
+}
 
 -- | A flat function that does not have its signals named
 type FlatFunction = FlatFunction' UnnamedSignal
@@ -104,7 +106,7 @@ type BindMap = [(
   )]
 
 -- | 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 ()
@@ -119,9 +121,10 @@ addCondDef c = do
   State.put (apps, c:conds, sigs, n)
 
 -- | Generates a new signal id, which is unique within the current flattening.
-genSignalId :: FlattenState UnnamedSignal 
-genSignalId = do
+genSignalId :: Type.Type -> FlattenState UnnamedSignal 
+genSignalId ty = do
   (apps, conds, sigs, n) <- State.get
-  let s = Signal n
+  -- Generate a new numbered but unnamed signal
+  let s = (n, SignalInfo Nothing ty)
   State.put (apps, conds, s:sigs, n+1)
   return n