John Snow <js...@redhat.com> writes:
> Signed-off-by: John Snow <js...@redhat.com>
> ---
> scripts/qapi/common.py | 16 +++++++---------
> scripts/qapi/schema.py | 14 +++++++-------
> 2 files changed, 14 insertions(+), 16 deletions(-)
>
> diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
> index 87d87b95e5..c665e67495 100644
> --- a/scripts/qapi/common.py
> +++ b/scripts/qapi/common.py
> @@ -14,6 +14,11 @@
> import re
>
>
> +EATSPACE = '\033EATSPACE.'
> +POINTER_SUFFIX = ' *' + EATSPACE
> +c_name_trans = str.maketrans('.-', '__')
> +
> +
You rename and move. pylint gripes about the names, but it doesn't
actually ask for the move, as far as I can tell. Can you explain why
you move?
> # ENUMName -> ENUM_NAME, EnumName1 -> ENUM_NAME1
> # ENUM_NAME -> ENUM_NAME, ENUM_NAME1 -> ENUM_NAME1, ENUM_Name2 -> ENUM_NAME2
> # ENUM24_Name -> ENUM24_NAME
> @@ -42,9 +47,6 @@ def c_enum_const(type_name, const_name, prefix=None):
> return camel_to_upper(type_name) + '_' + c_name(const_name,
> False).upper()
>
>
> -c_name_trans = str.maketrans('.-', '__')
> -
> -
> # Map @name to a valid C identifier.
> # If @protect, avoid returning certain ticklish identifiers (like
> # C keywords) by prepending 'q_'.
> @@ -89,10 +91,6 @@ def c_name(name, protect=True):
> return name
>
>
> -eatspace = '\033EATSPACE.'
> -pointer_suffix = ' *' + eatspace
> -
> -
> class Indent:
> """
> Indent-level management.
> @@ -135,12 +133,12 @@ def pop(self, amount: int = 4) -> int:
>
>
> # Generate @code with @kwds interpolated.
> -# Obey indent_level, and strip eatspace.
> +# Obey INDENT level, and strip EATSPACE.
Is the change to INDENT intentional?
> def cgen(code, **kwds):
> raw = code % kwds
> if INDENT:
> raw, _ = re.subn(r'^(?!(#|$))', str(INDENT), raw, flags=re.MULTILINE)
> - return re.sub(re.escape(eatspace) + r' *', '', raw)
> + return re.sub(re.escape(EATSPACE) + r' *', '', raw)
>
>
> def mcgen(code, **kwds):
[...]
