From: Christian Linhart <chris@demorecorder.com>
Date: Thu, 30 Oct 2014 14:31:58 +0000 (+0100)
Subject: rename _c_helper_absolute_name to _c_helper_fieldaccess_expr
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9be22b79c00329dc4cca7318d49473f6a3095fe;p=free-sw%2Fxcb%2Flibxcb

rename _c_helper_absolute_name to _c_helper_fieldaccess_expr

The function _c_helper_absolute_name was named in
a misleading way.
It computes a C-expression for accessing a field of an xcb-type.

Therefore the name _c_helper_fieldaccess_expr is more appropriate.

Signed-off-by: Christian Linhart <chris@demorecorder.com>
Message-ID: <1414679520-50871-1-git-send-email-chris@demorecorder.com>
Patch-Thread-Subject: [Xcb] xinput: make ListInputDevices work, sumof with nested expr, ...
Patch-Set: ListInputDevices
Patch-Number: libxcb 7/9
Patch-Version: V1
Signed-off-by: Christian Linhart <chris@DemoRecorder.com>
---

diff --git a/src/c_client.py b/src/c_client.py
index 43b3d91..44c88ed 100644
--- a/src/c_client.py
+++ b/src/c_client.py
@@ -484,7 +484,7 @@ def _c_type_setup(self, name, postfix):
 
             # recurse into this field
             # this has to be done here, i.e., after the field has been set up
-            # Otherwise the function _c_helper_absolute_name
+            # Otherwise the function _c_helper_fieldaccess_expr
             # will produce garbage or crash
             _c_type_setup(field.type, field.field_type, ())
             if field.type.is_list:
@@ -559,7 +559,7 @@ def _c_field_is_member_of_case_or_bitcase(field):
 
 # end of Functions for querying field properties
 
-def _c_helper_absolute_name(prefix, field=None):
+def _c_helper_fieldaccess_expr(prefix, field=None):
     """
     turn prefix, which is a list of tuples (name, separator, Type obj) into a string
     representing a valid name in C (based on the context)
@@ -616,7 +616,7 @@ def _c_helper_field_mapping(complex_type, prefix, flat=False):
                 all_fields.update(_c_helper_field_mapping(b.type, bitcase_prefix, flat))
     else:
         for f in complex_type.fields:
-            fname = _c_helper_absolute_name(prefix, f)
+            fname = _c_helper_fieldaccess_expr(prefix, f)
             if f.field_name in all_fields:
                 raise Exception("field name %s has been registered before" % f.field_name)
 
@@ -901,7 +901,7 @@ def _c_serialize_helper_switch_field(context, self, field, c_switch_variable, pr
     # switch is handled by this function as a special case
     param_fields, wire_fields, params = get_serialize_params(context, self)
     field_mapping = _c_helper_field_mapping(self, prefix)
-    prefix_str = _c_helper_absolute_name(prefix)
+    prefix_str = _c_helper_fieldaccess_expr(prefix)
 
     # find the parameters that need to be passed to _serialize()/_unpack():
     # all switch expr fields must be given as parameters
@@ -945,7 +945,7 @@ def _c_serialize_helper_list_field(context, self, field,
     helper function to cope with lists of variable length
     """
     expr = field.type.expr
-    prefix_str = _c_helper_absolute_name(prefix)
+    prefix_str = _c_helper_fieldaccess_expr(prefix)
     param_fields, wire_fields, params = get_serialize_params('sizeof', self)
     param_names = [p[2] for p in params]
 
@@ -1016,7 +1016,7 @@ def _c_serialize_helper_fields_fixed_size(context, self, field,
         typename = reduce(lambda x,y: "%s.%s" % (x, y), scoped_name)
         code_lines.append('%s    /* %s.%s */' % (space, typename, field.c_field_name))
 
-    abs_field_name = _c_helper_absolute_name(prefix, field)
+    abs_field_name = _c_helper_fieldaccess_expr(prefix, field)
     # default for simple cases: call sizeof()
     length = "sizeof(%s)" % field.c_field_type
 
@@ -1078,7 +1078,7 @@ def _c_serialize_helper_fields_fixed_size(context, self, field,
 def _c_serialize_helper_fields_variable_size(context, self, field,
                                              code_lines, temp_vars,
                                              space, prefix):
-    prefix_str = _c_helper_absolute_name(prefix)
+    prefix_str = _c_helper_fieldaccess_expr(prefix)
 
     if context in ('unserialize', 'unpack', 'sizeof'):
         value = ''