Demo #690
Merged
Demo #690
+12
−11
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
robrix
commented
Jul 21, 2022
| parseFile :: (Has (Throw String) sig m, MonadIO m) => FilePath -> m (Source.Source, File Term) | ||
| parseFile path = do | ||
| contents <- liftIO (B.readFile path) | ||
| let sourcePath = replaceExtensions path "py" | ||
| -- FIXME: this is comprised of several terrible assumptions. | ||
| sourceContents <- Source.fromUTF8 . B.toStrict <$> liftIO (B.readFile sourcePath) | ||
| parseFile :: (Has (Throw String) sig m, MonadIO m) => FilePath -> FilePath -> m (Source.Source, File Term) | ||
| parseFile srcPath jsonPath = do | ||
| contents <- liftIO (B.readFile jsonPath) | ||
| -- FIXME: get this from the JSON itself (cf https://github.com/tree-sitter/tree-sitter-graph/issues/69) | ||
| let sourcePath = replaceExtensions jsonPath "py" | ||
| sourceContents <- Source.fromUTF8 . B.toStrict <$> liftIO (B.readFile srcPath) |
There was a problem hiding this comment.
This is very slightly less gross than it had been, but still pretty gross. Basically what it amounts to is a way to allow the JSON path and the loaded source file to vary: in the demo's case, I wanted both b.py and b2.py to load their respective sources correctly while still obtaining the module name b.
As of this PR, we're making one fewer assumption than we had been, so I'm content with it for the moment, but a real solution will be needed at some point.
rewinfrey
approved these changes
Jul 21, 2022
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.
Some last tweaks to polish off the exception tracing demo.