Remove the BaseOption class #14312
Open
Remove the BaseOption class #14312
+43
−54
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
We have the OptionKey in the one caller that exists already, and this allows us to do a hash lookup instead of a linear walk.
Initially this is just used for getting builtin option default values, but it could be extended to show the default value of an option in the summary and in the introspection API.
dcbaker
force-pushed
the
submit/remove-base-options-class
branch
from
6de8803 to
a90ab0f
Compare
bruchar1
reviewed
Feb 28, 2025
mesonbuild/compilers/compilers.py
Outdated
|
|
||
| base_options = {key: base_opt.init_option(key) for key, base_opt in BASE_OPTIONS.items()} | ||
| def _make_option_key(opt: options.AnyOptionType) -> T.Tuple[OptionKey, options.AnyOptionType]: | ||
| return OptionKey(opt.name), opt |
There was a problem hiding this comment.
should we assert opt.name.startswith('b_') ?
There was a problem hiding this comment.
I think I'd prefer to use a unittest for that if we want to enforce that, to avoid runtime overhead
This class only served one purpose, to avoid typing the name of the option twice. Unfortunately the way it was implemented made getting the type checking right difficult, and required storing the same data twice. This patch replaces this approach with a dictionary comprehension that creates the OptionKey from the UserOption. This allows us to initialize a single dictionary once, avoid typing the name twice, delete lines of code, and get better type safety. As an added bonus, it means that the exported data from the module can be marked module constant, ie, ALL_CAPS.
dcbaker
force-pushed
the
submit/remove-base-options-class
branch
from
a90ab0f to
e7f4085
Compare
bruchar1
approved these changes
Feb 28, 2025
|
⚔️ conflicts. |
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 class ends up being a really complicated, not type safe, way of creating a dictionary of
OptionKey: UserOptionwithout typing the name twice. We can get the same result with a function that constructs the OptionKey from the UserOption, but with better type safety. It also remove a layer of initialization at startup.