Redo type resolving and validation. Add a couple of new tests. Patch

2008-08-18  Johan Dahlin  <johan@gnome.org>

    * giscanner/ast.py:
    * giscanner/girparser.py:
    * giscanner/girwriter.py:
    * giscanner/glibast.py:
    * giscanner/glibtransformer.py:
    * giscanner/transformer.py:
    * tests/scanner/Foo-expected.gir:
    * tests/scanner/foo-object.h:
    * tests/scanner/utility-expected.gir:
    * tests/scanner/utility.h:
    Redo type resolving and validation.
    Add a couple of new tests.
    Patch mostly written by Colin.


svn path=/trunk/; revision=398

1 files changed, 4 insertions, 2 deletions

diff --git a/giscanner/girparser.py b/giscanner/girparser.py
index d326f1b6..6550a682 100644
--- a/giscanner/girparser.py
+++ b/giscanner/girparser.py
@@ -91,7 +91,8 @@ class GIRParser(object):
 
     def _parse_alias(self, node):
         return Alias(node.attrib['name'],
-                     node.attrib['target'])
+                     node.attrib['target'],
+                     node.attrib.get(_cns('type')))
 
     def _parse_object_interface(self, node):
         if node.tag == _corens('interface'):
@@ -121,7 +122,8 @@ class GIRParser(object):
             parameters.append(Parameter(paramnode.attrib['name'],
                                         self._parse_type(paramnode)))
         if klass is Callback:
-            return klass(name, retval, parameters)
+            return klass(name, retval, parameters,
+                         node.attrib.get(_cns('type')))
         else:
             identifier = node.attrib.get(_cns('identifier'))
             return klass(name, retval, parameters, identifier)