Special case meson.version().version_compare() in ternaries also - #16139
Open
QuLogic wants to merge 1 commit into
Open
Special case meson.version().version_compare() in ternaries also#16139QuLogic wants to merge 1 commit into
QuLogic wants to merge 1 commit into
Conversation
This is a corollary to mesonbuild#7594, but in ternaries.
QuLogic
force-pushed
the
ternary-version
branch
from
August 23, 2026 21:04
2e1d2db to
c1dd4ba
Compare
bonzini
reviewed
Aug 24, 2026
Comment on lines
+428
to
434
| prev_meson_version = mesonlib.project_meson_versions[self.subproject] | ||
| if self.tmp_meson_version and isinstance(prev_meson_version, mesonlib.Range): | ||
| always = prev_meson_version.always(self.tmp_meson_version) | ||
| if always is not None: | ||
| mlog.warning(f"Conditional on version '{self.tmp_meson_version}' always evaluates to {str(always).lower()}", | ||
| location=self.current_node) | ||
| if result_bool: |
Contributor
There was a problem hiding this comment.
This should be a function, like
if self.tmp_meson_version:
prev_meson_version = set_project_meson_version(self.subproject, self.tmp_meson_version)
try:
if result_bool:
return self.evaluate_statement(node.trueblock)
finally:
mesonlib.project_meson_versions[self.subproject] = prev_meson_versionSo that there are just 3-4 lines of copied code between ?: and if evaluation.
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
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.
This is a corollary to #7594, but in ternaries.
Also fix some typos in the test case's comments.