gobject-introspection r382 - in trunk: . giscanner

[walters svn gnome org]

Author: walters
Date: Fri Aug 15 05:17:54 2008
New Revision: 382
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=382&view=rev

Log:
2008-08-15  Colin Walters  <walters verbum org>

	* giscanner/glibtransformer.py: Explicitly construct
	new list, since we're deleting as we iterate.
	Don't delete all structures which end in Class; just
	ones which have a paired GObject.
	Fix printing of type warning.
	* giscanner/transformer.py: Make strip_namespace_object
	be the identity function if it doesn't match the 
	namespace.




Modified:
   trunk/ChangeLog
   trunk/giscanner/glibtransformer.py
   trunk/giscanner/transformer.py

Modified: trunk/giscanner/glibtransformer.py
==============================================================================
--- trunk/giscanner/glibtransformer.py	(original)
+++ trunk/giscanner/glibtransformer.py	Fri Aug 15 05:17:54 2008
@@ -56,8 +56,10 @@
 
         # Introspection is done from within parsing
 
-        # Second pass, resolving types
-        for node in self._output_ns.values():
+        # Second pass, resolving types; we need to create
+        # a new list here because we're removing things
+        # as we iterate.
+        for node in list(self._output_ns.itervalues()):
             # associate GtkButtonClass with GtkButton
             if isinstance(node, Struct):
                 self._pair_class_struct(node)
@@ -65,14 +67,14 @@
 
         # Create a new namespace with what we found
         namespace = Namespace(namespace.name)
-        namespace.nodes = self._aliases + self._output_ns.values()
+        namespace.nodes = self._aliases + list(self._output_ns.itervalues())
         return namespace
 
     # Private
 
     def _add_attribute(self, node, replace=False):
         node_name = node.name
-        if node_name in self._output_ns and not replace:
+        if (not replace) and node_name in self._output_ns:
             return
         self._output_ns[node_name] = node
 
@@ -153,8 +155,8 @@
             return False
         # GType *_get_type(void)
         if func.retval.type.name != 'GObject.GType':
-            print "Warning: *_get_type function returns '%r'" + \
-                ", not GObject.GType"
+            print ("Warning: *_get_type function returns '%r'" + \
+                ", not GObject.GType") % (func.retval.type.name, )
             return False
         if func.parameters:
             return False
@@ -248,8 +250,8 @@
     def _parse_callback(self, callback):
         self._add_attribute(callback)
 
-    def _pair_class_struct(self, class_node):
-        name = class_node.name
+    def _pair_class_struct(self, maybe_class):
+        name = maybe_class.name
         if (name.endswith('Class') or
             name.endswith('Iface')):
             name = name[:-5]
@@ -257,13 +259,18 @@
             name = name[:-9]
         else:
             return
-
-        node = self._output_ns.get(self._resolve_type_name(name))
-        del self._output_ns[class_node.name]
-        if node is None:
-            return
-        for field in class_node.fields[1:]:
-            node.fields.append(field)
+        name = self._resolve_type_name(name)
+        resolved = self._transformer.strip_namespace_object(name)
+        pair_class = self._output_ns.get(resolved)
+        if pair_class:
+            del self._output_ns[maybe_class.name]
+            for field in maybe_class.fields[1:]:
+                pair_class.fields.append(field)
+            return
+        name = self._transformer.strip_namespace_object(maybe_class.name)
+        pair_class = self._output_ns.get(name)
+        if pair_class:
+            del self._output_ns[maybe_class.name]
 
     # Introspection
 

Modified: trunk/giscanner/transformer.py
==============================================================================
--- trunk/giscanner/transformer.py	(original)
+++ trunk/giscanner/transformer.py	Fri Aug 15 05:17:54 2008
@@ -90,11 +90,9 @@
                 self._type_names[node.name] = (nsname, node)
 
     def strip_namespace_object(self, name):
-        orig_name = name
         prefix = self._namespace.name.lower()
-        name = name.lower()
-        if name.startswith(prefix):
-            name = orig_name[len(prefix):]
+        if len(name) > len(prefix) and name.lower().startswith(prefix):
+            return name[len(prefix):]
         return name
 
     # Private