X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=FlattenTypes.hs;h=4e2640a8ee7d18520ea0f72333ce0b63bb248385;hb=85ee6f8e10f7dcc73db62a55a07d924bc002f216;hp=b14ef387dc6f1300a0742a9ea2001f5f17ff4416;hpb=790cb87bc728be4140ea7cf0d5444cc4cf96d0dc;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/FlattenTypes.hs b/FlattenTypes.hs
index b14ef38..4e2640a 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,10 +76,10 @@ data CondDef sigid = CondDef {
 } deriving (Show, Eq)
 
 -- | Information on a signal definition
-data Signal sigid = Signal {
-  id :: sigid,
-  name :: Maybe String
-} deriving (Eq, Show)
+data SignalInfo = SignalInfo {
+  sigName :: Maybe String,
+  sigTy   :: Type.Type
+}
 
 -- | A flattened function
 data FlatFunction' sigid = FlatFunction {
@@ -86,8 +87,8 @@ data FlatFunction' sigid = FlatFunction {
   res    :: SignalMap sigid,
   apps   :: [FApp sigid],
   conds  :: [CondDef sigid],
-  sigs   :: [Signal sigid]
-} deriving (Show, Eq)
+  sigs   :: [(sigid, SignalInfo)]
+}
 
 -- | A flat function that does not have its signals named
 type FlatFunction = FlatFunction' UnnamedSignal
@@ -105,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 ()
@@ -120,10 +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
   -- Generate a new numbered but unnamed signal
-  let s = Signal n Nothing
+  let s = (n, SignalInfo Nothing ty)
   State.put (apps, conds, s:sigs, n+1)
   return n