[get rid of extra annotation pass, perform full type analysis again right after method expansion
John Meacham <john@repetae.net>**20060419044720] hunk ./Main.hs 292
-        progress "eta annotating"
+        --progress "eta annotating"
hunk ./Main.hs 520
-        let initMap = fromList [ (tvrIdent t, Just (EVar t)) | (t,_) <- programDs prog, not $ t `Set.member` tmap]
-            tmap = Set.fromList [ t | (t,_) <- es' ]
-        let Identity es'' = annotateDs initMap (idann mempty (hoProps ho) ) letann lamann es'
-        es' <- return [ (y,floatInward undefined z) |  (y,z) <- es'' ]
+        --let initMap = fromList [ (tvrIdent t, Just (EVar t)) | (t,_) <- programDs prog, not $ t `Set.member` tmap]
+        --    tmap = Set.fromList [ t | (t,_) <- es' ]
+        --let Identity es'' = annotateDs initMap (idann mempty (hoProps ho) ) letann lamann es'
+        es' <- return [ (y,floatInward undefined z) |  (y,z) <- es' ]
hunk ./Main.hs 530
-    prog <- programPrune prog
hunk ./Main.hs 533
+        prog <- programPrune prog
hunk ./Main.hs 552
-    progress "Annotate After prune"
-    prog <- return $ runIdentity $ annotateProgram mempty (idann mempty (hoProps ho) ) letann lamann prog
+    --progress "Annotate After prune"
+    --prog <- return $ runIdentity $ annotateProgram mempty (idann mempty (hoProps ho) ) letann lamann prog
hunk ./Main.hs 555
+    prog <- transformProgram "typeAnalyze after method" False True (typeAnalyze True) prog
+    prog <- barendregtProg prog
hunk ./Main.hs 564
-    progress "Eta expanding"
hunk ./Main.hs 566
-    progress "Type Analysis"
hunk ./Main.hs 958
+