From: Christiaan Baaij <christiaan.baaij@gmail.com>
Date: Thu, 13 Aug 2009 15:20:33 +0000 (+0200)
Subject: Merge branch 'cλash' of http://git.stderr.nl/matthijs/projects/master-project
X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Fc%CE%BBash.git;a=commitdiff_plain;h=4e12174b5b6515c056d4f83edcc18b991c71465d

Merge branch 'cλash' of git.stderr.nl/matthijs/projects/master-project

* 'cλash' of http://git.stderr.nl/matthijs/projects/master-project:
  Don't generate a state proc for an empty state.
  Make splitNormalized work for non-recursive lets.
  Add and use splitNormalized helper function.
---

4e12174b5b6515c056d4f83edcc18b991c71465d
diff --cc "c\316\273ash/CLasH/VHDL/Generate.hs"
index 99d5d27,149c6ec..0be4f60
--- "a/c\316\273ash/CLasH/VHDL/Generate.hs"
+++ "b/c\316\273ash/CLasH/VHDL/Generate.hs"
@@@ -44,17 -44,13 +44,15 @@@ getEntity :
  
  getEntity fname = Utils.makeCached fname tsEntities $ do
        expr <- Normalize.getNormalized fname
-       -- Strip off lambda's, these will be arguments
-       let (args, letexpr) = CoreSyn.collectBinders expr
+       -- Split the normalized expression
+       let (args, binds, res) = Normalize.splitNormalized expr
        -- Generate ports for all non-empty types
        args' <- catMaybesM $ mapM mkMap args
-       -- There must be a let at top level 
-       let (CoreSyn.Let binds (CoreSyn.Var res)) = letexpr
        -- TODO: Handle Nothing
        res' <- mkMap res
 -      let vhdl_id = mkVHDLBasicId $ varToString fname ++ "_" ++ varToStringUniq fname
 +      count <- getA tsEntityCounter 
 +      let vhdl_id = mkVHDLBasicId $ varToString fname ++ "Component_" ++ show count
 +      putA tsEntityCounter (count + 1)
        let ent_decl = createEntityAST vhdl_id args' res'
        let signature = Entity vhdl_id args' res' ent_decl
        return signature