Merge branch 'master' of /home/nr/papers/simon/dfopt/ into with-passes
authorNorman Ramsey <nr@cs.tufts.edu>
Fri, 23 Apr 2010 04:03:58 +0000 (00:03 -0400)
committerNorman Ramsey <nr@cs.tufts.edu>
Fri, 23 Apr 2010 04:03:58 +0000 (00:03 -0400)
Conflicts:

src/hoopl.cabal

1  2 
src/hoopl.cabal

diff --cc src/hoopl.cabal
@@@ -16,8 -16,9 +16,7 @@@ Extra-source-files:  README, hoopl.pdf
  Library
    Build-Depends:     base >= 3 && < 5, containers
    Exposed-modules:   Compiler.Hoopl,
 -                       Compiler.Hoopl.Zipper,
 -                       Compiler.Hoopl.ZipDataflowNoRG,
 -                       Compiler.Hoopl.Pointed
 +                     Compiler.Hoopl.Passes.Dominator
-                        Compiler.Hoopl.Zipper
    Other-modules:     Compiler.Hoopl.GraphUtil,
                       -- GraphUtil should *never* be seen by clients.
                       -- The remaining modules are hidden *provisionally*
                         Compiler.Hoopl.MkGraph,
                         Compiler.Hoopl.Fuel, Compiler.Hoopl.Label,
                         Compiler.Hoopl.Show, Compiler.Hoopl.Util
++                       Compiler.Hoopl.Pointed
+                        Compiler.Hoopl.XUtil
+                        Compiler.Hoopl.ZipDataflow
++                       Compiler.Hoopl.ZipDataflowNoRG,
++                       Compiler.Hoopl.Zipper
    ghc-options:       -Wall -fno-warn-name-shadowing