diff options
| author | Peter Harris <pharris@opentext.com> | 2014-01-14 14:50:55 -0500 |
|---|---|---|
| committer | Peter Harris <pharris@opentext.com> | 2014-01-21 15:25:10 -0500 |
| commit | e7263931aff3e3450dc938ad465a7577f943549f (patch) | |
| tree | 2c65b91ba4358aadd20782cc3c5a43a620ae7efc | |
| parent | 3b72a2c9d1d656c74c691a45689e1d637f669e3a (diff) | |
Support <pad align="n" />
Reviewed-By: Ran Benita <ran234@gmail.com>
Signed-off-by: Peter Harris <pharris@opentext.com>
| -rw-r--r-- | src/c_client.py | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/src/c_client.py b/src/c_client.py index 45de544..161cbf5 100644 --- a/src/c_client.py +++ b/src/c_client.py @@ -981,15 +981,22 @@ def _c_serialize_helper_fields(context, self, # fields with variable size else: - # switch/bitcase: always calculate padding before and after variable sized fields - if need_padding or is_bitcase: + if field.type.is_pad: + # Variable length pad is <pad align= /> + code_lines.append('%s xcb_align_to = %d;' % (space, field.type.align)) count += _c_serialize_helper_insert_padding(context, code_lines, space, + self.var_followed_by_fixed_fields) + continue + else: + # switch/bitcase: always calculate padding before and after variable sized fields + if need_padding or is_bitcase: + count += _c_serialize_helper_insert_padding(context, code_lines, space, self.var_followed_by_fixed_fields) - value, length = _c_serialize_helper_fields_variable_size(context, self, field, - code_lines, temp_vars, - space, prefix) - prev_field_was_variable = True + value, length = _c_serialize_helper_fields_variable_size(context, self, field, + code_lines, temp_vars, + space, prefix) + prev_field_was_variable = True # save (un)serialization C code if '' != value: @@ -1740,10 +1747,11 @@ def _c_accessors(self, name, base): # else: if True: for field in self.fields: - if field.type.is_list and not field.type.fixed_size(): - _c_accessors_list(self, field) - elif field.prev_varsized_field is not None or not field.type.fixed_size(): - _c_accessors_field(self, field) + if not field.type.is_pad: + if field.type.is_list and not field.type.fixed_size(): + _c_accessors_list(self, field) + elif field.prev_varsized_field is not None or not field.type.fixed_size(): + _c_accessors_field(self, field) def c_simple(self, name): ''' |