Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/5e3a110cc092ba857d6351416762851e9e0fb0f7 >--------------------------------------------------------------- commit 5e3a110cc092ba857d6351416762851e9e0fb0f7 Author: Andres Loeh <[email protected]> Date: Thu Oct 27 13:45:34 2011 +0000 minor clarification in naming >--------------------------------------------------------------- .../Client/Dependency/Modular/Builder.hs | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cabal-install/Distribution/Client/Dependency/Modular/Builder.hs b/cabal-install/Distribution/Client/Dependency/Modular/Builder.hs index 9026f41..e74073e 100644 --- a/cabal-install/Distribution/Client/Dependency/Modular/Builder.hs +++ b/cabal-install/Distribution/Client/Dependency/Modular/Builder.hs @@ -18,8 +18,8 @@ import Distribution.Client.Dependency.Modular.Tree data BuildState = BS { index :: Index, -- ^ information about packages and their dependencies scope :: Scope, -- ^ information about encapsulations - goals :: RevDepMap, -- ^ set of all package goals, completed and open, with reverse dependencies - open :: PSQ OpenGoal (), -- ^ set of still open goals + rdeps :: RevDepMap, -- ^ set of all package goals, completed and open, with reverse dependencies + open :: PSQ OpenGoal (), -- ^ set of still open goals (flag and package goals) next :: BuildType -- ^ kind of node to generate next } @@ -28,9 +28,9 @@ data BuildState = BS { -- We also adjust the map of overall goals, and keep track of the -- reverse dependencies of each of the goals. extendOpen :: QPN -> [OpenGoal] -> BuildState -> BuildState -extendOpen qpn' gs s@(BS { goals = gs', open = o' }) = go gs' o' gs +extendOpen qpn' gs s@(BS { rdeps = gs', open = o' }) = go gs' o' gs where - go g o [] = s { goals = g, open = o } + go g o [] = s { rdeps = g, open = o } go g o (ng@(OpenGoal (Flagged _ _ _ _) _gr) : ngs) = go g (cons ng () o) ngs go g o (ng@(OpenGoal (Simple (Dep qpn _)) _gr) : ngs) | qpn == qpn' = go g o ngs @@ -68,8 +68,8 @@ build = ana go -- If we have a choice between many goals, we just record the choice in -- the tree. We select each open goal in turn, and before we descend, remove -- it from the queue of open goals. - go bs@(BS { goals = rdeps, open = gs, next = Goals }) - | P.null gs = DoneF rdeps + go bs@(BS { rdeps = rds, open = gs, next = Goals }) + | P.null gs = DoneF rds | otherwise = GoalChoiceF (P.mapWithKey (\ g (_sc, gs') -> bs { next = OneGoal g, open = gs' }) (P.splits gs)) _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
