33module Distribution.Backpack.ConfiguredComponent (
44 ConfiguredComponent (.. ),
55 cc_name ,
6+ cc_cid ,
7+ cc_pkgid ,
68 toConfiguredComponent ,
79 toConfiguredComponents ,
810 dispConfiguredComponent ,
@@ -19,6 +21,7 @@ import Distribution.Compat.Prelude hiding ((<>))
1921
2022import Distribution.Backpack.Id
2123
24+ import Distribution.Types.AnnotatedId
2225import Distribution.Types.Dependency
2326import Distribution.Types.ExeDependency
2427import Distribution.Types.IncludeRenaming
@@ -48,10 +51,8 @@ import Text.PrettyPrint
4851-- and the 'ComponentId's of the things it depends on.
4952data ConfiguredComponent
5053 = ConfiguredComponent {
51- -- | Uniquely identifies a configured component.
52- cc_cid :: ComponentId ,
53- -- | The package this component came from.
54- cc_pkgid :: PackageId ,
54+ -- | Unique identifier of component, plus extra useful info.
55+ cc_ann_id :: AnnotatedId ComponentId ,
5556 -- | The fragment of syntax from the Cabal file describing this
5657 -- component.
5758 cc_component :: Component ,
@@ -63,19 +64,28 @@ data ConfiguredComponent
6364 cc_public :: Bool
6465 -- | Dependencies on executables from @build-tools@ and
6566 -- @build-tool-depends@.
66- cc_exe_deps :: [( ComponentId , PackageId ) ],
67+ cc_exe_deps :: [AnnotatedId ComponentId ],
6768 -- | The mixins of this package, including both explicit (from
6869 -- the @mixins@ field) and implicit (from @build-depends@). Not
6970 -- mix-in linked yet; component configuration only looks at
7071 -- 'ComponentId's.
7172 cc_includes :: [ComponentInclude ComponentId IncludeRenaming ]
7273 }
7374
75+
76+ -- | Uniquely identifies a configured component.
77+ cc_cid :: ConfiguredComponent -> ComponentId
78+ cc_cid = ann_id . cc_ann_id
79+
80+ -- | The package this component came from.
81+ cc_pkgid :: ConfiguredComponent -> PackageId
82+ cc_pkgid = ann_pid . cc_ann_id
83+
7484-- | The 'ComponentName' of a component; this uniquely identifies
7585-- a fragment of syntax within a specified Cabal file describing the
7686-- component.
7787cc_name :: ConfiguredComponent -> ComponentName
78- cc_name = componentName . cc_component
88+ cc_name = ann_cname . cc_ann_id
7989
8090-- | Pretty-print a 'ConfiguredComponent'.
8191dispConfiguredComponent :: ConfiguredComponent -> Doc
@@ -91,27 +101,24 @@ dispConfiguredComponent cc =
91101mkConfiguredComponent
92102 :: PackageDescription
93103 -> ComponentId
94- -> [(( PackageName , ComponentName ), ( ComponentId , PackageId ))]
95- -> [( ComponentId , PackageId )]
104+ -> [AnnotatedId ComponentId ] -- lib deps
105+ -> [AnnotatedId ComponentId ] -- exe deps
96106 -> Component
97107 -> LogProgress ConfiguredComponent
98- mkConfiguredComponent pkg_decr this_cid lib_deps exe_deps component = do
108+ mkConfiguredComponent pkg_descr this_cid lib_deps exe_deps component = do
99109 -- Resolve each @mixins@ into the actual dependency
100110 -- from @lib_deps@.
101111 explicit_includes <- forM (mixins bi) $ \ (Mixin name rns) -> do
102- let keys@ (_, cname) = fixFakePkgName pkg_decr name
103- (cid, pid) <-
104- case Map. lookup keys deps_map of
112+ let keys = fixFakePkgName pkg_descr name
113+ aid <- case Map. lookup keys deps_map of
105114 Nothing ->
106115 dieProgress $
107116 text " Mix-in refers to non-existent package" <+>
108117 quotes (disp name) $$
109118 text " (did you forget to add the package to build-depends?)"
110119 Just r -> return r
111120 return ComponentInclude {
112- ci_id = cid,
113- ci_pkgid = pid,
114- ci_compname = cname,
121+ ci_ann_id = aid,
115122 ci_renaming = rns,
116123 ci_implicit = False
117124 }
@@ -120,30 +127,32 @@ mkConfiguredComponent pkg_decr this_cid lib_deps exe_deps component = do
120127 -- @backpack-include@ is converted into an "implicit" include.
121128 let used_explicitly = Set. fromList (map ci_id explicit_includes)
122129 implicit_includes
123- = map (\ ((_, cn), (cid, pid)) -> ComponentInclude {
124- ci_id = cid,
125- ci_pkgid = pid,
126- ci_compname = cn,
127- ci_renaming = defaultIncludeRenaming,
128- ci_implicit = True
129- })
130- $ filter (flip Set. notMember used_explicitly . fst . snd ) lib_deps
130+ = map (\ aid -> ComponentInclude {
131+ ci_ann_id = aid,
132+ ci_renaming = defaultIncludeRenaming,
133+ ci_implicit = True
134+ })
135+ $ filter (flip Set. notMember used_explicitly . ann_id) lib_deps
131136
132137 return ConfiguredComponent {
133- cc_cid = this_cid,
134- cc_pkgid = package pkg_decr,
138+ cc_ann_id = AnnotatedId {
139+ ann_id = this_cid,
140+ ann_pid = package pkg_descr,
141+ ann_cname = componentName component
142+ },
135143 cc_component = component,
136144 cc_public = is_public,
137145 cc_exe_deps = exe_deps,
138146 cc_includes = explicit_includes ++ implicit_includes
139147 }
140148 where
141149 bi = componentBuildInfo component
142- deps_map = Map. fromList lib_deps
150+ deps_map = Map. fromList [ ((packageName dep, ann_cname dep), dep)
151+ | dep <- lib_deps ]
143152 is_public = componentName component == CLibName
144153
145154type ConfiguredComponentMap =
146- Map PackageName (Map ComponentName (ComponentId , PackageId ))
155+ Map PackageName (Map ComponentName (AnnotatedId ComponentId ))
147156
148157toConfiguredComponent
149158 :: PackageDescription
@@ -155,15 +164,15 @@ toConfiguredComponent pkg_descr this_cid dep_map component = do
155164 lib_deps <-
156165 if newPackageDepsBehaviour pkg_descr
157166 then forM (targetBuildDepends bi) $ \ (Dependency name _) -> do
158- let keys @ (pn, cn) = fixFakePkgName pkg_descr name
167+ let (pn, cn) = fixFakePkgName pkg_descr name
159168 value <- case Map. lookup cn =<< Map. lookup pn dep_map of
160169 Nothing ->
161170 dieProgress $
162171 text " Dependency on unbuildable" <+>
163172 text (showComponentName cn) <+>
164173 text " from" <+> disp pn
165174 Just v -> return v
166- return (keys, value)
175+ return value
167176 else return old_style_lib_deps
168177 mkConfiguredComponent
169178 pkg_descr this_cid
@@ -177,7 +186,7 @@ toConfiguredComponent pkg_descr this_cid dep_map component = do
177186 -- this is not supported by old-style deps behavior
178187 -- because it would imply a cyclic dependency for the
179188 -- library itself.
180- old_style_lib_deps = [ ((pn, cn), e)
189+ old_style_lib_deps = [ e
181190 | (pn, comp_map) <- Map. toList dep_map
182191 , pn /= packageName pkg_descr
183192 , (cn, e) <- Map. toList comp_map
@@ -215,10 +224,11 @@ toConfiguredComponent' use_external_internal_deps flags
215224 then cc { cc_public = True
216225 else cc
217226 where
227+ -- TODO: pass component names to it too!
218228 this_cid = computeComponentId deterministic ipid_flag cid_flag (package pkg_descr)
219229 (componentName component) (Just (deps, flags))
220- deps = [ cid | m <- Map. elems dep_map
221- , (cid, _) <- Map. elems m ]
230+ deps = [ ann_id aid | m <- Map. elems dep_map
231+ , aid <- Map. elems m ]
222232
223233extendConfiguredComponentMap
224234 :: ConfiguredComponent
@@ -227,7 +237,7 @@ extendConfiguredComponentMap
227237extendConfiguredComponentMap cc =
228238 Map. insertWith Map. union
229239 (pkgName (cc_pkgid cc))
230- (Map. singleton (cc_name cc) (cc_cid cc, cc_pkgid cc))
240+ (Map. singleton (cc_name cc) (cc_ann_id cc))
231241
232242-- Compute the 'ComponentId's for a graph of 'Component's. The
233243-- list of internal components must be topologically sorted
0 commit comments