[make sure everything is renamed properly
John Meacham <john@repetae.net>**20051011023140] hunk ./Main.hs 60
-import qualified Util.Histogram as Histogram
hunk ./Main.hs 129
-    let f (ds,used) (v,lc) = ((v,lc'):ds,used `mappend` used') where
-            (lc',used') = runRename used lc
-        (nds,allUsed) = foldl f ([],Set.empty) (Map.elems $ hoEs ho)
-    let Identity (ELetRec ds (ESort EStar)) = annotate imap (idann (hoRules ho) (hoProps ho) ) letann lamann (ELetRec nds eStar)
+    --let f (ds,used) (v,lc) = ((v,lc'):ds,used `mappend` used') where
+    --        (lc',used') = runRename used lc
+    --    (nds,allUsed) = foldl f ([],Set.empty) (Map.elems $ hoEs ho)
+    let Identity (ELetRec ds (ESort EStar)) = annotate imap (idann (hoRules ho) (hoProps ho) ) letann lamann (ELetRec (Map.elems $ hoEs ho) eStar)
hunk ./Main.hs 134
-    return ho { hoEs = Map.fromList [ (runIdentity $ fromId (tvrIdent v),d) |  d@(v,_) <- ds ], hoUsedIds = allUsed }
+    return ho { hoEs = Map.fromList [ (runIdentity $ fromId (tvrIdent v),d) |  d@(v,_) <- ds ] }
hunk ./Main.hs 176
-        let (lc',used') = runRename usedIds lc
-        return ((n, shouldBeExported exports v,lc'):ds,usedIds `mappend` used')
-    (ds,allIds) <- foldM procE ([],hoUsedIds ho) ds
+        let used' = collectIds lc
+        --let (lc',used') = runRename usedIds lc
+        return ((n, shouldBeExported exports v,lc):ds,usedIds `mappend` used')
+    (ds,_allIds) <- foldM procE ([],hoUsedIds ho) ds
hunk ./Main.hs 183
-    let f (ds,(smap,annmap,idHist')) (rec,ns) = do
+    let f (retds,(smap,annmap,idHist')) (rec,ns) = do
hunk ./Main.hs 188
-        putStrLn "*** After annotate"
-        wdump FD.Lambdacube $ mapM_ (\ (v,lc) -> printCheckName' fullDataTable v lc) ([ (x,y) | (_,x,y) <- ns])
+        --putStrLn "*** After annotate"
+        --wdump FD.Lambdacube $ mapM_ (\ (v,lc) -> printCheckName' fullDataTable v lc) cds
hunk ./Main.hs 216
-                let (lc', used') = runRename used lc
+                let (lc', _) = runRename used lc
hunk ./Main.hs 233
-        return (nvls ++ ds, (Map.fromList [ (tvrIdent v,lc) | (_,v,lc) <- nvls] `mappend` smap, Map.fromList [ (tvrIdent v,(Just (EVar v))) | (_,v,_) <- nvls] `Map.union` annmap `Map.union` uidMap , idHist' ))
+        return (nvls ++ retds, (Map.fromList [ (tvrIdent v,lc) | (_,v,lc) <- nvls] `mappend` smap, Map.fromList [ (tvrIdent v,(Just (EVar v))) | (_,v,_) <- nvls] `Map.union` annmap , idHist' ))
hunk ./Main.hs 277
-idHistogram e = execWriter $ annotate mempty (\id nfo -> tell (Histogram.singleton id) >> return nfo) (\_ -> return) (\_ -> return) e
+--idHistogram e = execWriter $ annotate mempty (\id nfo -> tell (Histogram.singleton id) >> return nfo) (\_ -> return) (\_ -> return) e