hoopl 3.7.0.0 → 3.7.1.0
raw patch · 6 files changed
+8/−71 lines, 6 filesdep ~base
Dependency ranges changed: base
Files
- Compiler/Hoopl.hs +1/−1
- Compiler/Hoopl/Dataflow.hs +2/−2
- Compiler/Hoopl/Graph.hs +1/−1
- Compiler/Hoopl/GraphUtil.hs +0/−63
- Compiler/Hoopl/MkGraph.hs +2/−2
- hoopl.cabal +2/−2
Compiler/Hoopl.hs view
@@ -8,7 +8,7 @@ where import Compiler.Hoopl.Dataflow-import Compiler.Hoopl.Fuel+import Compiler.Hoopl.Fuel hiding (withFuel, getFuel, setFuel) import Compiler.Hoopl.Graph import Compiler.Hoopl.Label hiding (allLabels) import Compiler.Hoopl.MkGraph
Compiler/Hoopl/Dataflow.hs view
@@ -169,8 +169,8 @@ => ForwardPass n f -> Body n -> FactBase f -> FuelMonad (RG n f C C, FactBase f) -- Outgoing factbase is restricted to Labels *not* in- -- in the Body; the facts for Labels- -- *in* the Body are in the BodyWithFacts+ -- in the Body; the facts for Labels *in*+ -- the Body are in the BodyWithFacts arfBody pass blocks init_fbase = fixpoint True (fp_lattice pass) (arfBlock pass) init_fbase $ forwardBlockList (factBaseLabels init_fbase) blocks
Compiler/Hoopl/Graph.hs view
@@ -2,7 +2,7 @@ module Compiler.Hoopl.Graph ( O, C, Block(..), Body(..), Graph(..), MaybeO(..)- , Edges, entryLabel, successors+ , Edges(entryLabel, successors) , addBlock, bodyList ) where
− Compiler/Hoopl/GraphUtil.hs
@@ -1,63 +0,0 @@-{-# LANGUAGE GADTs #-}-{-# OPTIONS_GHC -fno-warn-incomplete-patterns #-} -- bug in GHC---- N.B. addBasicBlocks won't work on OO without a Node (branch/label) constraint--module Compiler.Hoopl.GraphUtil- ( gCat, addEntrySeq, addExitSeq -- , addBasicBlocks- , gCatClosed- , gCatAny- , bodyGraph- )--where--import Compiler.Hoopl.Graph--bodyGraph :: Body n -> Graph n C C-bodyGraph b = GMany NothingO b NothingO---gCatAny :: Graph n e a -> Graph n a x -> Graph n e x-gCat :: Graph n e O -> Graph n O x -> Graph n e x-addEntrySeq :: Graph n O C -> Graph n C x -> Graph n O x-addExitSeq :: Graph n e C -> Graph n C O -> Graph n e O---addBasicBlocks :: Graph n e x -> Graph n C C -> Graph n e x-gCatClosed :: Graph n e C -> Graph n C x -> Graph n e x--gCatAny GNil g2 = g2-gCatAny g1 GNil = g1--gCatAny (GUnit b1) (GUnit b2) - = GUnit (b1 `BCat` b2)--gCatAny (GUnit b) (GMany (JustO e) bs x) - = GMany (JustO (b `BCat` e)) bs x--gCatAny (GMany e bs (JustO x)) (GUnit b2) - = GMany e bs (JustO (x `BCat` b2))--gCatAny (GMany e1 bs1 (JustO x1)) (GMany (JustO e2) bs2 x2)- = GMany e1 (addBlock (x1 `BCat` e2) bs1 `BodyCat` bs2) x2--gCatAny (GMany e1 bs1 NothingO) (GMany NothingO bs2 x2)- = GMany e1 (bs1 `BodyCat` bs2) x2--gCat = gCatAny-addEntrySeq = gCatAny-addExitSeq = gCatAny-gCatClosed = gCatAny--{--addEntrySeq (GMany entry body NothingO) (GMany NothingO body' exit) - = GMany entry (body `BodyCat` body') exit- -addExitSeq (GMany entry body NothingO) (GMany NothingO body' exit) - = GMany entry (body `BodyCat` body') exit- ---addBasicBlocks GNil g2 = g2---gCatClosed (GMany e1 bs1 NothingO) (GMany NothingO bs2 x2)- = GMany e1 (bs1 `BodyCat` bs2) x2--}
Compiler/Hoopl/MkGraph.hs view
@@ -2,9 +2,9 @@ module Compiler.Hoopl.MkGraph ( AGraph, (<*>) , emptyAGraph, withFreshLabels- , mkMiddle, mkMiddles, mkLast, mkEntry, mkBranch, mkLabel, mkIfThenElse, mkWhileDo+ , mkMiddle, mkMiddles, mkLast, mkEntry, mkBranch, mkLabel, mkWhileDo , addEntrySeq, addExitSeq, catAGraphs- , IfThenElseable+ , IfThenElseable(mkIfThenElse) ) where
hoopl.cabal view
@@ -1,5 +1,5 @@ Name: hoopl-Version: 3.7.0.0+Version: 3.7.1.0 Description: Higher-order optimization library License: BSD3 License-file: LICENSE@@ -14,6 +14,6 @@ Build-Depends: base >= 3 && < 5, containers Exposed-modules: Compiler.Hoopl, Compiler.Hoopl.Dataflow, Compiler.Hoopl.Graph, - Compiler.Hoopl.GraphUtil, Compiler.Hoopl.MkGraph,+ Compiler.Hoopl.MkGraph, Compiler.Hoopl.Fuel, Compiler.Hoopl.Label ghc-options: -Wall -fno-warn-name-shadowing