Properly handle parsing of equals in chplconfig #26182
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
Signed-off-by: Jade Abraham <[email protected]>
Signed-off-by: Jade Abraham <[email protected]>
Signed-off-by: Jade Abraham <[email protected]>
Signed-off-by: Jade Abraham <[email protected]>
DanilaFe
approved these changes
Oct 31, 2024
|
|
||
| parts = line.split('=', maxsplit=1) | ||
| var = parts[0].strip() | ||
| val = parts[-1].strip() |
There was a problem hiding this comment.
I'm thinking about how you can silence the warning if there's a leading equal sign in a variable for real, and I'm coming up with nothing. I don't think you should strip the string for the purposes of warning about it. So:
A==B # warns
A == B # warns
A = =B # doesn't warn
There was a problem hiding this comment.
This was an intentional choice that A = = B still warns. I think its more likely to be a mistake than truly what a user wants. If they want a value to start with =, writing A = '= B' should work
There was a problem hiding this comment.
As long as there's a way to silence the warning (A='=B' seems like it is one), I'm happy.
There was a problem hiding this comment.
... Mind adding a test for A = '= B'?
Signed-off-by: Jade Abraham <[email protected]>
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.
Properly handles the parsing of chplconfig files. #26178 added the ability to parse chplconfig variables with values including
=, but that broke the warning for something likeCHPL_VAR==value.This PR resolves the issue by refactoring some of the parsing code in
overrides.pyto check error cases inskip_line, rather than relying on python exceptions. Then to avoid duplication of logic, renamesskip_linetocheck_lineand has it return the parsed variable.Fixes the issue introduced in #26178 and reverts #26180
Tested by running
start_test test/chplenv[Reviewed by @DanilaFe]