X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=Translator.hs;h=bb5845b6febe4f5d90185249d9cfcb1ced265d5e;hb=790cb87bc728be4140ea7cf0d5444cc4cf96d0dc;hp=d0738d3f9175a8058d3621bdf17479d52ff3b517;hpb=40ece4d80b50d59c781b9bc157f5379c3a3bb14a;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git

diff --git a/Translator.hs b/Translator.hs
index d0738d3..bb5845b 100644
--- a/Translator.hs
+++ b/Translator.hs
@@ -68,6 +68,7 @@ main =
       mapM addBuiltIn builtin_funcs
       -- Create entities and architectures for them
       mapM processBind binds
+      modFuncs nameFlatFunction
       return $ AST.DesignFile 
         []
         []
@@ -166,6 +167,24 @@ mkHsFunction f ty =
           error $ "Input state type of function " ++ hsname ++ ": " ++ (showSDoc $ ppr state_ty) ++ " does not match output state type: " ++ (showSDoc $ ppr outstate_ty)
       otherwise                -> error $ "Return type of top-level function " ++ hsname ++ " must be a two-tuple containing a state and output ports."
 
+-- | Adds signal names to the given FlatFunction
+nameFlatFunction ::
+  HsFunction
+  -> FuncData
+  -> FuncData
+
+nameFlatFunction hsfunc fdata =
+  let func = flatFunc fdata in
+  case func of
+    -- Skip (builtin) functions without a FlatFunction
+    Nothing -> fdata
+    -- Name the signals in all other functions
+    Just flatfunc ->
+      let s = sigs flatfunc in
+      let s' = map (\(Signal id Nothing) -> Signal id (Just $ "sig_" ++ (show id))) s in
+      let flatfunc' = flatfunc { sigs = s' } in
+      fdata { flatFunc = Just flatfunc' }
+
 -- | Splits a tuple type into a list of element types, or Nothing if the type
 --   is not a tuple type.
 splitTupleType ::