diff options
author | Colin Walters <walters@verbum.org> | 2010-08-03 13:01:35 -0400 |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2010-08-31 16:05:56 -0400 |
commit | abc4e514ff46ed77159b19f56dea54eeef8bc909 (patch) | |
tree | c72971e270139c35739b651bb91b35bf2b66b783 /giscanner | |
parent | f58c9cd835c6e5077496ea4abf18ecd8907c3288 (diff) | |
download | gobject-introspection-abc4e514ff46ed77159b19f56dea54eeef8bc909.tar.gz |
Move alias target to <type>
This makes type parsing more uniform.
Delete the typedef for GSList in foo.h - that's not
supported anymore, or at least for now.
Diffstat (limited to 'giscanner')
-rw-r--r-- | giscanner/girparser.py | 3 | ||||
-rw-r--r-- | giscanner/girwriter.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/giscanner/girparser.py b/giscanner/girparser.py index 17cf630c..9fee1fc1 100644 --- a/giscanner/girparser.py +++ b/giscanner/girparser.py @@ -160,8 +160,9 @@ class GIRParser(object): self._pkgconfig_packages.add(node.attrib['name']) def _parse_alias(self, node): + typeval = self._parse_type(node) alias = Alias(node.attrib['name'], - node.attrib['target'], + typeval, node.attrib.get(_cns('type'))) self._add_node(alias) diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py index 2e0a6cdc..0f621251 100644 --- a/giscanner/girwriter.py +++ b/giscanner/girwriter.py @@ -153,10 +153,11 @@ and/or use gtk-doc annotations. ''') attrs.append(('throws', '1')) def _write_alias(self, alias): - attrs = [('name', alias.name), ('target', alias.target)] + attrs = [('name', alias.name)] if alias.ctype is not None: attrs.append(('c:type', alias.ctype)) - self.write_tag('alias', attrs) + with self.tagcontext('alias', attrs): + self._write_type(alias.target) def _write_callable(self, callable, tag_name, extra_attrs): attrs = [('name', callable.name)] |