[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 09/29] qapi-gen: Convert from getopt to argpa
From: |
Marc-Andre Lureau |
Subject: |
Re: [Qemu-devel] [PATCH v2 09/29] qapi-gen: Convert from getopt to argparse |
Date: |
Tue, 13 Feb 2018 16:24:56 +0100 |
On Sun, Feb 11, 2018 at 10:35 AM, Markus Armbruster <address@hidden> wrote:
> argparse is nicer to use than getopt, and gives us --help almost for
> free.
>
> Signed-off-by: Markus Armbruster <address@hidden>
nice,
Reviewed-by: Marc-André Lureau <address@hidden>
> ---
> scripts/qapi-gen.py | 48 ++++++++++++++++++++++++++++++------------------
> scripts/qapi/common.py | 43 -------------------------------------------
> 2 files changed, 30 insertions(+), 61 deletions(-)
>
> diff --git a/scripts/qapi-gen.py b/scripts/qapi-gen.py
> index 2100ca1145..e5be484e3e 100755
> --- a/scripts/qapi-gen.py
> +++ b/scripts/qapi-gen.py
> @@ -4,8 +4,11 @@
> # This work is licensed under the terms of the GNU GPL, version 2 or later.
> # See the COPYING file in the top-level directory.
>
> +from __future__ import print_function
> +import argparse
> +import re
> import sys
> -from qapi.common import parse_command_line, QAPISchema
> +from qapi.common import QAPISchema
> from qapi.types import gen_types
> from qapi.visit import gen_visit
> from qapi.commands import gen_commands
> @@ -15,26 +18,35 @@ from qapi.doc import gen_doc
>
>
> def main(argv):
> - (input_file, output_dir, prefix, opts) = \
> - parse_command_line('bu', ['builtins', 'unmask-non-abi-names'])
> + parser = argparse.ArgumentParser(
> + description='Generate code from a QAPI schema')
> + parser.add_argument('-b', '--builtins', action='store_true',
> + help="generate code for built-in types")
> + parser.add_argument('-o', '--output_dir', action='store', default='',
> + help="write output to directory OUTPUT_DIR")
> + parser.add_argument('-p', '--prefix', action='store', default='',
> + help="prefix for symbols")
> + parser.add_argument('-u', '--unmask-non-abi-names', action='store_true',
> + dest='unmask',
> + help="expose non-ABI names in introspection")
> + parser.add_argument('schema', action='store')
> + args = parser.parse_args()
>
> - opt_builtins = False
> - opt_unmask = False
> + match = re.match(r'([A-Za-z_.-][A-Za-z0-9_.-]*)?', args.prefix)
> + if match.end() != len(args.prefix):
> + print("%s: 'funny character '%s' in argument of --prefix"
> + % (sys.argv[0], args.prefix[match.end()]),
> + file=sys.stderr)
> + sys.exit(1)
>
> - for o, a in opts:
> - if o in ('-b', '--builtins'):
> - opt_builtins = True
> - if o in ('-u', '--unmask-non-abi-names'):
> - opt_unmask = True
> + schema = QAPISchema(args.schema)
>
> - schema = QAPISchema(input_file)
> -
> - gen_types(schema, output_dir, prefix, opt_builtins)
> - gen_visit(schema, output_dir, prefix, opt_builtins)
> - gen_commands(schema, output_dir, prefix)
> - gen_events(schema, output_dir, prefix)
> - gen_introspect(schema, output_dir, prefix, opt_unmask)
> - gen_doc(schema, output_dir, prefix)
> + gen_types(schema, args.output_dir, args.prefix, args.builtins)
> + gen_visit(schema, args.output_dir, args.prefix, args.builtins)
> + gen_commands(schema, args.output_dir, args.prefix)
> + gen_events(schema, args.output_dir, args.prefix)
> + gen_introspect(schema, args.output_dir, args.prefix, args.unmask)
> + gen_doc(schema, args.output_dir, args.prefix)
>
>
> if __name__ == '__main__':
> diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
> index 868ec25deb..8290795dc1 100644
> --- a/scripts/qapi/common.py
> +++ b/scripts/qapi/common.py
> @@ -13,7 +13,6 @@
>
> from __future__ import print_function
> import errno
> -import getopt
> import os
> import re
> import string
> @@ -1924,48 +1923,6 @@ def build_params(arg_type, boxed, extra):
>
>
> #
> -# Common command line parsing
> -#
> -
> -
> -def parse_command_line(extra_options='', extra_long_options=[]):
> -
> - try:
> - opts, args = getopt.gnu_getopt(sys.argv[1:],
> - 'p:o:' + extra_options,
> - ['prefix=', 'output-dir=']
> - + extra_long_options)
> - except getopt.GetoptError as err:
> - print("%s: %s" % (sys.argv[0], str(err)), file=sys.stderr)
> - sys.exit(1)
> -
> - output_dir = ''
> - prefix = ''
> - extra_opts = []
> -
> - for oa in opts:
> - o, a = oa
> - if o in ('-p', '--prefix'):
> - match = re.match(r'([A-Za-z_.-][A-Za-z0-9_.-]*)?', a)
> - if match.end() != len(a):
> - print("%s: 'funny character '%s' in argument of --prefix" \
> - % (sys.argv[0], a[match.end()]), file=sys.stderr)
> - sys.exit(1)
> - prefix = a
> - elif o in ('-o', '--output-dir'):
> - output_dir = a + '/'
> - else:
> - extra_opts.append(oa)
> -
> - if len(args) != 1:
> - print("%s: need exactly one argument" % sys.argv[0], file=sys.stderr)
> - sys.exit(1)
> - fname = args[0]
> -
> - return (fname, output_dir, prefix, extra_opts)
> -
> -
> -#
> # Accumulate and write output
> #
>
> --
> 2.13.6
>
- [Qemu-devel] [PATCH v2 28/29] Fix up dangling references to qmp-commands.* in comment and doc, (continued)
- [Qemu-devel] [PATCH v2 28/29] Fix up dangling references to qmp-commands.* in comment and doc, Markus Armbruster, 2018/02/11
- [Qemu-devel] [PATCH v2 29/29] qapi: Don't create useless directory qapi-generated, Markus Armbruster, 2018/02/11
- [Qemu-devel] [PATCH v2 09/29] qapi-gen: Convert from getopt to argparse, Markus Armbruster, 2018/02/11
- [Qemu-devel] [PATCH v2 20/29] qapi/types qapi/visit: Generate built-in stuff into separate files, Markus Armbruster, 2018/02/11
- [Qemu-devel] [PATCH v2 14/29] qapi: Concentrate QAPISchemaParser.exprs updates in .__init__(), Markus Armbruster, 2018/02/11