From: Matthijs Kooijman Date: Tue, 30 Mar 2010 12:59:43 +0000 (+0200) Subject: Let eta expansion use the passed context instead of using notappargs. X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=d54117f6de8d00fe0ce7552c905cf197678d7ed7;p=matthijs%2Fmaster-project%2Fc%CE%BBash.git Let eta expansion use the passed context instead of using notappargs. --- diff --git "a/c\316\273ash/CLasH/Normalize.hs" "b/c\316\273ash/CLasH/Normalize.hs" index fa6ae8c..a5b2a94 100644 --- "a/c\316\273ash/CLasH/Normalize.hs" +++ "b/c\316\273ash/CLasH/Normalize.hs" @@ -48,13 +48,20 @@ import CLasH.Utils.Pretty -- η abstraction -------------------------------- eta, etatop :: Transform +-- Don't apply to expressions that are applied, since that would cause +-- us to apply to our own result indefinitely. +eta (AppFirst:_) expr = return expr +-- Also don't apply to arguments, since this can cause loops with +-- funextract. This isn't the proper solution, but due to an +-- implementation bug in notappargs, this is how it used to work so far. +eta (AppSecond:_) expr = return expr eta c expr | is_fun expr && not (is_lam expr) = do let arg_ty = (fst . Type.splitFunTy . CoreUtils.exprType) expr id <- Trans.lift $ mkInternalVar "param" arg_ty change (Lam id (App expr (Var id))) -- Leave all other expressions unchanged eta c e = return e -etatop = notappargs ("eta", eta) +etatop = everywhere ("eta", eta) -------------------------------- -- β-reduction