From a187ae85729ec56e46ed0a0453458db18ab731eb Mon Sep 17 00:00:00 2001 From: Christian Linhart Date: Thu, 30 Oct 2014 15:12:52 +0100 Subject: [PATCH] generator: support listelement-ref Support for listelement-ref needs the following three changes (in the order as they appear in the patch): * making the current list-element accessible with the variable xcb_listelement which is a pointer to the list-element * supporting lists of simple-type for sumof with a nested expression * using the variable for resolving a listelement-ref expression Changes for V2 of this patch: - adapt to removal of patch "libxcb 2/6" from patchset "ListInputDevices". Changes for V3 of this patch: - adapt to V2 of patch "libxcb 5/6" from patchset "ListInputDevices" Message-ID: <54524764.9050200@DemoRecorder.com> Patch-Thread-Subject: [Xcb] support popcount of a list and associated xml changes Patch-Set: PopcountList Patch-Number: libxcb 4/4 Patch-Version: V3 Signed-off-by: Christian Linhart --- src/c_client.py | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/c_client.py b/src/c_client.py index f3d12c3..550411e 100644 --- a/src/c_client.py +++ b/src/c_client.py @@ -1660,6 +1660,14 @@ def _c_accessor_get_expr(expr, field_mapping): loopvar, loopvar, lengthvar, loopvar) _c_pre.indent() + # define and set xcb_listelement, so that it can be used by + # listelement-ref expressions. + if expr.contains_listelement_ref: + _c_pre.code( + "const %s *xcb_listelement = %s;", + field.c_field_type, listvar) + + # summation if expr.rhs == None: _c_pre.code("%s += *%s;", sumvar, listvar) else: @@ -1669,10 +1677,11 @@ def _c_accessor_get_expr(expr, field_mapping): # field mapping for the subexpression needs to include # the fields of the list-member type scoped_field_mapping = field_mapping.copy() - scoped_field_mapping.update( - _c_helper_field_mapping( - field.type.member, - [(listvar, '->', field.type.member)])) + if not field.type.member.is_simple: + scoped_field_mapping.update( + _c_helper_field_mapping( + field.type.member, + [(listvar, '->', field.type.member)])) # cause pre-code of the subexpression be added right here _c_pre.end() @@ -1690,6 +1699,8 @@ def _c_accessor_get_expr(expr, field_mapping): _c_pre.end() return sumvar; # return 'xcb_sumof(%s, %s)' % (list_name, c_length_func) + elif expr.op == 'listelement-ref': + return '(*xcb_listelement)'; elif expr.op != None: return ('(' + _c_accessor_get_expr(expr.lhs, field_mapping) + ' ' + expr.op + ' ' + -- 2.34.1