ast: Rename Class.parent to parent_type

The eventual model I want to have is that .parent is the "container"
of the node. In all the cases where we don't explicitly set the parent,
this is the namespace, but having this under one field name would be
a big cleanup for the docwriter.

https://bugzilla.gnome.org/show_bug.cgi?id=693876

5 files changed, 15 insertions, 15 deletions

diff --git a/giscanner/ast.py b/giscanner/ast.py
index efa39a91..3cf99ddd 100644
--- a/giscanner/ast.py
+++ b/giscanner/ast.py
@@ -964,7 +964,7 @@ class Signal(Callable):
 
 class Class(Node, Registered):
 
-    def __init__(self, name, parent,
+    def __init__(self, name, parent_type,
                  ctype=None,
                  gtype_name=None,
                  get_type=None,
@@ -974,7 +974,7 @@ class Class(Node, Registered):
         Registered.__init__(self, gtype_name, get_type)
         self.ctype = ctype
         self.c_symbol_prefix = c_symbol_prefix
-        self.parent = parent
+        self.parent_type = parent_type
         self.fundamental = False
         self.unref_func = None
         self.ref_func = None
@@ -1013,7 +1013,7 @@ class Class(Node, Registered):
 
 class Interface(Node, Registered):
 
-    def __init__(self, name, parent,
+    def __init__(self, name, parent_type,
                  ctype=None,
                  gtype_name=None,
                  get_type=None,
@@ -1022,7 +1022,7 @@ class Interface(Node, Registered):
         Registered.__init__(self, gtype_name, get_type)
         self.ctype = ctype
         self.c_symbol_prefix = c_symbol_prefix
-        self.parent = parent
+        self.parent_type = parent_type
         self.parent_chain = []
         self.methods = []
         self.signals = []
diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py
index 1a149374..763a09d6 100644
--- a/giscanner/docwriter.py
+++ b/giscanner/docwriter.py
@@ -352,8 +352,8 @@ class DocFormatter(object):
     def get_class_hierarchy(self, node):
         parent_chain = [node]
 
-        while node.parent:
-            node = self._transformer.lookup_typenode(node.parent)
+        while node.parent_type:
+            node = self._transformer.lookup_typenode(node.parent_type)
             parent_chain.append(node)
 
         parent_chain.reverse()
diff --git a/giscanner/girparser.py b/giscanner/girparser.py
index 18f41d39..4cba5065 100644
--- a/giscanner/girparser.py
+++ b/giscanner/girparser.py
@@ -216,7 +216,7 @@ class GIRParser(object):
             parent_type = None
 
         ctor_kwargs = {'name': node.attrib['name'],
-                       'parent': parent_type,
+                       'parent_type': parent_type,
                        'gtype_name': node.attrib[_glibns('type-name')],
                        'get_type': node.attrib[_glibns('get-type')],
                        'c_symbol_prefix': node.attrib.get(_cns('symbol-prefix')),
diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py
index 90f7e1ed..ea9305cd 100644
--- a/giscanner/girwriter.py
+++ b/giscanner/girwriter.py
@@ -388,9 +388,9 @@ and/or use gtk-doc annotations. ''')
         self._append_node_generic(node, attrs)
         if isinstance(node, ast.Class):
             tag_name = 'class'
-            if node.parent is not None:
+            if node.parent_type is not None:
                 attrs.append(('parent',
-                              self._type_to_name(node.parent)))
+                              self._type_to_name(node.parent_type)))
             if node.is_abstract:
                 attrs.append(('abstract', '1'))
         else:
diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py
index 4eaf6401..049ba9ba 100644
--- a/giscanner/maintransformer.py
+++ b/giscanner/maintransformer.py
@@ -479,8 +479,8 @@ usage is void (*_gtk_reserved1)(void);"""
         assert supercls
         if cls is supercls:
             return True
-        if cls.parent and cls.parent.target_giname != 'GObject.Object':
-            return self._is_gi_subclass(cls.parent, supercls_type)
+        if cls.parent_type and cls.parent_type.target_giname != 'GObject.Object':
+            return self._is_gi_subclass(cls.parent_type, supercls_type)
         return False
 
     def _get_transfer_default_return(self, parent, node):
@@ -898,11 +898,11 @@ the ones that failed to resolve removed."""
                     continue
                 target = self._transformer.lookup_typenode(parent)
                 if target:
-                    node.parent = parent
+                    node.parent_type = parent
                     break
             else:
                 if isinstance(node, ast.Interface):
-                    node.parent = ast.Type(target_giname='GObject.Object')
+                    node.parent_type = ast.Type(target_giname='GObject.Object')
             for prop in node.properties:
                 self._transformer.resolve_type(prop.type)
             for sig in node.signals:
@@ -1197,8 +1197,8 @@ method or constructor of some type."""
             while parent and (not parent.gi_name == 'GObject.Object'):
                 if parent == target:
                     break
-                if parent.parent:
-                    parent = self._transformer.lookup_typenode(parent.parent)
+                if parent.parent_type:
+                    parent = self._transformer.lookup_typenode(parent.parent_type)
                 else:
                     parent = None
                 if parent is None: