From 82245ee4c9b5e653738fbeb168d245a6f3a5b91b Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Thu, 24 Jun 2010 14:02:25 +0200 Subject: [PATCH] Really revert all of the recent rotating changes. Some minor structural and comment changes were left, no functional changes, though. --- clash/CLasH/VHDL/Generate.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/clash/CLasH/VHDL/Generate.hs b/clash/CLasH/VHDL/Generate.hs index b6aa8c6..c56bdbe 100644 --- a/clash/CLasH/VHDL/Generate.hs +++ b/clash/CLasH/VHDL/Generate.hs @@ -310,9 +310,8 @@ mkConcSm (bndr, expr@(CoreSyn.Case (CoreSyn.Var scrut) _ _ alts)) = do -- Compare the (constructor field of the) scrutinee with each of the -- alternatives. let cond_exprs = map (\x -> cmp AST.:=: x) altcons - -- Rotate expressions to the leftso that the expression related to the default case is the last - let alts' = (tail alts) ++ [head alts] - exprs <- MonadState.lift tsType $ mapM (varToVHDLExpr . (\(_,_,CoreSyn.Var expr) -> expr)) alts' --((tail alts) ++ [head alts]) + -- Rotate expressions to the left, so that the expression related to the default case is the last + exprs <- MonadState.lift tsType $ mapM (varToVHDLExpr . (\(_,_,CoreSyn.Var expr) -> expr)) ((tail alts) ++ [head alts]) return ([mkAltsAssign (Left bndr) cond_exprs exprs], []) mkConcSm (_, CoreSyn.Case _ _ _ _) = error "\nVHDL.mkConcSm: Not in normal form: Case statement does not have a simple variable as scrutinee" -- 2.30.2