frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

c_client.py: use comprehensions instead of map/filter 

Signed-off-by: Ran Benita <ran234@gmail.com>
Reviewed-by: Christian Linhart <chris@demorecorder.com>
This commit is contained in:
Ran Benita 2014-10-12 21:58:07 +03:00 committed by Christian Linhart
parent 86ea6645d9
commit 80341d5df3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/c_client.py
View File

@ -690,7 +690,7 @@ def get_expr_fields(self):
prefix.append(('', '', self)) prefix.append(('', '', self))
all_fields = _c_helper_resolve_field_names (prefix) all_fields = _c_helper_resolve_field_names (prefix)
resolved_fields_names = list(filter(lambda x: x in all_fields.keys(), unresolved_fields_names)) resolved_fields_names = [x for x in unresolved_fields_names if x in all_fields]
if len(unresolved_fields_names) != len(resolved_fields_names): if len(unresolved_fields_names) != len(resolved_fields_names):
raise Exception("could not resolve all fields for %s" % self.name) raise Exception("could not resolve all fields for %s" % self.name)
@ -976,8 +976,8 @@ def _c_serialize_helper_list_field(context, self, field,
param_names = [p[2] for p in params] param_names = [p[2] for p in params]
expr_fields_names = [f.field_name for f in get_expr_fields(field.type)] expr_fields_names = [f.field_name for f in get_expr_fields(field.type)]
resolved = list(filter(lambda x: x in param_names, expr_fields_names)) resolved = [x for x in expr_fields_names if x in param_names]
unresolved = list(filter(lambda x: x not in param_names, expr_fields_names)) unresolved = [x for x in expr_fields_names if x not in param_names]
field_mapping = {} field_mapping = {}
for r in resolved: for r in resolved:
@ -990,8 +990,8 @@ def _c_serialize_helper_list_field(context, self, field,
field.c_field_name) field.c_field_name)
field_mapping.update(_c_helper_resolve_field_names(prefix)) field_mapping.update(_c_helper_resolve_field_names(prefix))
resolved += list(filter(lambda x: x in field_mapping, unresolved)) resolved += [x for x in unresolved if x in field_mapping]
unresolved = list(filter(lambda x: x not in field_mapping, unresolved)) unresolved = [x for x in unresolved if x not in field_mapping]
if len(unresolved)>0: if len(unresolved)>0:
raise Exception('could not resolve the length fields required for list %s' % field.c_field_name) raise Exception('could not resolve the length fields required for list %s' % field.c_field_name)
@ -1347,7 +1347,7 @@ def _c_serialize(context, self):
param_str.append("%s%s%s %s%s /**< */" % (indent, typespec, spacing, pointerspec, field_name)) param_str.append("%s%s%s %s%s /**< */" % (indent, typespec, spacing, pointerspec, field_name))
# insert function name # insert function name
param_str[0] = "%s (%s" % (func_name, param_str[0].strip()) param_str[0] = "%s (%s" % (func_name, param_str[0].strip())
param_str = list(map(lambda x: "%s," % x, param_str)) param_str = ["%s," % x for x in param_str]
for s in param_str[:-1]: for s in param_str[:-1]:
_hc(s) _hc(s)
_h("%s);" % param_str[-1].rstrip(',')) _h("%s);" % param_str[-1].rstrip(','))
@ -1436,7 +1436,7 @@ def _c_serialize(context, self):
if not (self.is_switch or self.c_var_followed_by_fixed_fields): if not (self.is_switch or self.c_var_followed_by_fixed_fields):
# look if we have to declare an '_aux' variable at all # look if we have to declare an '_aux' variable at all
if len(list(filter(lambda x: x.find('_aux')!=-1, code_lines)))>0: if any('_aux' in x for x in code_lines):
if not self.c_var_followed_by_fixed_fields: if not self.c_var_followed_by_fixed_fields:
_c(' const %s *_aux = (%s *)_buffer;', self.c_type, self.c_type) _c(' const %s *_aux = (%s *)_buffer;', self.c_type, self.c_type)
else: else: