projects
/
matthijs
/
master-project
/
cλash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the flatfunc in FuncMap optional.
[matthijs/master-project/cλash.git]
/
TranslatorTypes.hs
diff --git
a/TranslatorTypes.hs
b/TranslatorTypes.hs
index 733e65938bf84c20470de758e657be345e0fd990..60d12ebb0c53fd387dd1772861dea48567918cb2 100644
(file)
--- a/
TranslatorTypes.hs
+++ b/
TranslatorTypes.hs
@@
-5,21
+5,38
@@
module TranslatorTypes where
import qualified Control.Monad.State as State
module TranslatorTypes where
import qualified Control.Monad.State as State
+import qualified HscTypes
+import qualified Data.Map as Map
import Flatten
import Flatten
-type FuncMap = [(HsFunction,
- (FlatFunction))]
+
+-- | 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 = (Maybe FlatFunction)
data VHDLSession = VHDLSession {
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
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
-} deriving (Show)
+}
+
+-- | 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 (Nothing) fs -- Insert function
+ State.modify (\x -> x {funcs = fs' })
---
Add the function to the
session
-
addFunc :: HsFunction -> FlatFunction -> VHDLState (
)
-
addFunc hsfunc flat
func = do
+--
| Find the given function in the current
session
+
getFunc :: HsFunction -> VHDLState (Maybe FuncData
)
+
getFunc hs
func = do
fs <- State.gets funcs -- Get the funcs element from the session
fs <- State.gets funcs -- Get the funcs element from the session
- State.modify (\x -> x {funcs = (hsfunc, flatfunc) : fs }) -- Prepend name and f
+ 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
type VHDLState = State.State VHDLSession
@@
-32,3
+49,4
@@
uniqueName name = do
State.modify (\s -> s {nameCount = count + 1})
return $ name ++ "_" ++ (show count)
State.modify (\s -> s {nameCount = count + 1})
return $ name ++ "_" ++ (show count)
+-- vim: set ts=8 sw=2 sts=2 expandtab: