[annotate before atomizing apps
John Meacham <john@repetae.net>**20061031033641] hunk ./E/TypeAnalysis.hs 182
-    when (length as < length ts) $ fail "calcE: unsaturated call to function"
+    when (length as < length ts) $ fail ("calcE: unsaturated call to function: " ++ pprint e)
hunk ./Main.hs 273
-    let ds = [ (runIdentity (fromId (tvrIdent v)),v,e) | (v,e) <- classInstances ] ++  [ (n,v,lc) | (n,v,lc) <- ds', v `notElem` fsts classInstances ]
---    ds <- annotateDs mempty (\_ nfo -> return nfo) (\_ nfo -> return nfo) (\_ nfo -> return nfo) ds
+    let ds = [ (v,e) | (v,e) <- classInstances ] ++  [ (v,lc) | (n,v,lc) <- ds', v `notElem` fsts classInstances ]
+    ds <- annotateDs mempty (\_ nfo -> return nfo) (\_ nfo -> return nfo) (\_ nfo -> return nfo) ds
hunk ./Main.hs 276
-        mapM_ (\(_,v,lc) -> printCheckName'' fullDataTable v lc) ds
+        mapM_ (\(v,lc) -> printCheckName'' fullDataTable v lc) ds
hunk ./Main.hs 280
-    rules' <- createInstanceRules (hoClassHierarchy ho')   (Map.fromList [ (x,(y,z)) | (x,y,z) <- ds] `mappend` hoEs ho)
+    rules' <- createInstanceRules (hoClassHierarchy ho')   (Map.fromList [ (runIdentity $ fromId (tvrIdent y),(y,z)) | (y,z) <- ds] `mappend` hoEs ho)
hunk ./Main.hs 288
-    let inscope =  [ tvrIdent n | (n,_) <- Map.elems $ hoEs ho ] ++ [tvrIdent n | (_,n,_) <- ds ]
+    let inscope =  [ tvrIdent n | (n,_) <- Map.elems $ hoEs ho ] ++ [tvrIdent n | (n,_) <- ds ]
hunk ./Main.hs 299
-    (ds,_allIds) <- foldM procE ([],hoUsedIds ho) [ (v,e) | (_,v,e) <- ds]
+--    ds <- return $ runIdentity $ annotateDs mempty (\_ nfo -> return nfo) (\_ nfo -> return nfo)  (\_ nfo -> return nfo) ds
+    (ds,_allIds) <- foldM procE ([],hoUsedIds ho) ds