Fix handling of 'ghc' subdir in parser for obtaining set ghc version #1229
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
The behavior of existing parser was to intrepret the version as "ghcup" for the path "c:/ghc/ghcup/ghc/<ver>/bin/ghc" Fixes #1215
hasufell
reviewed
Feb 9, 2025
lib/GHCup/Prelude/MegaParsec.hs
Outdated
Comment on lines
159
to
162
| parseTillLastPathSep = MP.manyTill MP.anySingle (MP.try $ do | ||
| _ <- MP.some pathSep | ||
| _ <- MP.lookAhead (MP.many MP.anySingle) | ||
| MP.notFollowedBy (MP.manyTill MP.anySingle (MP.some pathSep))) |
There was a problem hiding this comment.
I don't understand this.
Especially since MP.lookAhead (MP.many MP.anySingle) always parses until end of input.
There was a problem hiding this comment.
I think we can just do:
parseTillLastPathSep = (MP.try (parseUntil1 pathSep *> many pathSep) *> parseTillLastPathSep) <|> MP.takeRestThere was a problem hiding this comment.
ghcVersionFromPath :: MP.Parsec Void Text GHCTargetVersion
ghcVersionFromPath =
do
beforeBin <- parseUntil1 binDir <* MP.some pathSep
MP.setInput beforeBin
_ <- parseTillLastPathSep
ghcTargetVerP
where
binDir = MP.some pathSep <* MP.chunk "bin" *> MP.some pathSep <* MP.chunk "ghc"
parseTillLastPathSep = (MP.try (parseUntil1 pathSep *> MP.some pathSep) *> parseTillLastPathSep) <|> pure ()This is much cleaner.
The pure () in parseTillLastPathSep is important so we always break out of the parser in the first failure (innermost recursion)... if we would parse the ghc version right there and it's a borked ghc version, it would try to re-parse for every filepath component
There was a problem hiding this comment.
Ok, yes, recursive is much cleaner.
As per @hasufell' suggestion
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The behavior of existing parser was to intrepret the version as "ghcup" for the path "c:/ghc/ghcup/ghc//bin/ghc"
Fixes #1215