diff options
author | Andreas Rottmann <a.rottmann@gmx.at> | 2009-03-09 17:33:00 (GMT) |
---|---|---|
committer | Andreas Rottmann <a.rottmann@gmx.at> | 2009-03-09 17:33:00 (GMT) |
commit | 2bd97368f6ced0d23977ce980ac159453cc18d8c (patch) | |
tree | 4be7dad53ed3c482832547cf917d70ba3cb90a15 /giscanner/transformer.py | |
parent | fdbe3cc3e1cfaa546648a76b1dca72beead0b65b (diff) |
Bug 574139 – There is no way to identify 'user_data' arguments in the callback signature
Add a heuristic to the scanner that flags arguments of callbacks that
are named 'user_data' (exact match) and have a 'any (void*) type.
These arguments are marked by setting the 'closure' field of ArgBlob
to the index of themselves.
Signed-off-by: Andreas Rottmann <a.rottmann@gmx.at>
Diffstat (limited to 'giscanner/transformer.py')
-rw-r--r-- | giscanner/transformer.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/giscanner/transformer.py b/giscanner/transformer.py index 8e3219a..9aebbd8 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -534,13 +534,20 @@ class Transformer(object): return self._create_compound(Union, symbol, anonymous) def _create_callback(self, symbol): - parameters = self._create_parameters(symbol.base_type.base_type) + parameters = list(self._create_parameters(symbol.base_type.base_type)) retval = self._create_return(symbol.base_type.base_type.base_type) + + # Mark the 'user_data' arguments + for i, param in enumerate(parameters): + if (param.type.name == 'any' and + param.name == 'user_data'): + param.closure_index = i + if symbol.ident.find('_') > 0: name = self.remove_prefix(symbol.ident, True) else: name = self.remove_prefix(symbol.ident) - callback = Callback(name, retval, list(parameters), symbol.ident) + callback = Callback(name, retval, parameters, symbol.ident) return callback |