Put a TypeState in TransformState.

This will allow transforms to test if a Type is representable in VHDL.

diff --git a/NormalizeTools.hs b/NormalizeTools.hs
index 4eedb15c6be6505c4e28e41ef2b6a5cf1cbf88d2..1785eedc9430b675b7023a7dbf50d45f58d8bab4 100644 (file)
--- a/NormalizeTools.hs
+++ b/NormalizeTools.hs
@@ -234,5 +234,4 @@ substitute ((b, e):subss) expr = substitute subss' expr'
 -- Run a given TransformSession. Used mostly to setup the right calls and
 -- an initial state.
 runTransformSession :: UniqSupply.UniqSupply -> TransformSession a -> a
-runTransformSession uniqSupply session = State.evalState session initState
-                       where initState = TransformState uniqSupply Map.empty VarSet.emptyVarSet
+runTransformSession uniqSupply session = State.evalState session (emptyTransformState uniqSupply)

diff --git a/NormalizeTypes.hs b/NormalizeTypes.hs
index 5c7c24a6e1623805f255c2f61e0122e83709e68d..89ed53d41746d871924bf56ba02787d7e475b961 100644 (file)
--- a/NormalizeTypes.hs
+++ b/NormalizeTypes.hs
@@ -20,12 +20,16 @@ import Outputable ( Outputable, showSDoc, ppr )
 -- Local imports
 import CoreShow
 import Pretty
+import VHDLTypes -- For TypeState
 
 data TransformState = TransformState {
     tsUniqSupply_ :: UniqSupply.UniqSupply
   , tsBindings_ :: Map.Map CoreBndr CoreExpr
   , tsNormalized_ :: VarSet.VarSet -- ^ The binders that have been normalized
+  , tsType_ :: TypeState
 }
+-- Create an (almost) empty TransformState, containing just a UniqSupply.
+emptyTransformState uniqSupply = TransformState uniqSupply Map.empty VarSet.emptyVarSet emptyTypeState
 
 $( Data.Accessor.Template.deriveAccessors ''TransformState )