[simplify id choosing code in E.SSimplify, get rid of some unused exports in Name.Id
John Meacham <john@repetae.net>**20090226044818
 Ignore-this: 4713d1a8866e2260e58d6ba47685adaf
] hunk ./E/SSimplify.hs 19
+import Debug.Trace
hunk ./E/SSimplify.hs 61
-import Debug.Trace
hunk ./E/SSimplify.hs 1020
-    idsBound :: !IdSet,
-    smStdGen :: !StdGen
+    idsBound :: !IdSet
hunk ./E/SSimplify.hs 1023
-smState = SmState { idsUsed = mempty, idsBound = mempty, smStdGen = mkStdGen 42 }
+smState = SmState { idsUsed = mempty, idsBound = mempty }
hunk ./E/SSimplify.hs 1039
-    f s@SmState { idsUsed = used, idsBound = bound, smStdGen=gen } = case fn (used,bound) of (used',bound') -> s { idsUsed = used', idsBound = bound', smStdGen = gen }
+    f s@SmState { idsUsed = used, idsBound = bound } = case fn (used,bound) of (used',bound') -> s { idsUsed = used', idsBound = bound' }
hunk ./E/SSimplify.hs 1066
-        (used,_bound) <- getIds
-        newNameFrom (newIds used)
+        (used,bound) <- getIds
+        newNameFrom $ candidateIds (size used + 10000*size bound)
hunk ./E/Traverse.hs 96
-renameE initSet initMap e = runReader (runIdNameT' $ addBoundNamesIdMap initMap >> addBoundNamesIdSet initSet >> f e) initMap  where
+renameE initSet initMap e = runReader (runIdNameT $ addBoundNamesIdMap initMap >> addBoundNamesIdSet initSet >> f e) initMap  where
hunk ./Name/Id.hs 12
-    idNameBoundNames,
-    idNameUsedNames,
hunk ./Name/Id.hs 33
-    runIdNameT',
hunk ./Name/Id.hs 57
-
+--import Debug.Trace
hunk ./Name/Id.hs 152
+--deriving instance MapLike Int a (IM.IntMap a) => MapLike Id a (IdMap a)
hunk ./Name/Id.hs 170
--- | Get bound and used names
-idNameBoundNames :: Monad m => IdNameT m IdSet
-idNameBoundNames = IdNameT $ do
-    (_used,bound) <- get
-    return bound
-idNameUsedNames :: Monad m => IdNameT m IdSet
-idNameUsedNames = IdNameT $  do
-    (used,_bound) <- get
-    return used
-
hunk ./Name/Id.hs 171
-runIdNameT :: (Monad m) => IdNameT m a -> m a
-runIdNameT (IdNameT x) = liftM fst $ runStateT x (mempty,mempty)
-
-runIdNameT' :: (Monad m) => IdNameT m a -> m (a,IdSet)
-runIdNameT' (IdNameT x) = do
+runIdNameT :: (Monad m) => IdNameT m a -> m (a,IdSet)
+runIdNameT (IdNameT x) = do
hunk ./Name/Id.hs 260
-    ids' = IS.insert 0 ids
+    ids' = if size ids == 0 then IS.insert 0 ids else ids
hunk ./Name/Id.hs 272
+    --mask x = trace ("candidate " ++ show seed) $ Id $ x .&. 0x0FFFFFFE