[make the hoEs a simple list rather than a map in the ho file
John Meacham <john@repetae.net>**20070830235544] hunk ./E/FromHs.hs 187
-createInstanceRules :: Monad m => DataTable -> ClassHierarchy -> (Map.Map Name (TVr,E)) -> m Rules
+createInstanceRules :: Monad m => DataTable -> ClassHierarchy -> [(TVr,E)] -> m Rules
hunk ./E/FromHs.hs 219
-    findName name = case Map.lookup name funcs of
+    nfuncs = runIdentity $ do
+        let f d@(v,_) = case fromId (tvrIdent v) of
+                Just n -> return (n,d)
+                Nothing -> fail $ "createInstanceRules: top level var with temporary name " ++ show v
+        xs <- mapM f funcs
+        return (Map.fromList xs)
+
+    findName name = case Map.lookup name nfuncs of
hunk ./Ho/Binary.hs 40
-	    putMap al
+	    put al
hunk ./Ho/Binary.hs 51
-    al <- getMap
+    al <- get
hunk ./Ho/Build.hs 408
-mapHoBodies sm ho = ho { hoEs = fmap f (hoEs ho) , hoRules =  runIdentity (E.Rules.mapBodies (return . sm) (hoRules ho)) } where
+mapHoBodies sm ho = ho { hoEs = map f (hoEs ho) , hoRules =  runIdentity (E.Rules.mapBodies (return . sm) (hoRules ho)) } where
hunk ./Ho/Build.hs 421
-hoToProgram ho = programSetDs (melems $ hoEs ho) program {
+hoToProgram ho = programSetDs (hoEs ho) program {
hunk ./Ho/Build.hs 524
-        mapM_ (\ (v,lc) -> putChar '\n' >> printCheckName'' (hoDataTable ho) v lc) (melems $ hoEs ho)
+        mapM_ (\ (v,lc) -> putChar '\n' >> printCheckName'' (hoDataTable ho) v lc) (hoEs ho)
hunk ./Ho/Type.hs 16
-import Info.Types
hunk ./Ho/Type.hs 20
-import Util.SetLike
hunk ./Ho/Type.hs 71
-    hoEs :: Map.Map Name (TVr,E),
+    hoEs :: [(TVr,E)],
hunk ./Main.hs 168
-        ds = runIdentity $ annotateDs (choVarMap accumho') (\_ -> return) letann lamann (Map.elems $ hoEs ho')
+        ds = runIdentity $ annotateDs (choVarMap accumho') (\_ -> return) letann lamann (hoEs ho')
hunk ./Main.hs 175
-        imapRules = choVarMap accumho'  `mappend` newVarMap -- fromList [ (tvrIdent v,Just (EVar v))| (v,_) <- Map.elems (hoEs accumho' `mappend` hoEs ho)]
+        imapRules = choVarMap accumho'  `mappend` newVarMap
hunk ./Main.hs 179
-    return $ accumho' `mappend` mempty { choVarMap = newVarMap, choExternalNames = idMapToIdSet newVarMap, choHo = ho { hoEs = programEsMap prog } }
+    return $ accumho' `mappend` mempty { choVarMap = newVarMap, choExternalNames = idMapToIdSet newVarMap, choHo = ho { hoEs = programDs prog } }
hunk ./Main.hs 183
-reprocessHo rules ps ho = ho { hoEs = Map.map f (hoEs ho) } where
+reprocessHo rules ps ho = ho { hoEs = map f (hoEs ho) } where
hunk ./Main.hs 188
-reprocessCho rules ps cho = cho { choVarMap = fmap h (choVarMap cho) , choHo = (choHo cho) { hoEs = Map.map f (hoEs $ choHo cho) }} where
+reprocessCho rules ps cho = cho { choVarMap = fmap h (choVarMap cho) , choHo = (choHo cho) { hoEs = map f (hoEs $ choHo cho) }} where
hunk ./Main.hs 241
-    rules' <- createInstanceRules fullDataTable (hoClassHierarchy ho')  (Map.fromList [ (runIdentity $ fromId (tvrIdent y),(y,z)) | (y,z) <- ds] `mappend` hoEs ho)
+    rules' <- createInstanceRules fullDataTable (hoClassHierarchy ho')  (ds `mappend` hoEs ho)
hunk ./Main.hs 292
-            SS.so_boundVars = fromList [ (tvrIdent v,(v,e)) | (v,e) <- Map.elems (hoEs ho)],
+            SS.so_boundVars = fromList [ (tvrIdent v,(v,e)) | (v,e) <- hoEs ho],
hunk ./Main.hs 422
-        hoEs = programEsMap prog,
+        hoEs = programDs prog,
hunk ./Main.hs 425
-        newMap = fromList [ (tvrIdent n,Just (EVar n)) | (n,_) <- Map.elems $ hoEs newHo ]
+        newMap = fromList [ (tvrIdent n,Just (EVar n)) | (n,_) <- hoEs newHo ]
hunk ./Main.hs 939
+