Filterx expr location fixes #120
Merged
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
bazsi
force-pushed
the
filterx-expr-location-fixes
branch
2 times, most recently
from
d759a87
to
4759725
Compare
bazsi
force-pushed
the
filterx-expr-location-fixes
branch
from
4759725
to
2deffff
Compare
Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
If @line is encountered in the input stream, we overwrite our idea of where we are in the input file so that we can properly report on file locations, even if we are expanding a block or other generators. This patch makes it possible to recover the original location (e.g. before @line was called), which is needed to extract the source text _after_ generation/substitution has happened. This means that whenever we display the source text (e.g. error report, or as a part of the filterx expr being executed), we can use the post-processed version. Whenever we want to read the file that contained the source, we can use the current yylloc. If we want to extract from the postprocessed buffer, we need to get back to the original yylloc. Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
This pragma reverts to the original location, as if the previous @line was not even there. Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
Signed-off-by: Balazs Scheidler <balazs.scheidler@axoflow.com>
bazsi
force-pushed
the
filterx-expr-location-fixes
branch
from
2deffff
to
a9fae93
Compare
alltilla
approved these changes
Jun 4, 2024
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.
This improves filterx expression representation in trace level logs by improving the location tracking for filterx source text.
This will also cause any source related displays (e.g. error output or the filterx expression display) to use the postprocessed output, e.g. the text after substitution, instead of the original text read from the source file.
This makes it easier to find issues that are related to parts substituted from parameters/environment variables.
This sits on top of the app-transform() branch