gobject-introspection r326 - in trunk: . giscanner

[johan svn gnome org]

Author: johan
Date: Fri Aug  8 20:05:49 2008
New Revision: 326
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=326&view=rev

Log:
2008-08-08  Johan Dahlin  <johan gnome org>

    * giscanner/girwriter.py:
    type -> ntype
    * giscanner/glibast.py:
    * giscanner/glibtransformer.py:
    Swap order of members, to keep it consistent with
    base enum class



Modified:
   trunk/ChangeLog
   trunk/giscanner/girwriter.py
   trunk/giscanner/glibast.py
   trunk/giscanner/glibtransformer.py

Modified: trunk/giscanner/girwriter.py
==============================================================================
--- trunk/giscanner/girwriter.py	(original)
+++ trunk/giscanner/girwriter.py	Fri Aug  8 20:05:49 2008
@@ -120,7 +120,7 @@
         # FIXME: figure out if type references a basic type
         #        or a boxed/class/interface etc. and skip
         #        writing the ctype if the latter.
-        if type.ctype is not None:
+        if ntype.ctype is not None:
             attrs.append(('c:type', ntype.ctype))
         self.write_tag('type', attrs)
 

Modified: trunk/giscanner/glibast.py
==============================================================================
--- trunk/giscanner/glibast.py	(original)
+++ trunk/giscanner/glibast.py	Fri Aug  8 20:05:49 2008
@@ -47,7 +47,7 @@
 type_names['gssize'] = TYPE_SSIZE
 
 class GLibEnum(Enum):
-    def __init__(self, name, members, type_name, get_type):
+    def __init__(self, name, type_name, members, get_type):
         Enum.__init__(self, name, type_name, members)
         self.ctype = type_name
         self.type_name = type_name

Modified: trunk/giscanner/glibtransformer.py
==============================================================================
--- trunk/giscanner/glibtransformer.py	(original)
+++ trunk/giscanner/glibtransformer.py	Fri Aug  8 20:05:49 2008
@@ -261,8 +261,8 @@
 
         klass = (GLibFlags if ftype_id == cgobject.TYPE_FLAGS else GLibEnum)
         type_name = cgobject.type_name(type_id)
-        node = klass(self._transformer.strip_namespace_object(type_name),
-                     members, type_name, symbol)
+        enum_name = self._transformer.strip_namespace_object(type_name)
+        node = klass(enum_name, type_name, members, symbol)
         self._add_attribute(node, replace=True)
         self._register_internal_type(type_name, node)