Commit 190642f4 authored by Mart Lubbers's avatar Mart Lubbers

fix mkHierarchical for module names with length 1

parent cf856b46
Pipeline #21022 passed with stage
in 57 seconds
...@@ -747,14 +747,14 @@ SubstitutePath applicationDir projectDir path ...@@ -747,14 +747,14 @@ SubstitutePath applicationDir projectDir path
PR_GetABCLinkInfo :: !Project -> (!(List (Modulename, LinkObjFileName)), !(List (Modulename, LinkLibraryName))) PR_GetABCLinkInfo :: !Project -> (!(List (Modulename, LinkObjFileName)), !(List (Modulename, LinkLibraryName)))
PR_GetABCLinkInfo project=:{inflist} PR_GetABCLinkInfo project=:{inflist}
# allLinkInfoRecords = map toRecord (StrictListToList inflist); # allLinkInfoRecords = [toRecord el\\el<|-inflist];
= foldl mergeTwoRecords emptyRecord allLinkInfoRecords; = foldl mergeTwoRecords emptyRecord allLinkInfoRecords;
where where
toRecord {InfListItem | mn,info={abcLinkInfo}} = toRecord {InfListItem | mn,info={abcLinkInfo}} =
(Map mkHierarchical abcLinkInfo.linkObjFileNames (Map mkHierarchical abcLinkInfo.linkObjFileNames
,Map mkHierarchical abcLinkInfo.linkLibraryNames) ,Map mkHierarchical abcLinkInfo.linkLibraryNames)
where where
mkHierarchical file = (removeLastComponent mn (size mn - 2), file) mkHierarchical linkobj = (removeLastComponent mn (max 0 (size mn - 1)), linkobj)
removeLastComponent s 0 = "" removeLastComponent s 0 = ""
removeLastComponent s i removeLastComponent s i
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment