X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=TranslatorTypes.hs;h=1286a41bd55d6846c23074362b8633ecd0cba53c;hb=b8c1e8554ba8aee73bc9d9a54bb3cb32f7930957;hp=70ae9b7e922e486cda209a36ca93fd0563dc22dd;hpb=495e75489457be4ea5bfa9692e2b8736047a41ae;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/TranslatorTypes.hs b/TranslatorTypes.hs
index 70ae9b7..1286a41 100644
--- a/TranslatorTypes.hs
+++ b/TranslatorTypes.hs
@@ -2,51 +2,36 @@
 -- Simple module providing some types used by Translator. These are in a
 -- separate module to prevent circular dependencies in Pretty for example.
 --
+{-# LANGUAGE TemplateHaskell #-}
 module TranslatorTypes where
 
-import qualified Control.Monad.State as State
-import qualified HscTypes
+import qualified Control.Monad.Trans.State as State
 import qualified Data.Map as Map
-import Flatten
+import qualified Data.Accessor.Template
+import Data.Accessor
+
+import qualified HscTypes
+
+import qualified Language.VHDL.AST as AST
+
+import FlattenTypes
+import VHDLTypes
+import HsValueMap
 
 
 -- | A map from a HsFunction identifier to various stuff we collect about a
 --   function along the way.
-type FuncMap  = Map.Map HsFunction FuncData
--- | Some stuff we collect about a function along the way.
-type FuncData = (FlatFunction)
-
-data VHDLSession = VHDLSession {
-  coreMod   :: HscTypes.CoreModule, -- The current module
-  nameCount :: Int,             -- A counter that can be used to generate unique names
-  funcs     :: FuncMap          -- A map from HsFunction to FlatFunction, HWFunction, VHDL Entity and Architecture
+type FlatFuncMap  = Map.Map HsFunction FlatFunction
+
+data TranslatorSession = TranslatorSession {
+  tsCoreModule_ :: HscTypes.CoreModule, -- ^ The current module
+  tsNameCount_ :: Int, -- ^ A counter that can be used to generate unique names
+  tsFlatFuncs_ :: FlatFuncMap -- ^ A map from HsFunction to FlatFunction
 }
 
--- | Add the function to the session
-addFunc :: HsFunction -> FlatFunction -> VHDLState ()
-addFunc hsfunc flatfunc = do
-  fs <- State.gets funcs -- Get the funcs element from the session
-  let fs' = Map.insert hsfunc (flatfunc) fs -- Insert function
-  State.modify (\x -> x {funcs = fs' })
-
--- | Find the given function in the current session
-getFunc :: HsFunction -> VHDLState (Maybe FuncData)
-getFunc hsfunc = do
-  fs <- State.gets funcs -- Get the funcs element from the session
-  return $ Map.lookup hsfunc fs
-
-getModule :: VHDLState HscTypes.CoreModule
-getModule = State.gets coreMod -- Get the coreMod element from the session
-
-type VHDLState = State.State VHDLSession
-
--- Makes the given name unique by appending a unique number.
--- This does not do any checking against existing names, so it only guarantees
--- uniqueness with other names generated by uniqueName.
-uniqueName :: String -> VHDLState String
-uniqueName name = do
-  count <- State.gets nameCount -- Get the funcs element from the session
-  State.modify (\s -> s {nameCount = count + 1})
-  return $ name ++ "_" ++ (show count)
+-- Derive accessors
+$( Data.Accessor.Template.deriveAccessors ''TranslatorSession )
+
+type TranslatorState = State.State TranslatorSession
 
 -- vim: set ts=8 sw=2 sts=2 expandtab: