scanner: Better handling of GType names

Before, Type instances could be indeterminate, holding a "ctype",
which means "This is some unresolved string".  However, we also get
data from GType, so add gtype_name as another indeterminate state.

Clean up how we create and resolve Type instances from GType data.

1 files changed, 4 insertions, 1 deletions

diff --git a/giscanner/introspectablepass.py b/giscanner/introspectablepass.py
index f3ab7e65..78434116 100644
--- a/giscanner/introspectablepass.py
+++ b/giscanner/introspectablepass.py
@@ -64,7 +64,8 @@ class IntrospectablePass(object):
             target = None
 
         if not node.type.resolved:
-            self._parameter_warning(parent, node, "Unresolved ctype: %r" % (node.type.ctype, ))
+            self._parameter_warning(parent, node,
+"Unresolved type: %r" % (node.type.unresolved_string, ))
             parent.introspectable = False
             return
 
@@ -113,6 +114,8 @@ class IntrospectablePass(object):
     def _type_is_introspectable(self, typeval, warn=False):
         if not typeval.resolved:
             return False
+        if isinstance(typeval, ast.TypeUnknown):
+            return False
         if isinstance(typeval, (ast.Array, ast.List)):
             return self._type_is_introspectable(typeval.element_type)
         elif isinstance(typeval, ast.Map):