Merge branch 'master' into three-eight (lost 'joinInFacts')
authorNorman Ramsey <nr@cs.tufts.edu>
Fri, 23 Apr 2010 16:04:55 +0000 (12:04 -0400)
committerNorman Ramsey <nr@cs.tufts.edu>
Fri, 23 Apr 2010 16:04:55 +0000 (12:04 -0400)
commitaf9e3daaedf5f74caabdb7cd6333be9e38a6ff5a
tree1194ec8e8d07e4805f4c62f450fea645da2fa07c
parentaa71ba9f343180e29b41e448a7dca47a08ef2f06
parent22cbd4c3d9c4d4f073118bed804d610714a64cfa
Merge branch 'master' into three-eight (lost 'joinInFacts')

Conflicts:

src/Compiler/Hoopl/Dataflow.hs
src/Compiler/Hoopl/MkGraph.hs

Resolved Dataflow.hs by reverting to the latest on the three-eight
branch, although I'm nervous about losing 'joinInFacts'.
Resolved MkGraph.hs simply by replacing three instances
of the polymorphic BUnit with First, Middle, and Last.
src/Compiler/Hoopl/Dataflow.hs
src/Compiler/Hoopl/Debug.hs
src/Compiler/Hoopl/MkGraph.hs
src/hoopl.cabal