Make the flatfunc in FuncMap optional.

diff --git a/Translator.hs b/Translator.hs
index 5b58232b9845e52ea950c8c1133b33908d4de7fa..ec9334bdfe41e9463df1d684eb6b3c256054911c 100644 (file)
--- a/Translator.hs
+++ b/Translator.hs
@@ -96,7 +96,7 @@ flattenBind bind@(NonRec var expr) = do
   -- Add it to the session
   --addFunc hsfunc hwfunc 
   let flatfunc = flattenFunction hsfunc bind
-  addFunc hsfunc flatfunc
+  addFunc hsfunc
   let used_hsfuncs = map appFunc (apps flatfunc)
   State.mapM resolvFunc used_hsfuncs
   return ()

diff --git a/TranslatorTypes.hs b/TranslatorTypes.hs
index 70ae9b7e922e486cda209a36ca93fd0563dc22dd..60d12ebb0c53fd387dd1772861dea48567918cb2 100644 (file)
--- a/TranslatorTypes.hs
+++ b/TranslatorTypes.hs
@@ -14,7 +14,7 @@ import Flatten
 --   function along the way.
 type FuncMap  = Map.Map HsFunction FuncData
 -- | Some stuff we collect about a function along the way.
-type FuncData = (FlatFunction)
+type FuncData = (Maybe FlatFunction)
 
 data VHDLSession = VHDLSession {
   coreMod   :: HscTypes.CoreModule, -- The current module
@@ -23,10 +23,10 @@ data VHDLSession = VHDLSession {
 }
 
 -- | Add the function to the session
-addFunc :: HsFunction -> FlatFunction -> VHDLState ()
-addFunc hsfunc flatfunc = do
+addFunc :: HsFunction -> VHDLState ()
+addFunc hsfunc = do
   fs <- State.gets funcs -- Get the funcs element from the session
-  let fs' = Map.insert hsfunc (flatfunc) fs -- Insert function
+  let fs' = Map.insert hsfunc (Nothing) fs -- Insert function
   State.modify (\x -> x {funcs = fs' })
 
 -- | Find the given function in the current session