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
Allow a FlatFunction to be named as well as unnamed.
[matthijs/master-project/cλash.git]
/
TranslatorTypes.hs
diff --git
a/TranslatorTypes.hs
b/TranslatorTypes.hs
index 8e24541eb6317efa38d5756466bf6b393c3465bf..cad096bff8c692ec03437ff4e6fe4e7b6818d1b0 100644
(file)
--- a/
TranslatorTypes.hs
+++ b/
TranslatorTypes.hs
@@
-7,16
+7,23
@@
module TranslatorTypes where
import qualified Control.Monad.State as State
import qualified HscTypes
import qualified Data.Map as Map
import qualified Control.Monad.State as State
import qualified HscTypes
import qualified Data.Map as Map
-import Flatten
+import FlattenTypes
+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
-- | A map from a HsFunction identifier to various stuff we collect about a
-- function along the way.
type FuncMap = Map.Map HsFunction FuncData
+-- | A signal that has been assigned a (unique) name
+data NamedSignal = NamedSignal String
+
+-- | A function in which all signals have been assigned unique names
+type NamedFlatFunction = FlatFunction' NamedSignal
+
-- | Some stuff we collect about a function along the way.
data FuncData = FuncData {
-- | Some stuff we collect about a function along the way.
data FuncData = FuncData {
- flatFunc :: Maybe
FlatFunction
+ flatFunc :: Maybe
(Either FlatFunction NamedFlatFunction)
}
data VHDLSession = VHDLSession {
}
data VHDLSession = VHDLSession {
@@
-39,7
+46,7
@@
getFunc hsfunc = do
return $ Map.lookup hsfunc fs
-- | Sets the FlatFunction for the given HsFunction in the given setting.
return $ Map.lookup hsfunc fs
-- | Sets the FlatFunction for the given HsFunction in the given setting.
-setFlatFunc :: HsFunction ->
FlatFunction
-> VHDLState ()
+setFlatFunc :: HsFunction ->
(Either FlatFunction NamedFlatFunction)
-> 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
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