X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=c%CE%BBash%2FCLasH%2FNormalize%2FNormalizeTypes.hs;h=2383cdf7086c8abc8a7d6c9653134ae8625e3552;hb=fcadaad2e47e5f6cba4b9f7d4341477b8fe74158;hp=56cba91a411666a078e0eed852ffe5c084fea0f9;hpb=ec4378a8a765c5a064b5cbed347b40c353c778a0;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git "a/c\316\273ash/CLasH/Normalize/NormalizeTypes.hs" "b/c\316\273ash/CLasH/Normalize/NormalizeTypes.hs"
index 56cba91..2383cdf 100644
--- "a/c\316\273ash/CLasH/Normalize/NormalizeTypes.hs"
+++ "b/c\316\273ash/CLasH/Normalize/NormalizeTypes.hs"
@@ -1,5 +1,5 @@
 {-# LANGUAGE TemplateHaskell #-}
-module NormalizeTypes where
+module CLasH.Normalize.NormalizeTypes where
 
 
 -- Standard modules
@@ -13,26 +13,14 @@ import Debug.Trace
 
 -- GHC API
 import CoreSyn
-import qualified UniqSupply
 import qualified VarSet
 import Outputable ( Outputable, showSDoc, ppr )
 
 -- Local imports
-import CoreShow
-import Pretty
-import VHDLTypes -- For TypeState
+import CLasH.Utils.Core.CoreShow
+import CLasH.Utils.Pretty
+import CLasH.Translator.TranslatorTypes
 
-data TransformState = TransformState {
-    tsUniqSupply_ :: UniqSupply.UniqSupply
-  , tsBindings_ :: Map.Map CoreBndr CoreExpr
-  , tsNormalized_ :: VarSet.VarSet -- ^ The binders that have been normalized
-  , tsType_ :: TypeState
-}
-
-$( Data.Accessor.Template.deriveAccessors ''TransformState )
-
--- A session of multiple transformations over multiple expressions
-type TransformSession = (State.State TransformState)
 -- Wrap a writer around a TransformSession, to run a single transformation
 -- over a single expression and track if the expression was changed.
 type TransformMonad = Writer.WriterT Monoid.Any TransformSession