diff options
| author | Dieter Verfaillie <dieterv@optionexplicit.be> | 2013-07-29 15:25:56 +0200 |
|---|---|---|
| committer | Dieter Verfaillie <dieterv@optionexplicit.be> | 2013-10-08 20:56:47 +0200 |
| commit | 66c52d09102da8f8d808bfbf2c420dda4e7e8ee3 (patch) | |
| tree | 789956db99cb6e35ba2dc25579241c77e53a67a2 | |
| parent | 6a874b86a1b9aae0c50a30b8cd3033870797eb1c (diff) | |
| download | gobject-introspection-66c52d09102da8f8d808bfbf2c420dda4e7e8ee3.tar.gz | |
giscanner: don't generate synthetic names for '...' parameter
tests/warn/unkown-parameter.h:41 still passes with this...
| -rw-r--r-- | giscanner/transformer.py | 16 | ||||
| -rw-r--r-- | tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page | 2 | ||||
| -rw-r--r-- | tests/scanner/Regress-1.0-expected.gir | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/giscanner/transformer.py b/giscanner/transformer.py index b9c8ea62..bd476cc7 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -673,18 +673,18 @@ raise ValueError.""" def _create_parameter(self, parent_symbol, index, symbol): if symbol.type == CSYMBOL_TYPE_ELLIPSIS: - ptype = ast.Varargs() + return ast.Parameter('...', ast.Varargs()) else: ptype = self._create_type_from_base(symbol.base_type, is_parameter=True) - if symbol.ident is None: - if symbol.base_type and symbol.base_type.type != CTYPE_VOID: - message.warn_symbol(parent_symbol, "missing parameter name; undocumentable") - ident = 'arg%d' % (index, ) - else: - ident = symbol.ident + if symbol.ident is None: + if symbol.base_type and symbol.base_type.type != CTYPE_VOID: + message.warn_symbol(parent_symbol, "missing parameter name; undocumentable") + ident = 'arg%d' % (index, ) + else: + ident = symbol.ident - return ast.Parameter(ident, ptype) + return ast.Parameter(ident, ptype) def _create_return(self, source_type): typeval = self._create_type_from_base(source_type, is_return=True) diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page index 3947b3c5..92d75431 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page @@ -49,7 +49,7 @@ void regress_foo_object_take_all (RegressFooObject* object, </item> <item> -<title><code>arg2</code></title> +<title><code>...</code></title> </item> <item> diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 070f9927..f9ba48c8 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -1475,7 +1475,7 @@ uses a C sugar return type.</doc> <parameter name="x" transfer-ownership="none"> <type name="gint" c:type="int"/> </parameter> - <parameter name="arg2" transfer-ownership="none"> + <parameter name="..." transfer-ownership="none"> <varargs> </varargs> </parameter> @@ -1905,7 +1905,7 @@ exposed to language bindings.</doc> <parameter name="param" transfer-ownership="none"> <type name="utf8" c:type="const char*"/> </parameter> - <parameter name="arg1" transfer-ownership="none"> + <parameter name="..." transfer-ownership="none"> <varargs> </varargs> </parameter> |