fix locations filename in AST produced by the -pp option
#12684
Merged
Conversation
This file contains hidden or 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
Test:
$ echo "let x = 1" > test.ml
$ ocamlc -dparsetree -pp cat test.ml
Result before:
[
structure_item (/tmp/ocamlpp1775ad[1,0+0]..[1,0+9])
Pstr_value Nonrec
[
<def>
pattern (/tmp/ocamlpp1775ad[1,0+4]..[1,0+5])
Ppat_var "x" (/tmp/ocamlpp1775ad[1,0+4]..[1,0+5])
expression (/tmp/ocamlpp1775ad[1,0+8]..[1,0+9])
Pexp_constant PConst_int (1,None)
]
]
Problem: the locations in the AST refer to the temporary
file created for preprocessing, which has since been removed.
Result after:
[
structure_item (test.ml[1,0+0]..[1,0+9])
Pstr_value Nonrec
[
<def>
pattern (test.ml[1,0+4]..[1,0+5])
Ppat_var "x" (test.ml[1,0+4]..[1,0+5])
expression (test.ml[1,0+8]..[1,0+9])
Pexp_constant PConst_int (1,None)
]
]
smuenzel
reviewed
Oct 23, 2023
| | Signature -> Parse.interface lexbuf | ||
|
|
||
| let file_aux ~tool_name inputfile (type a) parse_fun invariant_fun | ||
| let file_aux ~tool_name ~sourcefile inputfile (type a) parse_fun invariant_fun |
Contributor
There was a problem hiding this comment.
Maybe the naming of these arguments could be changed a little?
We read source from the inputfile below, not the sourcefile.
So maybe source_for_locations? or something like that
Octachron
approved these changes
Oct 23, 2023
Member
Octachron
left a comment
Octachron
left a comment
There was a problem hiding this comment.
I agree that we want to keep using the source file name in location, since the temporary file is always removed after parsing.
gasche
force-pushed
the
fix-pp-locations
branch
from
416a5f8 to
3f2009e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
I was reading the code of
Pparse.file_auxto review #12654 and I found a bug in the choice of filename used in AST locations. (cc @malekbr @Octachron)When using the
-ppoption, the locations in the AST mention the temporary file created to implement-pp, instead of mentioning the source file. The present PR fixes this bug.