[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/15] qapi: Make c_type() more OO-like
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 03/15] qapi: Make c_type() more OO-like |
Date: |
Fri, 18 Mar 2016 11:04:17 +0100 |
From: Eric Blake <address@hidden>
QAPISchemaType.c_type() is a bit awkward: it takes two optional
boolean flags is_param and is_unboxed, and they should never both
be True.
Add a new method for each of the flags, and drop the flags from
c_type().
Most callers pass no flags; they remain unchanged.
One caller passes is_param=True; call the new .c_param_type()
instead.
One caller passes is_unboxed=True, except for simple union types.
This is actually an ugly special case that will go away soon, so
until then, we now have to call either .c_type() or the new
.c_unboxed_type(). Tolerable in the interim.
It requires slightly more Python, but is arguably easier to read.
Suggested-by: Markus Armbruster <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
scripts/qapi-types.py | 7 +++++--
scripts/qapi.py | 39 ++++++++++++++++++++++++++++++---------
2 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 0306a88..f194bea 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -124,11 +124,14 @@ def gen_variants(variants):
for var in variants.variants:
# Ugly special case for simple union TODO get rid of it
simple_union_type = var.simple_union_type()
- typ = simple_union_type or var.type
+ if simple_union_type:
+ typ = simple_union_type.c_type()
+ else:
+ typ = var.type.c_unboxed_type()
ret += mcgen('''
%(c_type)s %(c_name)s;
''',
- c_type=typ.c_type(is_unboxed=not simple_union_type),
+ c_type=typ,
c_name=c_name(var.name))
ret += mcgen('''
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 6b2aa6e..b7fbdae 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -822,8 +822,18 @@ class QAPISchemaVisitor(object):
class QAPISchemaType(QAPISchemaEntity):
- def c_type(self, is_param=False, is_unboxed=False):
- return c_name(self.name) + pointer_suffix
+ # Return the C type for common use.
+ # For the types we commonly box, this is a pointer type.
+ def c_type(self):
+ pass
+
+ # Return the C type to be used in a parameter list.
+ def c_param_type(self):
+ return self.c_type()
+
+ # Return the C type to be used where we suppress boxing.
+ def c_unboxed_type(self):
+ return self.c_type()
def c_null(self):
return 'NULL'
@@ -855,8 +865,11 @@ class QAPISchemaBuiltinType(QAPISchemaType):
def c_name(self):
return self.name
- def c_type(self, is_param=False, is_unboxed=False):
- if is_param and self.name == 'str':
+ def c_type(self):
+ return self._c_type_name
+
+ def c_param_type(self):
+ if self.name == 'str':
return 'const ' + self._c_type_name
return self._c_type_name
@@ -889,7 +902,7 @@ class QAPISchemaEnumType(QAPISchemaType):
# See QAPISchema._make_implicit_enum_type()
return self.name.endswith('Kind')
- def c_type(self, is_param=False, is_unboxed=False):
+ def c_type(self):
return c_name(self.name)
def member_names(self):
@@ -921,6 +934,9 @@ class QAPISchemaArrayType(QAPISchemaType):
def is_implicit(self):
return True
+ def c_type(self):
+ return c_name(self.name) + pointer_suffix
+
def json_type(self):
return 'array'
@@ -985,12 +1001,14 @@ class QAPISchemaObjectType(QAPISchemaType):
assert not self.is_implicit()
return QAPISchemaType.c_name(self)
- def c_type(self, is_param=False, is_unboxed=False):
+ def c_type(self):
assert not self.is_implicit()
- if is_unboxed:
- return c_name(self.name)
return c_name(self.name) + pointer_suffix
+ def c_unboxed_type(self):
+ assert not self.is_implicit()
+ return c_name(self.name)
+
def json_type(self):
return 'object'
@@ -1139,6 +1157,9 @@ class QAPISchemaAlternateType(QAPISchemaType):
for v in self.variants.variants:
v.check_clash(self.info, seen)
+ def c_type(self):
+ return c_name(self.name) + pointer_suffix
+
def json_type(self):
return 'value'
@@ -1630,7 +1651,7 @@ def gen_params(arg_type, extra):
sep = ', '
if memb.optional:
ret += 'bool has_%s, ' % c_name(memb.name)
- ret += '%s %s' % (memb.type.c_type(is_param=True), c_name(memb.name))
+ ret += '%s %s' % (memb.type.c_param_type(), c_name(memb.name))
if extra:
ret += sep + extra
return ret
--
2.4.3
- [Qemu-devel] [PULL 14/15] qapi: Allow anonymous base for flat union, (continued)
- [Qemu-devel] [PULL 14/15] qapi: Allow anonymous base for flat union, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 08/15] qapi-commands: Utilize implicit struct visits, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 06/15] qapi-event: Drop qmp_output_get_qobject() null check, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 04/15] qapi: Adjust names of implicit types, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 10/15] qapi: Inline gen_visit_members() into lone caller, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 15/15] qapi: Use anonymous bases in QMP flat unions, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 02/15] qapi: Fix command with named empty argument type, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 11/15] qapi: Drop unused c_null(), Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 13/15] qapi: Make BlockdevOptions doc example closer to reality, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 09/15] qapi-commands: Inline single-use helpers of gen_marshal(), Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 03/15] qapi: Make c_type() more OO-like,
Markus Armbruster <=
- [Qemu-devel] [PULL 05/15] qapi: Emit implicit structs in generated C, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 07/15] qapi-event: Utilize implicit struct visits, Markus Armbruster, 2016/03/18
- [Qemu-devel] [PULL 12/15] qapi: Don't special-case simple union wrappers, Markus Armbruster, 2016/03/18
- Re: [Qemu-devel] [PULL 00/15] QAPI patches for 2016-03-18, Peter Maydell, 2016/03/18