[pull] master from SCons:master #31
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
Also correct one long-standing minor inconsistency: if a list of names
for a variable is given, it is split into name and aliases, with the
name not duplicated into the aliases. If only one name is given, it is
both the name and the only entry in the aliases. All of the usages of
aliases combine them back together anyway, like:
if arg in option.aliases + [option.key,]:
So there's no need for the behavior of the one-name form including the
name in aliases. One test did need to change for this - the test of a
custom help formatter function was wired to accept the old form, but
only because of the way the custom formatter in the test was written,
so this is a self-contained problem.
Signed-off-by: Mats Wichmann <[email protected]>
Simplistic macro replacement is now done on the contents of CPPDEFINES, to improve accuracy of conditional inclusion as compared to the real preprocessor (ref: issue #4623). Signed-off-by: Mats Wichmann <[email protected]>
Replacement is now limited to five passes, to avoid going into an endless loop in pathlogical cases where there are three or more macros that circularly refer to each other. No error is reported in this case. Replacement is now only done for the otional C Conditional scanner, not for the classical C scanner. Signed-off-by: Mats Wichmann <[email protected]>
Now using the "modified" approach from the PR discussion: unroll the dict comprehension and as we process replacements keep track if changes were made, rather than doing the relatively more expensive dict-vs-dict comparison at the end of each loop. Signed-off-by: Mats Wichmann <[email protected]>
Improve C scanner conditional inclusion
Turn `SCons.Variables.Variable` into a dataclass
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.1)
Can you help keep this open source service alive? 💖 Please sponsor : )