This repository has been archived by the owner on Aug 2, 2020. It is now read-only.
For executables, we should read the main-is field from the cabal file.
#627
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, we simply treat file name for `Main` module as `Main.hs` to build executable. That doesn't work for the `timeout` program. This patch fixes the problem.
|
This pr blocks #499 . |
|
Looks reasonable to me. |
snowleopard
reviewed
Jun 18, 2018
src/Oracles/ModuleFiles.hs
Outdated
| Just (mod, filepath) -> | ||
| concatForM dirs $ \dir -> do | ||
| found <- doesFileExist (dir -/- filepath) | ||
| return $ if found then [(mod, unifyPath $ dir -/- filepath)] |
There was a problem hiding this comment.
[ (mod, unifyPath $ dir -/- filepath) | found ] might be less awkward.
snowleopard
reviewed
Jun 18, 2018
src/Oracles/ModuleFiles.hs
Outdated
| @@ -136,7 +141,16 @@ moduleFilesOracle = void $ do | |||
| let cmp f = compare (dropExtension f) | |||
| found = intersectOrd cmp files mFiles | |||
| return (map (fullDir -/-) found, mDir) | |||
| let pairs = sort [ (encodeModule d f, f) | (fs, d) <- result, f <- fs ] | |||
|
|
|||
| mainpairs <- case mainIs of | |||
There was a problem hiding this comment.
Could you add a comment here, explaining why mains are treated differently?
|
@sighingnow Many thanks! Just a couple of minor comments above. Please add a comment to clarify what's going on. |
|
@snowleopard Could we land this now ? |
|
@sighingnow Yes, thanks! I'm just waiting for at least one green light from Travis (I believe 8.2.2 was fine). |
|
Merged. |
|
Thanks ! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, we simply treat file name for
Mainmodule asMain.hsto build executables. That doesn't work for thetimeoutprogram. This patch fixes the problem.