Redo the global (state) structure of the translator.

[matthijs/master-project/cλash.git] / TranslatorTypes.hs

diff --git a/TranslatorTypes.hs b/TranslatorTypes.hs
index 75967c2d4c94e1672feed90ea6d1b715cc056c4d..37e86190a63f36b1b38acf1c75b193cda7fbdb44 100644 (file)
--- a/TranslatorTypes.hs
+++ b/TranslatorTypes.hs
@@ -2,13 +2,18 @@
 -- 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 Control.Monad.Trans.State as State
 import qualified Data.Map as Map
+import qualified Data.Accessor.Template
+import Data.Accessor
 
 import qualified HscTypes
 
+import qualified ForSyDe.Backend.VHDL.AST as AST
+
 import FlattenTypes
 import VHDLTypes
 import HsValueMap
@@ -16,59 +21,17 @@ 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.
-data FuncData = FuncData {
-  flatFunc :: Maybe FlatFunction,
-  entity   :: Maybe Entity
-}
+type FlatFuncMap  = Map.Map HsFunction 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
+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 -> VHDLState ()
-addFunc hsfunc = do
-  fs <- State.gets funcs -- Get the funcs element from the session
-  let fs' = Map.insert hsfunc (FuncData Nothing Nothing) 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
-
--- | Sets the FlatFunction for the given HsFunction in the given setting.
-setFlatFunc :: HsFunction -> FlatFunction -> VHDLState ()
-setFlatFunc hsfunc flatfunc = do
-  fs <- State.gets funcs -- Get the funcs element from the session
-  let fs'= Map.adjust (\d -> d { flatFunc = Just flatfunc }) hsfunc fs
-  State.modify (\x -> x {funcs = fs' })
-
--- | Modify all functions in the map using the given function
-modFuncs :: (HsFunction -> FuncData -> FuncData) -> VHDLState ()
-modFuncs f = do
-  fs <- State.gets funcs -- Get the funcs element from the session
-  let fs' = Map.mapWithKey f fs
-  State.modify (\x -> x {funcs = fs' })
-
-getModule :: VHDLState HscTypes.CoreModule
-getModule = State.gets coreMod -- Get the coreMod element from the session
-
-type VHDLState = State.State VHDLSession
+-- Derive accessors
+$( Data.Accessor.Template.deriveAccessors ''TranslatorSession )
 
--- 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)
+type TranslatorState = State.State TranslatorSession
 
 -- vim: set ts=8 sw=2 sts=2 expandtab: