[use IdMaps in more places
John Meacham <john@repetae.net>**20060409082855] hunk ./E/FromHs.hs 70
+import Util.SetLike
hunk ./E/FromHs.hs 324
-        let smt = substMap $ Map.fromList [ (x,EVar y)| (x,y) <- ts ]
-            sma = substMap $ Map.fromList [ (x,EVar y)| (x,y) <- cs' ]
+        let smt = substMap $ fromList [ (x,EVar y)| (x,y) <- ts ]
+            sma = substMap $ fromList [ (x,EVar y)| (x,y) <- cs' ]
hunk ./E/TypeAnalysis.hs 39
+import Util.SetLike
hunk ./E/TypeAnalysis.hs 46
-extractValMap ds = Map.fromList [ (tvrIdent t,f e []) | (t,e) <- ds] where
+extractValMap ds = fromList [ (tvrIdent t,f e []) | (t,e) <- ds] where
hunk ./E/TypeAnalysis.hs 86
-lookupArgs t (_,_,tm) = maybe [] id (Map.lookup (tvrIdent t) tm)
+lookupArgs t (_,_,tm) = maybe [] id (mlookup (tvrIdent t) tm)
hunk ./E/TypeAnalysis.hs 164
-    nenv = (ur,uv,extractValMap ds `Map.union` env)
+    nenv = (ur,uv,extractValMap ds `union` env)
hunk ./E/TypeAnalysis.hs 275
-    sub = substMap''  $ Map.fromList [ (tvrIdent t,v) | (t,Just v) <- sts ]
+    sub = substMap''  $ fromList [ (tvrIdent t,v) | (t,Just v) <- sts ]
hunk ./E/TypeAnalysis.hs 285
-        when sd $ tell (Map.singleton tvr (fsts vs))
+        when sd $ tell (msingleton tvr (fsts vs))
hunk ./E/TypeAnalysis.hs 294
-specBody True (_,_,_,dmap) e | (EVar h,as) <- fromAp e, Just os <- Map.lookup h dmap = do
+specBody True (_,_,_,dmap) e | (EVar h,as) <- fromAp e, Just os <- mlookup h dmap = do
hunk ./E/TypeAnalysis.hs 334
-        calt rule@Rule { ruleArgs = (arg:rs) } = Alt (valToPat' arg) (substMap (Map.fromList [ (tvrIdent v,EVar r) | ~(EVar v) <- rs | r <- ras ]) $ ruleBody rule)
+        calt rule@Rule { ruleArgs = (arg:rs) } = Alt (valToPat' arg) (substMap (fromList [ (tvrIdent v,EVar r) | ~(EVar v) <- rs | r <- ras ]) $ ruleBody rule)
hunk ./Main.hs 64
-import Util.SetLike as S hiding(null)
+import Util.SetLike as S
hunk ./Main.hs 281
-                SS.so_boundVars = Map.fromList [ (tvrIdent v,e) | (v,e) <- Map.elems (hoEs ho)],
+                SS.so_boundVars = fromList [ (tvrIdent v,e) | (v,e) <- Map.elems (hoEs ho)],
hunk ./Main.hs 338
-        let namesInscope' = fromDistinctAscList (Map.keys smap) `union` namesInscope
+        let namesInscope' = fromDistinctAscList (mkeys smap) `union` namesInscope