type -> ntype

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

svn path=/trunk/; revision=326

diff --git a/ChangeLog b/ChangeLog
index 9d7504c..7258b62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 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
+
+2008-08-08  Johan Dahlin  <johan@gnome.org>
+
        * girepository/gtypelib.c (validate_header):
        * girepository/gtypelib.h:
        * giscanner/ast.py:

diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py
index 7928789..7cf61b2 100644 (file)
--- a/giscanner/girwriter.py
+++ b/giscanner/girwriter.py
@@ -120,7 +120,7 @@ class GIRWriter(XMLWriter):
         # 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)
 

diff --git a/giscanner/glibast.py b/giscanner/glibast.py
index 207ae7d..1abea0a 100644 (file)
--- a/giscanner/glibast.py
+++ b/giscanner/glibast.py
@@ -47,7 +47,7 @@ type_names['gsize'] = TYPE_SIZE
 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

diff --git a/giscanner/glibtransformer.py b/giscanner/glibtransformer.py
index f84f0c6..d132890 100644 (file)
--- a/giscanner/glibtransformer.py
+++ b/giscanner/glibtransformer.py
@@ -261,8 +261,8 @@ class GLibTransformer(object):
 
         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)