Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor UserIntegerOption to work with BuiltinOption.

This commit is contained in:
Jussi Pakkanen 2019-12-21 20:40:39 +02:00
parent 796b4c120a
commit 6b5c1a4fc3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mesonbuild/coredata.py
View File

@ -96,11 +96,12 @@ class UserBooleanOption(UserOption[bool]):
raise MesonException('Value %s is not boolean (true or false).' % value) raise MesonException('Value %s is not boolean (true or false).' % value)
class UserIntegerOption(UserOption[int]): class UserIntegerOption(UserOption[int]):
def __init__(self, description, min_value, max_value, value, yielding=None): def __init__(self, description, value, yielding=None):
min_value, max_value, default_value = value
super().__init__(description, [True, False], yielding) super().__init__(description, [True, False], yielding)
self.min_value = min_value self.min_value = min_value
self.max_value = max_value self.max_value = max_value
self.set_value(value) self.set_value(default_value)
c = [] c = []
if min_value is not None: if min_value is not None:
c.append('>=' + str(min_value)) c.append('>=' + str(min_value))
@ -127,7 +128,7 @@ class UserIntegerOption(UserOption[int]):
class UserUmaskOption(UserIntegerOption, UserOption[T.Union[str, int]]): class UserUmaskOption(UserIntegerOption, UserOption[T.Union[str, int]]):
def __init__(self, description, value, yielding=None): def __init__(self, description, value, yielding=None):
super().__init__(description, 0, 0o777, value, yielding) super().__init__(description, (0, 0o777, value), yielding)
self.choices = ['preserve', '0000-0777'] self.choices = ['preserve', '0000-0777']
def printable_value(self): def printable_value(self):
@ -525,7 +526,7 @@ class CoreData:
UserIntegerOption( UserIntegerOption(
'Maximum number of linker processes to run or 0 for no ' 'Maximum number of linker processes to run or 0 for no '
'limit', 'limit',
0, None, 0) (0, None, 0))
elif backend_name.startswith('vs'): elif backend_name.startswith('vs'):
self.backend_options['backend_startup_project'] = \ self.backend_options['backend_startup_project'] = \
UserStringOption( UserStringOption(
@ -967,7 +968,7 @@ class BuiltinOption(T.Generic[_T, _U]):
"""Class for a builtin option type. """Class for a builtin option type.
Currently doesn't support UserIntegerOption, or a few other cases. There are some cases that are not fully supported yet.
""" """
def __init__(self, opt_type: T.Type[_U], description: str, default: T.Any, yielding: bool = True, *, def __init__(self, opt_type: T.Type[_U], description: str, default: T.Any, yielding: bool = True, *,

5
mesonbuild/optinterpreter.py
View File

@ -90,10 +90,9 @@ def ComboParser(description, kwargs):
def IntegerParser(description, kwargs): def IntegerParser(description, kwargs):
if 'value' not in kwargs: if 'value' not in kwargs:
raise OptionException('Integer option must contain value argument.') raise OptionException('Integer option must contain value argument.')
inttuple = (kwargs.get('min', None), kwargs.get('max', None), kwargs['value'])
return coredata.UserIntegerOption(description, return coredata.UserIntegerOption(description,
kwargs.get('min', None), inttuple,
kwargs.get('max', None),
kwargs['value'],
kwargs.get('yield', coredata.default_yielding)) kwargs.get('yield', coredata.default_yielding))
# FIXME: Cannot use FeatureNew while parsing options because we parse it before # FIXME: Cannot use FeatureNew while parsing options because we parse it before