From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: mdroth@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH RFC v5 03/32] qapi: QAPISchema code generation helper methods
Date: Mon, 7 Sep 2015 12:16:14 +0200 [thread overview]
Message-ID: <1441621003-2434-4-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1441621003-2434-1-git-send-email-armbru@redhat.com>
New methods c_name(), c_type(), c_null(), json_type(),
alternate_qtype().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
---
scripts/qapi.py | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 86 insertions(+), 7 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 6c7d37b..0f6d475 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -762,17 +762,57 @@ class QAPISchemaEntity(object):
self.name = name
self.info = info
+ def c_name(self):
+ return c_name(self.name)
+
def check(self, schema):
pass
class QAPISchemaType(QAPISchemaEntity):
- pass
+ def c_type(self, is_param=False):
+ return c_name(self.name) + pointer_suffix
+
+ def c_null(self):
+ return 'NULL'
+
+ def json_type(self):
+ pass
+
+ def alternate_qtype(self):
+ json2qtype = {
+ 'string': 'QTYPE_QSTRING',
+ 'number': 'QTYPE_QFLOAT',
+ 'int': 'QTYPE_QINT',
+ 'boolean': 'QTYPE_QBOOL',
+ 'object': 'QTYPE_QDICT'
+ }
+ return json2qtype.get(self.json_type())
class QAPISchemaBuiltinType(QAPISchemaType):
- def __init__(self, name):
+ def __init__(self, name, json_type, c_type, c_null):
QAPISchemaType.__init__(self, name, None)
+ assert not c_type or isinstance(c_type, str)
+ assert json_type in ('string', 'number', 'int', 'boolean', 'null',
+ 'value')
+ self._json_type_name = json_type
+ self._c_type_name = c_type
+ self._c_null_val = c_null
+
+ def c_name(self):
+ return self.name
+
+ def c_type(self, is_param=False):
+ if is_param and self.name == 'str':
+ return 'const ' + self._c_type_name
+ return self._c_type_name
+
+ def c_null(self):
+ return self._c_null_val
+
+ def json_type(self):
+ return self._json_type_name
class QAPISchemaEnumType(QAPISchemaType):
@@ -785,6 +825,15 @@ class QAPISchemaEnumType(QAPISchemaType):
def check(self, schema):
assert len(set(self.values)) == len(self.values)
+ def c_type(self, is_param=False):
+ return c_name(self.name)
+
+ def c_null(self):
+ return c_enum_const(self.name, (self.values + ['MAX'])[0])
+
+ def json_type(self):
+ return 'string'
+
class QAPISchemaArrayType(QAPISchemaType):
def __init__(self, name, info, element_type):
@@ -797,6 +846,9 @@ class QAPISchemaArrayType(QAPISchemaType):
self.element_type = schema.lookup_type(self._element_type_name)
assert self.element_type
+ def json_type(self):
+ return 'array'
+
class QAPISchemaObjectType(QAPISchemaType):
def __init__(self, name, info, base, local_members, variants):
@@ -834,6 +886,17 @@ class QAPISchemaObjectType(QAPISchemaType):
self.variants.check(schema, members, seen)
self.members = members
+ def c_name(self):
+ assert self.info
+ return QAPISchemaType.c_name(self)
+
+ def c_type(self, is_param=False):
+ assert self.info
+ return QAPISchemaType.c_type(self)
+
+ def json_type(self):
+ return 'object'
+
class QAPISchemaObjectTypeMember(object):
def __init__(self, name, typ, optional):
@@ -898,6 +961,9 @@ class QAPISchemaAlternateType(QAPISchemaType):
def check(self, schema):
self.variants.check(schema, [], {})
+ def json_type(self):
+ return 'value'
+
class QAPISchemaCommand(QAPISchemaEntity):
def __init__(self, name, info, arg_type, ret_type, gen, success_response):
@@ -963,15 +1029,28 @@ class QAPISchema(object):
def lookup_type(self, name):
return self.lookup_entity(name, QAPISchemaType)
- def _def_builtin_type(self, name):
- self._def_entity(QAPISchemaBuiltinType(name))
+ def _def_builtin_type(self, name, json_type, c_type, c_null):
+ self._def_entity(QAPISchemaBuiltinType(name, json_type,
+ c_type, c_null))
if name != '**':
self._make_array_type(name) # TODO really needed?
def _def_predefineds(self):
- for t in ['str', 'number', 'int', 'int8', 'int16', 'int32', 'int64',
- 'uint8', 'uint16', 'uint32', 'uint64', 'size', 'bool', '**']:
- self._def_builtin_type(t)
+ for t in [('str', 'string', 'char' + pointer_suffix, 'NULL'),
+ ('number', 'number', 'double', '0'),
+ ('int', 'int', 'int64_t', '0'),
+ ('int8', 'int', 'int8_t', '0'),
+ ('int16', 'int', 'int16_t', '0'),
+ ('int32', 'int', 'int32_t', '0'),
+ ('int64', 'int', 'int64_t', '0'),
+ ('uint8', 'int', 'uint8_t', '0'),
+ ('uint16', 'int', 'uint16_t', '0'),
+ ('uint32', 'int', 'uint32_t', '0'),
+ ('uint64', 'int', 'uint64_t', '0'),
+ ('size', 'int', 'uint64_t', '0'),
+ ('bool', 'boolean', 'bool', 'false'),
+ ('**', 'value', None, None)]:
+ self._def_builtin_type(*t)
def _make_implicit_enum_type(self, name, values):
name = name + 'Kind'
--
2.4.3
next prev parent reply other threads:[~2015-09-07 10:16 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-07 10:16 [Qemu-devel] [PATCH RFC v5 00/32] qapi: QMP introspection Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 01/32] qapi: Rename class QAPISchema to QAPISchemaParser Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 02/32] qapi: New QAPISchema intermediate reperesentation Markus Armbruster
2015-09-08 3:38 ` Eric Blake
2015-09-09 7:47 ` Markus Armbruster
2015-09-07 10:16 ` Markus Armbruster [this message]
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 04/32] qapi: New QAPISchemaVisitor Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 05/32] tests/qapi-schema: Convert test harness to QAPISchemaVisitor Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 06/32] qapi: Split up some typedefs to ease review Markus Armbruster
2015-09-08 12:25 ` Eric Blake
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 07/32] qapi: Generate comments to simplify splitting for review Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 08/32] Revert "qapi: Generate comments to simplify splitting for review" Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 09/32] Revert "qapi: Split up some typedefs to ease review" Markus Armbruster
2015-09-08 12:26 ` Eric Blake
2015-09-08 12:58 ` Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 10/32] qapi-types: Convert to QAPISchemaVisitor, fixing flat unions Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 11/32] qapi-visit: Convert to QAPISchemaVisitor, fixing bugs Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 12/32] qapi-commands: Convert to QAPISchemaVisitor Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 13/32] qapi: De-duplicate enum code generation Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 14/32] qapi-event: Eliminate global variable event_enum_value Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 15/32] qapi-event: Convert to QAPISchemaVisitor, fixing data with base Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 16/32] qapi: Generate comments to simplify splitting for review Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 17/32] Revert "qapi: Generate comments to simplify splitting for review" Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 18/32] qapi: Replace dirty is_c_ptr() by method c_null() Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 19/32] qapi: Clean up after recent conversions to QAPISchemaVisitor Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 20/32] qapi-visit: Rearrange code a bit Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 21/32] qapi-commands: Rearrange code Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 22/32] qapi: Rename qmp_marshal_input_FOO() to qmp_marshal_FOO() Markus Armbruster
2015-09-08 14:50 ` Eric Blake
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 23/32] qapi: De-duplicate parameter list generation Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 24/32] qapi-commands: De-duplicate output marshaling functions Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 25/32] qapi: Improve built-in type documentation Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 26/32] qapi: Introduce a first class 'any' type Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 27/32] qom: Don't use 'gen': false for qom-get, qom-set, object-add Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 28/32] qapi-schema: Fix up misleading specification of netdev_add Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 29/32] qapi: Pseudo-type '**' is now unused, drop it Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 30/32] qapi: New QMP command query-qmp-schema for QMP introspection Markus Armbruster
2015-09-08 16:11 ` Eric Blake
2015-09-08 18:48 ` Markus Armbruster
2015-09-08 20:06 ` Eric Blake
2015-09-09 6:31 ` Markus Armbruster
2015-09-10 22:12 ` Michael Roth
2015-09-11 7:02 ` Markus Armbruster
2015-09-11 8:33 ` Daniel P. Berrange
2015-09-11 13:30 ` Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 31/32] qapi-introspect: Map all integer types to 'int' Markus Armbruster
2015-09-07 10:16 ` [Qemu-devel] [PATCH RFC v5 32/32] qapi-introspect: Hide type names Markus Armbruster
2015-09-11 7:06 ` [Qemu-devel] [PATCH RFC v5 00/32] qapi: QMP introspection Markus Armbruster
2015-09-15 18:13 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441621003-2434-4-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).