[perform eta expansing during normal SSimplify pass
John Meacham <john@repetae.net>**20060310022522] hunk ./E/Eta.hs 2
-    etaExpand,
-    etaExpandE,
hunk ./E/Eta.hs 95
+etaExpandAp _ _ [] = return Nothing  -- so simple renames don't get eta-expanded
hunk ./E/SSimplify.hs 14
-import Support.CanType
+import C.Prims
hunk ./E/SSimplify.hs 16
+import Doc.PPrint
hunk ./E/SSimplify.hs 18
-import C.Prims
hunk ./E/SSimplify.hs 19
-import Doc.PPrint
+import E.Eta
hunk ./E/SSimplify.hs 26
-import Support.FreeVars
hunk ./E/SSimplify.hs 29
-import Util.NameMonad
+import Name.VConsts
hunk ./E/SSimplify.hs 36
+import Support.CanType
+import Support.FreeVars
hunk ./E/SSimplify.hs 39
-import Name.VConsts
+import Util.NameMonad
hunk ./E/SSimplify.hs 485
-                Just (IsBoundTo LoopBreaker _) -> app (EVar v,xs')
+                Just (IsBoundTo LoopBreaker _) -> appVar v xs'
hunk ./E/SSimplify.hs 499
-                Just _ -> app (EVar v,xs')
-                Nothing  -> app (EVar v,xs')
+                Just _ -> appVar v xs'
+                Nothing  -> appVar v xs'
hunk ./E/SSimplify.hs 508
+    appVar v xs = do
+        me <- etaExpandAp (so_dataTable sopts) v xs
+        case me of
+            Just e -> return e
+            Nothing -> app (EVar v,xs)
hunk ./Main.hs 25
-import E.Eta
hunk ./Main.hs 258
-            let (e',stat') = Stats.runStatM $ etaExpandE (progDataTable prog) e
-            Stats.tickStat stats stat'
-            let (stat, e'') = SS.simplifyE sopt e'
+            let (stat, e'') = SS.simplifyE sopt e
hunk ./Main.hs 464
-    prog <- etaExpand prog
hunk ./Main.hs 466
-    --prog <- return $ programSetE ne prog