On Tue, Sep 5, 2017 at 4:24 PM, Markus Armbruster <arm...@redhat.com> wrote:
> Marc-André Lureau <marcandre.lur...@redhat.com> writes:
>
>> Add 'ifcond' condition to QLit objects.
>>
>> to_qlit() handles the (obj, ifcond) tuples.
>>
>> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
>> ---
>> scripts/qapi-introspect.py | 20 +++++++++++---------
>> 1 file changed, 11 insertions(+), 9 deletions(-)
>>
>> diff --git a/scripts/qapi-introspect.py b/scripts/qapi-introspect.py
>> index 9ef6f271d4..5e736a06df 100644
>> --- a/scripts/qapi-introspect.py
>> +++ b/scripts/qapi-introspect.py
>> @@ -125,12 +125,12 @@ const QLitObject %(c_name)s = %(c_string)s;
>> return '[' + self._use_type(typ.element_type) + ']'
>> return self._name(typ.name)
>>
>> - def _gen_qlit(self, name, mtype, obj):
>> + def _gen_qlit(self, name, mtype, obj, ifcond):
>> if mtype not in ('command', 'event', 'builtin', 'array'):
>> name = self._name(name)
>> obj['name'] = name
>> obj['meta-type'] = mtype
>> - self._qlits.append(obj)
>> + self._qlits.append((obj, ifcond))
>
> If I read this correctly, all elements of self._qlits become pairs, even
> the unconditional ones. They all go through to_qlit()'s tuple case.
> Works, because gen_if(None) and gen_endif(None) do nothing.
>
> Would
>
> if ifcond:
> obj = (obj, ifcond)
> self.qlits.append(obj)
>
> be clearer? It could be a bit more efficient, but I doubt that matters.
I prefer the tuple case only version, but up to you if you want me to change it.
>
>>
>> def _gen_member(self, member):
>> ret = {'name': member.name, 'type': self._use_type(member.type)}
>> @@ -146,26 +146,27 @@ const QLitObject %(c_name)s = %(c_string)s;
>> return {'case': variant.name, 'type': self._use_type(variant.type)}
>>
>> def visit_builtin_type(self, name, info, json_type):
>> - self._gen_qlit(name, 'builtin', {'json-type': json_type})
>> + self._gen_qlit(name, 'builtin', {'json-type': json_type}, None)
>>
>> def visit_enum_type(self, name, info, values, prefix, ifcond):
>> - self._gen_qlit(name, 'enum', {'values': values})
>> + self._gen_qlit(name, 'enum', {'values': values}, ifcond)
>>
>> def visit_array_type(self, name, info, element_type, ifcond):
>> element = self._use_type(element_type)
>> - self._gen_qlit('[' + element + ']', 'array', {'element-type':
>> element})
>> + self._gen_qlit('[' + element + ']', 'array', {'element-type':
>> element},
>> + ifcond)
>>
>> def visit_object_type_flat(self, name, info, members, variants, ifcond):
>> obj = {'members': [self._gen_member(m) for m in members]}
>> if variants:
>> obj.update(self._gen_variants(variants.tag_member.name,
>> variants.variants))
>> - self._gen_qlit(name, 'object', obj)
>> + self._gen_qlit(name, 'object', obj, ifcond)
>>
>> def visit_alternate_type(self, name, info, variants, ifcond):
>> self._gen_qlit(name, 'alternate',
>> {'members': [{'type': self._use_type(m.type)}
>> - for m in variants.variants]})
>> + for m in variants.variants]}, ifcond)
>>
>> def visit_command(self, name, info, arg_type, ret_type,
>> gen, success_response, boxed, ifcond):
>> @@ -173,11 +174,12 @@ const QLitObject %(c_name)s = %(c_string)s;
>> ret_type = ret_type or self._schema.the_empty_object_type
>> self._gen_qlit(name, 'command',
>> {'arg-type': self._use_type(arg_type),
>> - 'ret-type': self._use_type(ret_type)})
>> + 'ret-type': self._use_type(ret_type)}, ifcond)
>>
>> def visit_event(self, name, info, arg_type, boxed, ifcond):
>> arg_type = arg_type or self._schema.the_empty_object_type
>> - self._gen_qlit(name, 'event', {'arg-type':
>> self._use_type(arg_type)})
>> + self._gen_qlit(name, 'event', {'arg-type':
>> self._use_type(arg_type)},
>> + ifcond)
>>
>> # Debugging aid: unmask QAPI schema's type names
>> # We normally mask them, because they're not QMP wire ABI
>
--
Marc-André Lureau
