Skip to content

When executing make or run, never consider modules from dependencies as roots. #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robinheghan merged 1 commit into from
Sep 8, 2025
Merged

When executing make or run, never consider modules from dependencies as roots. #351

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions builder/src/Build.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,20 @@ crawlDeps env mvar sources deps blockedValue =
where
crawlNew name () = fork (crawlModule env mvar sources (DocsNeed False) name)

crawlRootModuleHelp :: Env -> MVar StatusDict -> Sources -> DocsNeed -> ModuleName.Raw -> IO Status
crawlRootModuleHelp env@(Env _ _ _ _ _ locals _) mvar sources docsNeed name =
case Map.lookup name sources of
Just source ->
if Name.isKernel name
then return $ SBadImport Import.NotFound
else case Map.lookup name locals of
Nothing ->
crawlFile env mvar sources docsNeed name source
Just local@(Details.Local _ deps _) ->
crawlDeps env mvar sources deps (SCached local)
Nothing ->
return $ SBadImport Import.NotFound

crawlModule :: Env -> MVar StatusDict -> Sources -> DocsNeed -> ModuleName.Raw -> IO Status
crawlModule env@(Env _ _ projectType _ _ locals foreigns) mvar sources docsNeed name =
case Map.lookup name sources of
Expand Down Expand Up @@ -963,12 +977,7 @@ crawlRoot :: Env -> MVar StatusDict -> Sources -> RootLocation -> IO RootStatus
crawlRoot env mvar sources root =
case root of
LInside name ->
do
statusMVar <- newEmptyMVar
statusDict <- takeMVar mvar
putMVar mvar (Map.insert name statusMVar statusDict)
putMVar statusMVar =<< crawlModule env mvar sources (DocsNeed False) name
return (SInside name)
crawlRootModule env mvar sources name
LOutside _ ->
error "Bad assumption"

Expand All @@ -978,7 +987,7 @@ crawlRootModule env mvar sources root =
statusMVar <- newEmptyMVar
statusDict <- takeMVar mvar
putMVar mvar (Map.insert root statusMVar statusDict)
putMVar statusMVar =<< crawlModule env mvar sources (DocsNeed False) root
putMVar statusMVar =<< crawlRootModuleHelp env mvar sources (DocsNeed False) root
return (SInside root)

-- CHECK ROOTS
Expand Down
Loading